Changeset 9f39db for src/Patterns/unittests/CreatorUnitTest.cpp

Timestamp:

Jan 6, 2011, 11:47:13 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

8dd38e

Parents:

567640

Message:

FIX: some unittests declared variables anew although defined in header, NULL'd in setup, deleted in tearDown().

File:

• src/Patterns/unittests/CreatorUnitTest.cpp (modified) (4 diffs)

src/Patterns/unittests/CreatorUnitTest.cpp

@@ -23 +23 @@
 
 #include "Assert.hpp"
-
-#include "Creator.hpp"
-#include "stubs/CommonStub.hpp"
-#include "stubs/CreatorStub.hpp"
 
 #include <boost/nondet_random.hpp>
@@ -73 +69 @@
 void CreatorTest::setUp()
 {
+  testingA1 = NULL;
+  testingA2 = NULL;
+  testingB1 = NULL;
+  testingB2 = NULL;
 }
 
 void CreatorTest::tearDown()
 {
+  delete testingA1;
+  delete testingA2;
+  delete testingB1;
+  delete testingB2;
 }
 
 void CreatorTest::CreationTest()
 {
-  class CreatorStub<teststubs::Aclass> teststubA;
-  class CreatorStub<teststubs::Bclass> teststubB;
-
-  ICreatorStub* testingA1 = teststubA.create();
-  ICreatorStub* testingA2 = teststubA.create();
-  ICreatorStub* testingB = teststubB.create();
+  testingA1 = teststubA.create();
+  testingA2 = teststubA.create();
+  testingB1 = teststubB.create();
 
   // instance is different
@@ -92 +93 @@
   CPPUNIT_ASSERT( &teststubA != testingA2 );
   CPPUNIT_ASSERT( testingA1 != testingA2 );
-  CPPUNIT_ASSERT( &teststubB != testingB );
+  CPPUNIT_ASSERT( &teststubB != testingB1 );
 
   // type is the same ...
   CPPUNIT_ASSERT_EQUAL( typeid(teststubA).name(), typeid(*testingA1).name() );
   CPPUNIT_ASSERT_EQUAL( typeid(*testingA1).name(), typeid(*testingA2).name() );
-  CPPUNIT_ASSERT_EQUAL( typeid(teststubB).name(), typeid(*testingB).name() );
+  CPPUNIT_ASSERT_EQUAL( typeid(teststubB).name(), typeid(*testingB1).name() );
 
   // ... for the same particular type only!
   // (RTTI knows about the true complex type!)
-  CPPUNIT_ASSERT( typeid(*testingB).name() != typeid(*testingA1).name() );
-  CPPUNIT_ASSERT( typeid(*testingB).name() != typeid(*testingA2).name() );
+  CPPUNIT_ASSERT( typeid(*testingB1).name() != typeid(*testingA1).name() );
+  CPPUNIT_ASSERT( typeid(*testingB1).name() != typeid(*testingA2).name() );
 
   // but not for different encapsulated types
-  CPPUNIT_ASSERT( typeid(teststubA).name() != typeid(*testingB).name() );
+  CPPUNIT_ASSERT( typeid(teststubA).name() != typeid(*testingB1).name() );
   CPPUNIT_ASSERT( typeid(teststubB).name() != typeid(*testingA1).name() );
   CPPUNIT_ASSERT( typeid(teststubB).name() != typeid(*testingA2).name() );
 
-  delete testingA1;
-  delete testingA2;
-  delete testingB;
 }
 
 void CreatorTest::IndividualityTest()
 {
-  class CreatorStub<teststubs::Aclass> teststubA;
-  class CreatorStub<teststubs::Bclass> teststubB;
   teststubA.count();
   teststubB.count();
   teststubB.count();
 
-  ICreatorStub* testingA1 = teststubA.create();
-  ICreatorStub* testingA2 = teststubA.create();
-  ICreatorStub* testingB1 = teststubB.create();
-  ICreatorStub* testingB2 = teststubB.create();
+  testingA1 = teststubA.create();
+  testingA2 = teststubA.create();
+  testingB1 = teststubB.create();
+  testingB2 = teststubB.create();
 
   // content is the same (prototype has been copied)
@@ -140 +136 @@
   testingB2->count();
   CPPUNIT_ASSERT( testingB1->getcount() != testingB2->getcount());
-
-  delete testingA1;
-  delete testingA2;
-  delete testingB1;
-  delete testingB2;
 }