Changeset 8dd38e for src/Patterns/unittests

Timestamp:

Jan 10, 2011, 8:06:49 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

192c04

Parents:

9f39db

git-author:

Frederik Heber <heber@…> (01/06/11 23:48:30)

git-committer:

Frederik Heber <heber@…> (01/10/11 20:06:49)

Message:

New patterns ManipulableClone and ManipulablePrototypeFactory, changed PrototypeFactory.

• ManipulableClone is a Clone that can spawn a manipulated copy varied by given parameters.
• prototypes in PrototypeFactory cannot be manipulated anymore.
• PrototypeFactory::getPrototypeManipulator() -> getPrototype() and returned reference is const (and a ref, no pointer. Preventing its accidental deletion).
• ManipulablePrototypeFactory then has non-const references returned by getProduct().
• ManipulablePrototypeFactory::manipulatePrototype() allows direct manipulation of the prototype by a given parameter set.
• Added unit tests for the new patterns.
• Changed unit tests for PrototypeFactory.
• Library version is now 4:0:0, API version is 1.0.7.

Location:

src/Patterns/unittests

Files:

• Makefile.am (modified) (2 diffs)
• ManipulableCloneUnitTest.cpp (added)
• ManipulableCloneUnitTest.hpp (added)
• ManipulablePrototypeFactoryUnitTest.cpp (added)
• ManipulablePrototypeFactoryUnitTest.hpp (added)
• PrototypeFactoryUnitTest.cpp (modified) (2 diffs)
• PrototypeFactoryUnitTest.hpp (modified) (2 diffs)
• stubs/CommonParametersStub.hpp (added)
• stubs/ManipulableCloneStub.cpp (added)
• stubs/ManipulableCloneStub.hpp (added)
• stubs/ManipulablePrototypeFactoryStub.cpp (added)
• stubs/ManipulablePrototypeFactoryStub.def (added)
• stubs/ManipulablePrototypeFactoryStub.hpp (added)
• stubs/ManipulablePrototypeFactoryStub.undef (added)
• stubs/PrototypeFactoryStub.def (modified) (2 diffs)
• stubs/PrototypeFactoryStub.undef (modified) (2 diffs)

src/Patterns/unittests/Makefile.am

@@ -13 +13 @@
   CreatorUnitTest \
   FactoryUnitTest \
+  ManipulableCloneUnitTest \
+  ManipulablePrototypeFactoryUnitTest \
   ObserverUnitTest \
   PrototypeFactoryUnitTest \
@@ -67 +69 @@
 FactoryUnitTest_LDADD = $(TESTLIBS)
 
+ManipulableCloneUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ManipulableCloneUnitTest.cpp \
+        ManipulableCloneUnitTest.hpp \
+        ../ManipulableClone.hpp \
+        stubs/CommonStub.cpp \
+        stubs/CommonStub.hpp \
+        stubs/ManipulableCloneStub.cpp \
+        stubs/ManipulableCloneStub.hpp
+ManipulableCloneUnitTest_LDADD = $(TESTLIBS)
+
+ManipulablePrototypeFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ManipulablePrototypeFactoryUnitTest.cpp \
+        ManipulablePrototypeFactoryUnitTest.hpp \
+        stubs/ManipulableCloneStub.cpp \
+        stubs/ManipulableCloneStub.hpp \
+        stubs/CommonStub.cpp \
+        stubs/CommonStub.hpp \
+        stubs/ManipulablePrototypeFactoryStub.hpp \
+        stubs/ManipulablePrototypeFactoryStub.cpp \
+        ../ManipulablePrototypeFactory.hpp \
+        ../FactoryTypeList.hpp \
+        ../ManipulablePrototypeFactory_impl.hpp
+ManipulablePrototypeFactoryUnitTest_LDADD = $(TESTLIBS)
+
 ObserverUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ObserverUnitTest.cpp \

src/Patterns/unittests/PrototypeFactoryUnitTest.cpp

@@ -161 +161 @@
 }
 
