Changeset 724564 for src/Patterns/unittests

Timestamp:

Jan 4, 2011, 5:15:14 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

1afcbe

Parents:

746ff1

git-author:

Frederik Heber <heber@…> (01/04/11 15:57:33)

git-committer:

Frederik Heber <heber@…> (01/04/11 17:15:14)

Message:

Factory know has an additional type table and stubs have been refactored.

• CommonStub.?pp contains basic classes with a int counter inside.
• Library version is now 2:1:0, API is 1.0.3.

Location:

src/Patterns/unittests

Files:

• CreatorUnitTest.cpp (modified) (1 diff)
• FactoryUnitTest.cpp (modified) (3 diffs)
• FactoryUnitTest.hpp (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• stubs/CommonStub.cpp (moved) (moved from src/Patterns/unittests/stubs/CreatorStub.cpp ) (2 diffs)
• stubs/CommonStub.hpp (added)
• stubs/CreatorStub.hpp (modified) (2 diffs)
• stubs/FactoryStub.cpp (modified) (1 diff)
• stubs/FactoryStub.hpp (modified) (2 diffs)

src/Patterns/unittests/CreatorUnitTest.cpp

@@ -25 +25 @@
 
 #include "Creator.hpp"
+#include "stubs/CommonStub.hpp"
 #include "stubs/CreatorStub.hpp"
 

src/Patterns/unittests/FactoryUnitTest.cpp

@@ -22 +22 @@
 #include "FactoryUnitTest.hpp"
 
+#include "stubs/CommonStub.hpp"
 #include "stubs/FactoryStub.hpp"
 
@@ -68 +69 @@
 void FactoryTest::setUp()
 {
-  FactoryStub::getInstance();
+  rndA =
+      FactoryStub::getInstance().
+      PrototypeTable[FactoryStub::Aclass]->create();
+  rndB =
+      FactoryStub::getInstance().
+      PrototypeTable[FactoryStub::Bclass]->create();
 }
 
 void FactoryTest::tearDown()
 {
+  delete rndA;
+  delete rndB;
   FactoryStub::purgeInstance();
 }
@@ -93 +101 @@
   }
 
-  // check one of the distributions in the table
-  ICreatorStub * rnd =
-      FactoryStub::getInstance().
-      PrototypeTable[FactoryStub::Aclass]->create();
+  // check distributions in the table
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(teststubs::Aclass).name()),
-      rnd->name()
+      rndA->name()
   );
-  delete rnd;
+  CPPUNIT_ASSERT_EQUAL(
+      std::string(typeid(teststubs::Bclass).name()),
+      rndB->name()
+  );
 }
+
+
+void FactoryTest::getProductEnumTest()
+{
+  ICreatorStub * 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"));
+  CPPUNIT_ASSERT( typeid(*rndA) == typeid(*rndA_1) );
+  delete rndA_1;
+}
+
+void FactoryTest::getProductTypeTest()
+{
+  ICreatorStub * rndA_1 =
+      FactoryStub::getInstance().getProduct( typeid(teststubs::Aclass) );
+  CPPUNIT_ASSERT( typeid(*rndA) == typeid(*rndA_1) );
+  delete rndA_1;
+}

src/Patterns/unittests/FactoryUnitTest.hpp

@@ -14 +14 @@
 #endif
 
+class ICreatorStub;
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -21 +22 @@
   CPPUNIT_TEST_SUITE( FactoryTest );
   CPPUNIT_TEST ( DistributionTest );
+  CPPUNIT_TEST ( getProductEnumTest );
+  CPPUNIT_TEST ( getProductNameTest );
+  CPPUNIT_TEST ( getProductTypeTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -28 +32 @@
 
   void DistributionTest();
+  void getProductEnumTest();
+  void getProductNameTest();
+  void getProductTypeTest();
 
 private:
+  ICreatorStub * rndA;
+  ICreatorStub * rndB;
 };
 

src/Patterns/unittests/Makefile.am

@@ -37 +37 @@
         CreatorUnitTest.hpp \
         ../Creator.hpp \
-        stubs/CreatorStub.hpp \
-        stubs/CreatorStub.cpp
+        stubs/CommonStub.cpp \
+        stubs/CommonStub.hpp \
+        stubs/CreatorStub.hpp
 CreatorUnitTest_LDADD = $(TESTLIBS)
 
@@ -44 +45 @@
         FactoryUnitTest.cpp \
         FactoryUnitTest.hpp \
+        stubs/CommonStub.cpp \
+        stubs/CommonStub.hpp \
         stubs/CreatorStub.hpp \
-        stubs/CreatorStub.cpp \
         stubs/FactoryStub.hpp \
         stubs/FactoryStub.cpp \

src/Patterns/unittests/stubs/CommonStub.cpp

@@ -7 +7 @@
 
 /*
- * CreatorStub.cpp
+ * CommonStub.cpp
  *
  *  Created on: Jan 4, 2011
@@ -13 +13 @@
  */
 
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "CommonStub.hpp"
+
 namespace teststubs {
-  class Aclass {};
-  class Bclass {};
+  Aclass::Aclass() :
+    counter(0)
+  {};
+
+  Aclass::~Aclass() {};
+
+  Bclass::Bclass() :
+    counter(256)
+  {};
+
+  Bclass::~Bclass() {};
 };

src/Patterns/unittests/stubs/CreatorStub.hpp

@@ -8 +8 @@
 #ifndef CREATORSTUB_HPP_
 #define CREATORSTUB_HPP_
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <typeinfo>
@@ -19 +24 @@
   virtual int getcount() = 0;
   virtual std::string name() = 0;
-};
-
-namespace teststubs {
-  class Aclass
-  {
-  public:
-    Aclass() :
-      counter(0)
-    {};
-    ~Aclass() {};
-
-    int counter;
-  };
-
-  class Bclass
-  {
-  public:
-    Bclass() :
-      counter(256)
-    {};
-    ~Bclass() {};
-
-    int counter;
-  };
 };
 

src/Patterns/unittests/stubs/FactoryStub.cpp

@@ -13 +13 @@
  */
 
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "Singleton_impl.hpp"
 
+#include "CommonStub.hpp"
 #include "FactoryStub.hpp"
 

src/Patterns/unittests/stubs/FactoryStub.hpp

@@ -9 +9 @@
 #define FACTORYSTUB_HPP_
 
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "CreatorStub.hpp"
 
-// has to be appear BEFORE Factory.hpp is included!
+// triple has to be appear BEFORE Factory.hpp is included!
 #include "FactoryStub.def"
 #include "FactoryTypeList.hpp"
+#include "FactoryStub.undef"
+
 #include "Factory.hpp"
 
@@ -27 +34 @@
   virtual ~FactoryStub();
 };
-#include "FactoryStub.undef"
 
 #endif /* FACTORYSTUB_HPP_ */