Changeset 10400 for code/branches/core7/src/libraries/core

Timestamp:

Apr 26, 2015, 3:22:27 PM (10 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

Location:

code/branches/core7/src/libraries/core/class

Files:

• Identifier.cc (modified) (1 diff)
• Identifier.h (modified) (2 diffs)

code/branches/core7/src/libraries/core/class/Identifier.cc

@@ -44 +44 @@
 namespace orxonox
 {
+    bool Identifier::initConfigValues_s = true;
+
     // ###############################
     // ###       Identifier        ###

code/branches/core7/src/libraries/core/class/Identifier.h

@@ -207 +207 @@
             virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const = 0;
 
+            static bool initConfigValues_s; // TODO: this is a hack - remove it as soon as possible
+
         protected:
             virtual void createSuperFunctionCaller() const = 0;
@@ -330 +332 @@
             IdentifierManager::getInstance().createdObject(object);
 
-            this->setConfigValues(object, object);
+            if (Identifier::initConfigValues_s)
+                this->setConfigValues(object, object);
+
             return true;
         }