Changeset 10400 for code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc

Timestamp:

Apr 26, 2015, 3:22:27 PM (9 years ago)

Author:

landauf

Message:

fixed tests. however there are some open issues:

• the class-hierarchy must be built exactly 1 times in core_test. this is currently done in CommandTest.cc because that's the first test to run in core_test which actually needs the class hierarchy. the order of tests is not guaranteed though, so this should be solved more generic
• during creation of class hierarchy, config values are used. this fails in the tests, so it had to be disabled with a static flag in Identifier. this should be solved in a cleaner way.
• because the class hierarchy is now statically generated for all tests in core_test in CommandTest.cc, there is no way to test identifiers in an uninitialized state. because of this, three tests had to be disabled (*_NoFixture tests)

⇒ make the creation of the class hierarchy more modular and fix these issues

File:

• code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc (modified) (2 diffs)

code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc

@@ -90 +90 @@
         };
 
+        RegisterClassNoArgs(Nested1);
+        RegisterClassNoArgs(Nested2);
+        RegisterClassNoArgs(BaseClass);
+        RegisterClassNoArgs(Class1_notNested);
+        RegisterClassNoArgs(Class2_oneNested);
+        RegisterClassNoArgs(Class3_twoNested);
+        RegisterClassNoArgs(Class4_class1Nested);
+        RegisterClassNoArgs(Class5_class2Nested);
+        RegisterClassNoArgs(Class6_class3Nested);
+        RegisterClassNoArgs(Class3_Child);
+        RegisterClassNoArgs(Class6_Child);
+
         // Fixture
         class IdentifierNestedClassHierarchyTest : public ::testing::Test
@@ -96 +108 @@
                 virtual void SetUp()
                 {
-                    registerClass("Context", new ClassFactoryWithContext<Context>());
-                    registerClass("Listable", new ClassFactoryWithContext<Listable>());
-                    registerClass("Configurable", new ClassFactoryNoArgs<Configurable>());
-                    registerClass("OrxonoxClass", new ClassFactoryNoArgs<OrxonoxClass>());
-                    registerClass("Nested1", new ClassFactoryNoArgs<Nested1>());
-                    registerClass("Nested2", new ClassFactoryNoArgs<Nested2>());
-                    registerClass("BaseClass", new ClassFactoryNoArgs<BaseClass>());
-                    registerClass("Class1_notNested", new ClassFactoryNoArgs<Class1_notNested>());
-                    registerClass("Class2_oneNested", new ClassFactoryNoArgs<Class2_oneNested>());
-                    registerClass("Class3_twoNested", new ClassFactoryNoArgs<Class3_twoNested>());
-                    registerClass("Class4_class1Nested", new ClassFactoryNoArgs<Class4_class1Nested>());
-                    registerClass("Class5_class2Nested", new ClassFactoryNoArgs<Class5_class2Nested>());
-                    registerClass("Class6_class3Nested", new ClassFactoryNoArgs<Class6_class3Nested>());
-                    registerClass("Class3_Child", new ClassFactoryNoArgs<Class3_Child>());
-                    registerClass("Class6_Child", new ClassFactoryNoArgs<Class6_Child>());
-
-                    IdentifierManager::getInstance().createClassHierarchy();
                 }
 
                 virtual void TearDown()
                 {
-                    IdentifierManager::getInstance().destroyAllIdentifiers();
                 }
         };