-void PrototypeFactoryTest::PrototypeManipulatortest()
+void PrototypeFactoryTest::getPrototypetest()
 {
   // this method is protected and only friends may access it.
-  IPrototype *rndA_1 = PrototypeFactoryStub::getInstance().getPrototypeManipulator(std::string("Aclass"));
-
-  // do something with the prototype.
-  rndA_1->setcount(256);
+  const IPrototype& rndA_1c = PrototypeFactoryStub::getInstance().getPrototype(std::string("Aclass"));
 
   // clone the type and check whether new default values holds
   rndA_2 = PrototypeFactoryStub::getInstance().getProduct(PrototypeFactoryStub::Aclass);
-  CPPUNIT_ASSERT_EQUAL( 256, rndA_2->getcount() );
+  CPPUNIT_ASSERT_EQUAL( rndA_1c.getcount(), rndA_2->getcount() );
+  rndA_2->count();
+  CPPUNIT_ASSERT( rndA_1c.getcount() != rndA_2->getcount() );
 
-  // rndA has been cloned before we have manipulated the prototype
-  CPPUNIT_ASSERT( rndA->getcount() != rndA_2->getcount() );
-
-  // do something with the prototype.
-  rndA_1->setcount(0);
+  // the following is not possible
+  //rndA_1c.count();
 
   rndA_3 = PrototypeFactoryStub::getInstance().getProduct(PrototypeFactoryStub::Aclass);
@@ -183 +179 @@
   CPPUNIT_ASSERT( rndA->getcount() == rndA_3->getcount() );
 }
-
-void PrototypeFactoryTest::installPrototypetest()
-{
-  Prototype< teststubs::Aclass> *newprototype = new Prototype< teststubs::Aclass> ();
-  newprototype->setcount(1);
-  PrototypeFactoryStub::getInstance().installPrototype(newprototype, std::string("Aclass"));
-  newprototype = NULL;
-
-  IPrototype *rndA_1 = PrototypeFactoryStub::getInstance().getProduct(std::string("Aclass"));
-  CPPUNIT_ASSERT( 1 == rndA_1->getcount() );
-
-  rndA_1->count();
-  CPPUNIT_ASSERT( 2 == rndA_1->getcount() );
-
-  IPrototype *rndA_2 = PrototypeFactoryStub::getInstance().getProduct(std::string("Aclass"));
-  CPPUNIT_ASSERT( 1 == rndA_2->getcount() );
-  CPPUNIT_ASSERT( rndA_1->getcount() != rndA_2->getcount() );
-}

src/Patterns/unittests/PrototypeFactoryUnitTest.hpp

@@ -26 +26 @@
   CPPUNIT_TEST ( getProductTypeTest );
   CPPUNIT_TEST ( Individualitytest );
-  CPPUNIT_TEST ( PrototypeManipulatortest );
-  CPPUNIT_TEST ( installPrototypetest );
+  CPPUNIT_TEST ( getPrototypetest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -39 +38 @@
   void getProductTypeTest();
   void Individualitytest();
-  void PrototypeManipulatortest();
-  void installPrototypetest();
+  void getPrototypetest();
 
 private:

src/Patterns/unittests/stubs/PrototypeFactoryStub.def

@@ -1 @@
-#ifndef ABSTRACTFACTORYSTUB_DEF_
-#define ABSTRACTFACTORYSTUB_DEF_
+#ifndef PROTOTYPEFACTORYSTUB_DEF_
+#define PROTOTYPEFACTORYSTUB_DEF_
 
 #define type_seq (Aclass)(Bclass)
@@ -9 +9 @@
 #undef type_suffix
 
-#endif //ABSTRACTFACTORYSTUB_DEF_
+#endif //PROTOTYPEFACTORYSTUB_DEF_

src/Patterns/unittests/stubs/PrototypeFactoryStub.undef

@@ -1 @@
-#ifdef ABSTRACTFACTORYSTUB_DEF_
+#ifdef PROTOTYPEFACTORYSTUB_DEF_
 
 #undef type_seq
@@ -8 +8 @@
 #undef type_name_space
 
-#undef ABSTRACTFACTORYSTUB_DEF_
+#undef PROTOTYPEFACTORYSTUB_DEF_
 #endif