Changeset c7ac70

Timestamp:

Dec 13, 2011, 1:09:44 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

22ac992

Parents:

9b8fa4

git-author:

Frederik Heber <heber@…> (12/12/11 08:20:48)

git-committer:

Frederik Heber <heber@…> (12/13/11 13:09:44)

Message:

FIX: Forgot to add Registry<>::cleanup() to CONSTRUCT_....

• added unit test whether cleanup is working.

Location:

src

Files:

• CodePatterns/Registry_impl.hpp (modified) (1 diff)
• Patterns/unittests/RegistryUnitTest.cpp (modified) (1 diff)
• Patterns/unittests/RegistryUnitTest.hpp (modified) (2 diffs)

src/CodePatterns/Registry_impl.hpp

@@ -146 +146 @@
     template void Registry<InstanceType>::registerInstance(InstanceType*); \
     template void Registry<InstanceType>::unregisterInstance(InstanceType*); \
+    template void Registry<InstanceType>::cleanup(); \
     template std::map<const std::string,InstanceType*>::iterator Registry<InstanceType>::getBeginIter(); \
     template std::map<const std::string,InstanceType*>::const_iterator Registry<InstanceType>::getBeginIter() const; \

src/Patterns/unittests/RegistryUnitTest.cpp

@@ -104 +104 @@
   delete instanceB;
 }
+
+void RegistryTest::cleanupCheck()
+{
+  // register two test instances
+  registry->registerInstance(new teststubs::ANamedclass);
+  registry->registerInstance(new teststubs::BNamedclass);
+  CPPUNIT_ASSERT( registry->getBeginIter() != registry->getEndIter() );
+
+  // cleanup and check
+  registry->cleanup();
+  CPPUNIT_ASSERT( registry->getBeginIter() == registry->getEndIter() );
+}

src/Patterns/unittests/RegistryUnitTest.hpp

@@ -24 +24 @@
     CPPUNIT_TEST_SUITE( RegistryTest) ;
     CPPUNIT_TEST ( InOutCheck );
+    CPPUNIT_TEST ( cleanupCheck );
     CPPUNIT_TEST_SUITE_END();
 
@@ -30 +31 @@
       void tearDown();
       void InOutCheck();
+      void cleanupCheck();
 
 private: