Changeset 10544 for code/branches/core7/test/core/singleton/ScopeTest.cc

Timestamp:

Jun 7, 2015, 3:24:55 PM (9 years ago)

Author:

landauf

Message:

fixed tests

File:

• code/branches/core7/test/core/singleton/ScopeTest.cc (modified) (1 diff)

code/branches/core7/test/core/singleton/ScopeTest.cc

@@ -28 +28 @@
                 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();
                 }
         };