Changeset 11054 for code/branches/cpp11_v3/test/core/object/ContextTest.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/object/ContextTest.cc (modified) (6 diffs)

code/branches/cpp11_v3/test/core/object/ContextTest.cc

@@ -12 +12 @@
         {
             public:
-                SubclassContext() : Context(NULL) { RegisterObject(SubclassContext); }
+                SubclassContext() : Context(nullptr) { RegisterObject(SubclassContext); }
         };
 
@@ -21 +21 @@
         {
             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();
@@ -39 +39 @@
     TEST_F(ContextTest, CanCreateContext)
     {
-        Context context(NULL);
+        Context context(nullptr);
     }
 
@@ -49 +49 @@
     TEST_F(ContextTest, ContextIsItsOwnContext)
     {
-        Context context(NULL);
+        Context context(nullptr);
         EXPECT_EQ(&context, context.getContext());
     }
@@ -68 +68 @@
     TEST_F(ContextTest, ContextIsAddedToItsOwnObjectList)
     {
-        Context context(NULL);
+        Context context(nullptr);
         ASSERT_EQ(1u, context.getObjectList<Context>()->size());
         EXPECT_TRUE(context.getObjectList<Context>()->begin()->objectBase_ == static_cast<Listable*>(&context));
@@ -75 +75 @@
     TEST_F(ContextTest, ContextIsAddedToObjectListOfBaseContext)
     {
-        Context baseContext(NULL);
+        Context baseContext(nullptr);
         Context subContext(&baseContext);