Changeset 11071 for code/trunk/test/core/object/ClassFactoryTest.cc

Timestamp:

Jan 17, 2016, 10:29:21 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• test/core/object/ClassFactoryTest.cc (modified) (2 diffs)

code/trunk/test/core/object/ClassFactoryTest.cc

@@ -14 +14 @@
         {
             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));
                 }
 
-                virtual void TearDown()
+                virtual void TearDown() override
                 {
                     Context::destroyRootContext();
@@ -33 +33 @@
     {
         Factory* factory = new ClassFactoryWithContext<BaseObject>();
-        Identifiable* object = factory->fabricate(NULL);
-        ASSERT_TRUE(object != NULL);
+        Identifiable* object = factory->fabricate(nullptr);
+        ASSERT_TRUE(object != nullptr);
         BaseObject* baseObject = dynamic_cast<BaseObject*>(object);
-        EXPECT_TRUE(baseObject != NULL);
+        EXPECT_TRUE(baseObject != nullptr);
         delete object;
         // don't delete factory - it remains in the identifier