[Orxonox-commit 5884] r10544 - in code/branches/core7: src/libraries/core src/libraries/core/object test/core/class test/core/command test/core/object test/core/singleton
landauf at orxonox.net
landauf at orxonox.net
Sun Jun 7 15:24:56 CEST 2015
Author: landauf
Date: 2015-06-07 15:24:55 +0200 (Sun, 07 Jun 2015)
New Revision: 10544
Modified:
code/branches/core7/src/libraries/core/Core.cc
code/branches/core7/src/libraries/core/object/Context.cc
code/branches/core7/src/libraries/core/object/Context.h
code/branches/core7/test/core/class/IdentifiableTest.cc
code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc
code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc
code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc
code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc
code/branches/core7/test/core/class/IdentifierTest.cc
code/branches/core7/test/core/class/OrxonoxClassTest.cc
code/branches/core7/test/core/class/OrxonoxInterfaceTest.cc
code/branches/core7/test/core/class/SubclassIdentifierTest.cc
code/branches/core7/test/core/class/SuperTest.cc
code/branches/core7/test/core/command/CommandTest.cc
code/branches/core7/test/core/object/ClassFactoryTest.cc
code/branches/core7/test/core/object/ContextTest.cc
code/branches/core7/test/core/object/IteratorTest.cc
code/branches/core7/test/core/object/ListableTest.cc
code/branches/core7/test/core/object/ObjectListIteratorTest.cc
code/branches/core7/test/core/singleton/ScopeTest.cc
Log:
fixed tests
Modified: code/branches/core7/src/libraries/core/Core.cc
===================================================================
--- code/branches/core7/src/libraries/core/Core.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/src/libraries/core/Core.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -254,8 +254,7 @@
}
if (this->staticInitHandler_)
StaticInitializationManager::getInstance().removeHandler(this->staticInitHandler_);
- delete Context::getRootContext();
- Context::setRootContext(NULL);
+ Context::destroyRootContext();
safeObjectDelete(&rootModule_);
safeObjectDelete(&staticInitHandler_);
delete &StaticInitializationManager::getInstance();
Modified: code/branches/core7/src/libraries/core/object/Context.cc
===================================================================
--- code/branches/core7/src/libraries/core/object/Context.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/src/libraries/core/object/Context.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -78,6 +78,12 @@
Context::rootContext_s = context;
}
+ /*static*/ void Context::destroyRootContext()
+ {
+ delete Context::rootContext_s;
+ Context::rootContext_s = NULL;
+ }
+
/*static*/ Context* Context::getRootContext()
{
OrxVerify(Context::rootContext_s != NULL, "Root Context is undefined");
Modified: code/branches/core7/src/libraries/core/object/Context.h
===================================================================
--- code/branches/core7/src/libraries/core/object/Context.h 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/src/libraries/core/object/Context.h 2015-06-07 13:24:55 UTC (rev 10544)
@@ -46,6 +46,7 @@
{
public:
static void setRootContext(Context* context);
+ static void destroyRootContext();
static Context* getRootContext();
Context(Context* context);
Modified: code/branches/core7/test/core/class/IdentifiableTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifiableTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/IdentifiableTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -21,12 +21,14 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
virtual void TearDown()
{
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -141,7 +141,9 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ Context::setRootContext(new Context(NULL));
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -149,7 +151,9 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &IdentifierManager::getInstance();
}
};
Modified: code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -48,7 +48,9 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ Context::setRootContext(new Context(NULL));
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -56,7 +58,9 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &IdentifierManager::getInstance();
}
};
Modified: code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -108,7 +108,9 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ Context::setRootContext(new Context(NULL));
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -116,7 +118,9 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &IdentifierManager::getInstance();
}
};
Modified: code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -50,7 +50,9 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ Context::setRootContext(new Context(NULL));
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -58,7 +60,9 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &IdentifierManager::getInstance();
}
};
Modified: code/branches/core7/test/core/class/IdentifierTest.cc
===================================================================
--- code/branches/core7/test/core/class/IdentifierTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/IdentifierTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -28,12 +28,14 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
virtual void TearDown()
{
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/class/OrxonoxClassTest.cc
===================================================================
--- code/branches/core7/test/core/class/OrxonoxClassTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/OrxonoxClassTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -1,5 +1,6 @@
#include <gtest/gtest.h>
#include "core/class/OrxonoxClass.h"
+#include "core/class/IdentifierManager.h"
#include "core/object/Context.h"
namespace orxonox
@@ -16,12 +17,14 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
Context::setRootContext(new Context(NULL));
}
virtual void TearDown()
{
- Context::setRootContext(NULL);
+ Context::destroyRootContext();
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/class/OrxonoxInterfaceTest.cc
===================================================================
--- code/branches/core7/test/core/class/OrxonoxInterfaceTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/OrxonoxInterfaceTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -1,6 +1,7 @@
#include <gtest/gtest.h>
#include "core/class/OrxonoxInterface.h"
#include "core/class/OrxonoxClass.h"
+#include "core/class/IdentifierManager.h"
#include "core/object/Context.h"
namespace orxonox
@@ -31,12 +32,14 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
Context::setRootContext(new Context(NULL));
}
virtual void TearDown()
{
- Context::setRootContext(NULL);
+ Context::destroyRootContext();
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/class/SubclassIdentifierTest.cc
===================================================================
--- code/branches/core7/test/core/class/SubclassIdentifierTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/SubclassIdentifierTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -30,19 +30,19 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ Context::setRootContext(new Context(NULL));
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
-
- Context::setRootContext(new Context(NULL));
}
virtual void TearDown()
{
- Context::setRootContext(NULL);
-
IdentifierManager::getInstance().destroyClassHierarchy();
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/class/SuperTest.cc
===================================================================
--- code/branches/core7/test/core/class/SuperTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/class/SuperTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -71,19 +71,19 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ Context::setRootContext(new Context(NULL));
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
-
- Context::setRootContext(new Context(NULL));
}
virtual void TearDown()
{
- Context::setRootContext(NULL);
-
IdentifierManager::getInstance().destroyClassHierarchy();
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/command/CommandTest.cc
===================================================================
--- code/branches/core7/test/core/command/CommandTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/command/CommandTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -139,7 +139,10 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
+ new ConsoleCommandManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::CONSOLE_COMMAND);
+ Context::setRootContext(new Context(NULL));
Identifier::initConfigValues_s = false; // TODO: hack!
IdentifierManager::getInstance().createClassHierarchy();
}
@@ -147,7 +150,10 @@
virtual void TearDown()
{
IdentifierManager::getInstance().destroyClassHierarchy();
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::CONSOLE_COMMAND);
+ delete &ConsoleCommandManager::getInstance();
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/object/ClassFactoryTest.cc
===================================================================
--- code/branches/core7/test/core/object/ClassFactoryTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/object/ClassFactoryTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -15,14 +15,16 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
virtual void TearDown()
{
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
- Context::setRootContext(NULL);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/object/ContextTest.cc
===================================================================
--- code/branches/core7/test/core/object/ContextTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/object/ContextTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -22,14 +22,16 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
virtual void TearDown()
{
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
- Context::setRootContext(NULL);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/object/IteratorTest.cc
===================================================================
--- code/branches/core7/test/core/object/IteratorTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/object/IteratorTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -33,14 +33,16 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
virtual void TearDown()
{
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
- Context::setRootContext(NULL);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/object/ListableTest.cc
===================================================================
--- code/branches/core7/test/core/object/ListableTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/object/ListableTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -10,7 +10,7 @@
class ListableClassTest : public Listable
{
public:
- ListableClassTest() { RegisterObject(ListableClassTest); }
+ ListableClassTest() { RegisterObject(ListableClassTest); }
};
class ListableSubclassTest : public ListableClassTest
@@ -38,14 +38,16 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
virtual void TearDown()
{
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
- Context::setRootContext(NULL);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/object/ObjectListIteratorTest.cc
===================================================================
--- code/branches/core7/test/core/object/ObjectListIteratorTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/object/ObjectListIteratorTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -25,14 +25,16 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
+ ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(NULL));
- ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
virtual void TearDown()
{
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
- Context::setRootContext(NULL);
+ delete &IdentifierManager::getInstance();
}
};
}
Modified: code/branches/core7/test/core/singleton/ScopeTest.cc
===================================================================
--- code/branches/core7/test/core/singleton/ScopeTest.cc 2015-06-07 12:50:04 UTC (rev 10543)
+++ code/branches/core7/test/core/singleton/ScopeTest.cc 2015-06-07 13:24:55 UTC (rev 10544)
@@ -27,14 +27,20 @@
public:
virtual void SetUp()
{
+ new IdentifierManager();
+ new ScopeManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::SCOPED_SINGLETON_WRAPPER);
+ Context::setRootContext(new Context(NULL));
}
virtual void TearDown()
{
+ Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::SCOPED_SINGLETON_WRAPPER);
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
+ delete &ScopeManager::getInstance();
+ delete &IdentifierManager::getInstance();
}
};
}
More information about the Orxonox-commit
mailing list