Changeset 9f39db for src/Patterns

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().

Location:

src/Patterns/unittests

Files:

• CloneUnitTest.cpp (modified) (3 diffs)
• CreatorUnitTest.cpp (modified) (4 diffs)
• CreatorUnitTest.hpp (modified) (2 diffs)
• FactoryUnitTest.cpp (modified) (3 diffs)
• FactoryUnitTest.hpp (modified) (1 diff)

src/Patterns/unittests/CloneUnitTest.cpp

@@ -72 +72 @@
 void CloneTest::setUp()
 {
-  IPrototype *ip1 = &p1;
+  ip1 = &p1;
   CPPUNIT_ASSERT( ip1 == &p1 );
-  IPrototype *ip2 = &p2;
+  ip2 = &p2;
   CPPUNIT_ASSERT( ip2 == &p2 );
 
@@ -95 +95 @@
 {
   // test that new instances have been created.
-  IPrototype *ip1_1 = p1.clone();
-  IPrototype *ip1_2 = p1.clone();
+  ip1_1 = p1.clone();
+  ip1_2 = p1.clone();
   CPPUNIT_ASSERT( ip1 != ip1_1 );
   CPPUNIT_ASSERT( ip1 != ip1_2 );
 
-  IPrototype *ip2_1 = p2.clone();
-  IPrototype *ip2_2 = p2.clone();
+  ip2_1 = p2.clone();
+  ip2_2 = p2.clone();
   CPPUNIT_ASSERT( ip2 != ip2_1 );
   CPPUNIT_ASSERT( ip2 != ip2_2 );
@@ -114 +114 @@
 
   // make refs to interface
-  IPrototype *ip1 = &p1;
+  ip1 = &p1;
   CPPUNIT_ASSERT( ip1 == &p1 );
-  IPrototype *ip2 = &p2;
+  ip2 = &p2;
   CPPUNIT_ASSERT( ip2 == &p2 );
 
   // clone (i.e. counter = p?.counter ), ...
-  IPrototype *ip1_1 = p1.clone();
-  IPrototype *ip1_2 = p1.clone();
-  IPrototype *ip2_1 = p2.clone();
-  IPrototype *ip2_2 = p2.clone();
+  ip1_1 = p1.clone();
+  ip1_2 = p1.clone();
+  ip2_1 = p2.clone();
+  ip2_2 = p2.clone();
 
   // check that each is individual

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;
 }

src/Patterns/unittests/CreatorUnitTest.hpp

@@ -14 +14 @@
 #endif
 
+#include <cppunit/extensions/HelperMacros.h>
 
-#include <cppunit/extensions/HelperMacros.h>
+#include "stubs/CreatorStub.hpp"
+#include "stubs/CommonStub.hpp"
 
 class CreatorTest : public CppUnit::TestFixture
@@ -32 +34 @@
 
 private:
+  class CreatorStub<teststubs::Aclass> teststubA;
+  class CreatorStub<teststubs::Bclass> teststubB;
+  ICreatorStub* testingA1;
+  ICreatorStub* testingA2;
+  ICreatorStub* testingB1;
+  ICreatorStub* testingB2;
 };
 

src/Patterns/unittests/FactoryUnitTest.cpp

@@ -75 +75 @@
       FactoryStub::getInstance().
       PrototypeTable[FactoryStub::Bclass]->create();
+  rndA_1 = NULL;
 }
 
@@ -81 +82 @@
   delete rndA;
   delete rndB;
+  delete rndA_1;
   FactoryStub::purgeInstance();
 }
@@ -115 +117 @@
 void FactoryTest::getProductEnumTest()
 {
-  ICreatorStub * rndA_1 =
-      FactoryStub::getInstance().getProduct(FactoryStub::Aclass);
+  rndA_1 = FactoryStub::getInstance().getProduct(FactoryStub::Aclass);
   CPPUNIT_ASSERT( typeid(*rndA) == typeid(*rndA_1) );
-  delete rndA_1;
 }
 
 void FactoryTest::getProductNameTest()
 {
-  ICreatorStub * rndA_1 =
-      FactoryStub::getInstance().getProduct(std::string("Aclass"));
+  rndA_1 = FactoryStub::getInstance().getProduct(std::string("Aclass"));
   CPPUNIT_ASSERT( typeid(*rndA) == typeid(*rndA_1) );
-  delete rndA_1;
 }
 
 void FactoryTest::getProductTypeTest()
 {
-  ICreatorStub * rndA_1 =
-      FactoryStub::getInstance().getProduct( typeid(teststubs::Aclass) );
+  rndA_1 = FactoryStub::getInstance().getProduct( typeid(teststubs::Aclass) );
   CPPUNIT_ASSERT( typeid(*rndA) == typeid(*rndA_1) );
-  delete rndA_1;
 }

src/Patterns/unittests/FactoryUnitTest.hpp

@@ -39 +39 @@
   ICreatorStub * rndA;
   ICreatorStub * rndB;
+  ICreatorStub * rndA_1;
 };