Changeset 11054 for code/branches/cpp11_v3/test/core/class/SubclassIdentifierTest.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• test/core/class/SubclassIdentifierTest.cc (modified) (4 diffs)

code/branches/cpp11_v3/test/core/class/SubclassIdentifierTest.cc

@@ -13 +13 @@
         {
             public:
-                TestClass(Context* context = NULL) { RegisterObject(TestClass); }
+                TestClass(Context* context = nullptr) { RegisterObject(TestClass); }
         };
 
@@ -19 +19 @@
         {
             public:
-                TestSubclass(Context* context = NULL) { RegisterObject(TestSubclass); }
+                TestSubclass(Context* context = nullptr) { RegisterObject(TestSubclass); }
         };
 
@@ -29 +29 @@
         {
             public:
-                virtual void SetUp()
+                virtual void SetUp() override
                 {
                     new IdentifierManager();
                     ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
-                    Context::setRootContext(new Context(NULL));
+                    Context::setRootContext(new Context(nullptr));
                     Identifier::initConfigValues_s = false; // TODO: hack!
                     IdentifierManager::getInstance().createClassHierarchy();
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                     IdentifierManager::getInstance().destroyClassHierarchy();
@@ -77 +77 @@
         subclassIdentifier = Class(TestSubclass);
 
-        TestClass* instance = subclassIdentifier.fabricate(NULL);
-        ASSERT_TRUE(instance != NULL);
+        TestClass* instance = subclassIdentifier.fabricate(nullptr);
+        ASSERT_TRUE(instance != nullptr);
         EXPECT_EQ(Class(TestSubclass), instance->getIdentifier());
         delete instance;