Changeset 9637 for code/branches/core6/test

Timestamp:

Aug 11, 2013, 4:23:41 PM (11 years ago)

Author:

landauf

Message:

removed constructor arguments from ClassFactories. use the helper-function registerClass() to add the factory to the corresponding identifier

Location:

code/branches/core6/test/core

Files:

• class/IdentifierExternalClassHierarchyTest.cc (modified) (1 diff, 1 prop)
• class/IdentifierSimpleClassHierarchyTest.cc (modified) (1 diff, 1 prop)
• object/ClassFactoryTest.cc (modified) (1 diff)

code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc

@@ -22 +22 @@
                 virtual void SetUp()
                 {
-                    new ClassFactory<Interface>("Interface");
-                    new ClassFactory<BaseClass>("BaseClass");
-                    new ClassFactory<RealClass>("RealClass");
+                    registerClass("Interface", new ClassFactoryNoArgs<Interface>());
+                    registerClass("BaseClass", new ClassFactoryNoArgs<BaseClass>());
+                    registerClass("RealClass", new ClassFactoryNoArgs<RealClass>());
                     IdentifierManager::createClassHierarchy();
                 }

code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc

@@ -24 +24 @@
                 virtual void SetUp()
                 {
-                    new ClassFactory<Interface>("Interface");
-                    new ClassFactory<BaseClass>("BaseClass");
-                    new ClassFactory<RealClass>("RealClass");
+                    registerClass("Interface", new ClassFactoryNoArgs<Interface>());
+                    registerClass("BaseClass", new ClassFactoryNoArgs<BaseClass>());
+                    registerClass("RealClass", new ClassFactoryNoArgs<RealClass>());
                     IdentifierManager::createClassHierarchy();
                 }

code/branches/core6/test/core/object/ClassFactoryTest.cc

@@ -7 +7 @@
     TEST(ClassFactoryTest, CanFabricateObject)
     {
-        Factory* factory = new ClassFactoryWithContext<BaseObject>("BaseObject");
+        Factory* factory = new ClassFactoryWithContext<BaseObject>();
         Identifiable* object = factory->fabricate(NULL);
         ASSERT_TRUE(object != NULL);