Changeset 10544
- Timestamp:
- Jun 7, 2015, 3:24:55 PM (9 years ago)
- Location:
- code/branches/core7
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core7/src/libraries/core/Core.cc
r10543 r10544 255 255 if (this->staticInitHandler_) 256 256 StaticInitializationManager::getInstance().removeHandler(this->staticInitHandler_); 257 delete Context::getRootContext(); 258 Context::setRootContext(NULL); 257 Context::destroyRootContext(); 259 258 safeObjectDelete(&rootModule_); 260 259 safeObjectDelete(&staticInitHandler_); -
code/branches/core7/src/libraries/core/object/Context.cc
r10543 r10544 79 79 } 80 80 81 /*static*/ void Context::destroyRootContext() 82 { 83 delete Context::rootContext_s; 84 Context::rootContext_s = NULL; 85 } 86 81 87 /*static*/ Context* Context::getRootContext() 82 88 { -
code/branches/core7/src/libraries/core/object/Context.h
r10539 r10544 47 47 public: 48 48 static void setRootContext(Context* context); 49 static void destroyRootContext(); 49 50 static Context* getRootContext(); 50 51 -
code/branches/core7/test/core/class/IdentifiableTest.cc
r10535 r10544 22 22 virtual void SetUp() 23 23 { 24 new IdentifierManager(); 24 25 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 25 26 } … … 28 29 { 29 30 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 31 delete &IdentifierManager::getInstance(); 30 32 } 31 33 }; -
code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc
r10535 r10544 142 142 virtual void SetUp() 143 143 { 144 new IdentifierManager(); 144 145 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 146 Context::setRootContext(new Context(NULL)); 145 147 Identifier::initConfigValues_s = false; // TODO: hack! 146 148 IdentifierManager::getInstance().createClassHierarchy(); … … 150 152 { 151 153 IdentifierManager::getInstance().destroyClassHierarchy(); 154 Context::destroyRootContext(); 152 155 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 156 delete &IdentifierManager::getInstance(); 153 157 } 154 158 }; -
code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc
r10535 r10544 49 49 virtual void SetUp() 50 50 { 51 new IdentifierManager(); 51 52 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 53 Context::setRootContext(new Context(NULL)); 52 54 Identifier::initConfigValues_s = false; // TODO: hack! 53 55 IdentifierManager::getInstance().createClassHierarchy(); … … 57 59 { 58 60 IdentifierManager::getInstance().destroyClassHierarchy(); 61 Context::destroyRootContext(); 59 62 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 63 delete &IdentifierManager::getInstance(); 60 64 } 61 65 }; -
code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc
r10535 r10544 109 109 virtual void SetUp() 110 110 { 111 new IdentifierManager(); 111 112 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 113 Context::setRootContext(new Context(NULL)); 112 114 Identifier::initConfigValues_s = false; // TODO: hack! 113 115 IdentifierManager::getInstance().createClassHierarchy(); … … 117 119 { 118 120 IdentifierManager::getInstance().destroyClassHierarchy(); 121 Context::destroyRootContext(); 119 122 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 123 delete &IdentifierManager::getInstance(); 120 124 } 121 125 }; -
code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc
r10535 r10544 51 51 virtual void SetUp() 52 52 { 53 new IdentifierManager(); 53 54 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 55 Context::setRootContext(new Context(NULL)); 54 56 Identifier::initConfigValues_s = false; // TODO: hack! 55 57 IdentifierManager::getInstance().createClassHierarchy(); … … 59 61 { 60 62 IdentifierManager::getInstance().destroyClassHierarchy(); 63 Context::destroyRootContext(); 61 64 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 65 delete &IdentifierManager::getInstance(); 62 66 } 63 67 }; -
code/branches/core7/test/core/class/IdentifierTest.cc
r10535 r10544 29 29 virtual void SetUp() 30 30 { 31 new IdentifierManager(); 31 32 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 32 33 } … … 35 36 { 36 37 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 38 delete &IdentifierManager::getInstance(); 37 39 } 38 40 }; -
code/branches/core7/test/core/class/OrxonoxClassTest.cc
r9649 r10544 1 1 #include <gtest/gtest.h> 2 2 #include "core/class/OrxonoxClass.h" 3 #include "core/class/IdentifierManager.h" 3 4 #include "core/object/Context.h" 4 5 … … 17 18 virtual void SetUp() 18 19 { 20 new IdentifierManager(); 19 21 Context::setRootContext(new Context(NULL)); 20 22 } … … 22 24 virtual void TearDown() 23 25 { 24 Context::setRootContext(NULL); 26 Context::destroyRootContext(); 27 delete &IdentifierManager::getInstance(); 25 28 } 26 29 }; -
code/branches/core7/test/core/class/OrxonoxInterfaceTest.cc
r9649 r10544 2 2 #include "core/class/OrxonoxInterface.h" 3 3 #include "core/class/OrxonoxClass.h" 4 #include "core/class/IdentifierManager.h" 4 5 #include "core/object/Context.h" 5 6 … … 32 33 virtual void SetUp() 33 34 { 35 new IdentifierManager(); 34 36 Context::setRootContext(new Context(NULL)); 35 37 } … … 37 39 virtual void TearDown() 38 40 { 39 Context::setRootContext(NULL); 41 Context::destroyRootContext(); 42 delete &IdentifierManager::getInstance(); 40 43 } 41 44 }; -
code/branches/core7/test/core/class/SubclassIdentifierTest.cc
r10535 r10544 31 31 virtual void SetUp() 32 32 { 33 new IdentifierManager(); 33 34 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 35 Context::setRootContext(new Context(NULL)); 34 36 Identifier::initConfigValues_s = false; // TODO: hack! 35 37 IdentifierManager::getInstance().createClassHierarchy(); 36 37 Context::setRootContext(new Context(NULL));38 38 } 39 39 40 40 virtual void TearDown() 41 41 { 42 Context::setRootContext(NULL);43 44 42 IdentifierManager::getInstance().destroyClassHierarchy(); 43 Context::destroyRootContext(); 45 44 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 45 delete &IdentifierManager::getInstance(); 46 46 } 47 47 }; -
code/branches/core7/test/core/class/SuperTest.cc
r10535 r10544 72 72 virtual void SetUp() 73 73 { 74 new IdentifierManager(); 74 75 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 76 Context::setRootContext(new Context(NULL)); 75 77 Identifier::initConfigValues_s = false; // TODO: hack! 76 78 IdentifierManager::getInstance().createClassHierarchy(); 77 78 Context::setRootContext(new Context(NULL));79 79 } 80 80 81 81 virtual void TearDown() 82 82 { 83 Context::setRootContext(NULL);84 85 83 IdentifierManager::getInstance().destroyClassHierarchy(); 84 Context::destroyRootContext(); 86 85 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 86 delete &IdentifierManager::getInstance(); 87 87 } 88 88 }; -
code/branches/core7/test/core/command/CommandTest.cc
r10535 r10544 140 140 virtual void SetUp() 141 141 { 142 new IdentifierManager(); 143 new ConsoleCommandManager(); 142 144 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::CONSOLE_COMMAND); 145 Context::setRootContext(new Context(NULL)); 143 146 Identifier::initConfigValues_s = false; // TODO: hack! 144 147 IdentifierManager::getInstance().createClassHierarchy(); … … 148 151 { 149 152 IdentifierManager::getInstance().destroyClassHierarchy(); 153 Context::destroyRootContext(); 150 154 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::CONSOLE_COMMAND); 155 delete &ConsoleCommandManager::getInstance(); 156 delete &IdentifierManager::getInstance(); 151 157 } 152 158 }; -
code/branches/core7/test/core/object/ClassFactoryTest.cc
r10535 r10544 16 16 virtual void SetUp() 17 17 { 18 new IdentifierManager(); 19 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 18 20 Context::setRootContext(new Context(NULL)); 19 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);20 21 } 21 22 22 23 virtual void TearDown() 23 24 { 25 Context::destroyRootContext(); 24 26 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 25 Context::setRootContext(NULL);27 delete &IdentifierManager::getInstance(); 26 28 } 27 29 }; -
code/branches/core7/test/core/object/ContextTest.cc
r10535 r10544 23 23 virtual void SetUp() 24 24 { 25 new IdentifierManager(); 26 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 25 27 Context::setRootContext(new Context(NULL)); 26 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);27 28 } 28 29 29 30 virtual void TearDown() 30 31 { 32 Context::destroyRootContext(); 31 33 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 32 Context::setRootContext(NULL);34 delete &IdentifierManager::getInstance(); 33 35 } 34 36 }; -
code/branches/core7/test/core/object/IteratorTest.cc
r10535 r10544 34 34 virtual void SetUp() 35 35 { 36 new IdentifierManager(); 37 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 36 38 Context::setRootContext(new Context(NULL)); 37 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);38 39 } 39 40 40 41 virtual void TearDown() 41 42 { 43 Context::destroyRootContext(); 42 44 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 43 Context::setRootContext(NULL);45 delete &IdentifierManager::getInstance(); 44 46 } 45 47 }; -
code/branches/core7/test/core/object/ListableTest.cc
r10535 r10544 11 11 { 12 12 public: 13 ListableClassTest() { RegisterObject(ListableClassTest); }13 ListableClassTest() { RegisterObject(ListableClassTest); } 14 14 }; 15 15 … … 39 39 virtual void SetUp() 40 40 { 41 new IdentifierManager(); 42 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 41 43 Context::setRootContext(new Context(NULL)); 42 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);43 44 } 44 45 45 46 virtual void TearDown() 46 47 { 48 Context::destroyRootContext(); 47 49 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 48 Context::setRootContext(NULL);50 delete &IdentifierManager::getInstance(); 49 51 } 50 52 }; -
code/branches/core7/test/core/object/ObjectListIteratorTest.cc
r10535 r10544 26 26 virtual void SetUp() 27 27 { 28 new IdentifierManager(); 29 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 28 30 Context::setRootContext(new Context(NULL)); 29 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);30 31 } 31 32 32 33 virtual void TearDown() 33 34 { 35 Context::destroyRootContext(); 34 36 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 35 Context::setRootContext(NULL);37 delete &IdentifierManager::getInstance(); 36 38 } 37 39 }; -
code/branches/core7/test/core/singleton/ScopeTest.cc
r10535 r10544 28 28 virtual void SetUp() 29 29 { 30 new IdentifierManager(); 31 new ScopeManager(); 30 32 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 31 33 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::SCOPED_SINGLETON_WRAPPER); 34 Context::setRootContext(new Context(NULL)); 32 35 } 33 36 34 37 virtual void TearDown() 35 38 { 39 Context::destroyRootContext(); 36 40 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::SCOPED_SINGLETON_WRAPPER); 37 41 ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 42 delete &ScopeManager::getInstance(); 43 delete &IdentifierManager::getInstance(); 38 44 } 39 45 };
Note: See TracChangeset
for help on using the changeset viewer.