Changeset 10765 for code/branches/cpp11_v2/test/util

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/test/util

Files:

• SharedPtrTest.cc (modified) (2 diffs)
• SingletonTest.cc (modified) (1 diff)
• output/ConsoleWriterTest.cc (modified) (2 diffs)
• output/OutputManagerTest.cc (modified) (2 diffs)

code/branches/cpp11_v2/test/util/SharedPtrTest.cc

@@ -192 +192 @@
         // default
         SharedPtr<TestChildClass> sharedPtr1;
-        EXPECT_EQ(NULL, sharedPtr1.get());
+        EXPECT_EQ(nullptr, sharedPtr1.get());
 
         // pointer
@@ -221 +221 @@
         // default
         SharedPtr<TestChildClass> sharedPtr1;
-        EXPECT_EQ(NULL, sharedPtr1.get());
+        EXPECT_EQ(nullptr, sharedPtr1.get());
 
         // pointer

code/branches/cpp11_v2/test/util/SingletonTest.cc

@@ -23 +23 @@
         };
 
-        TestSingleton* TestSingleton::singletonPtr_s = NULL;
+        TestSingleton* TestSingleton::singletonPtr_s = nullptr;
         const size_t TestSingleton::MAGIC_VALUE = 0xCAFEBABE;
     }

code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc

@@ -27 +27 @@
     TEST_F(ConsoleWriterTest, Disable)
     {
-        std::ostream stream(NULL);
+        std::ostream stream(nullptr);
         EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size());
         ConsoleWriter writer(stream);
@@ -37 +37 @@
     TEST_F(ConsoleWriterTest, Enable)
     {
-        std::ostream stream(NULL);
+        std::ostream stream(nullptr);
         ConsoleWriter writer(stream);
         writer.disable();

code/branches/cpp11_v2/test/util/output/OutputManagerTest.cc

@@ -54 +54 @@
     TEST(OutputManagerTest, GetInstanceDoesNotCreateDefaultListeners)
     {
-        EXPECT_TRUE(NULL == OutputManager::getInstance().getMemoryWriter());
-        EXPECT_TRUE(NULL == OutputManager::getInstance().getConsoleWriter());
-        EXPECT_TRUE(NULL == OutputManager::getInstance().getLogWriter());
+        EXPECT_TRUE(nullptr == OutputManager::getInstance().getMemoryWriter());
+        EXPECT_TRUE(nullptr == OutputManager::getInstance().getConsoleWriter());
+        EXPECT_TRUE(nullptr == OutputManager::getInstance().getLogWriter());
     }
 
@@ -62 +62 @@
     TEST(OutputManagerTest, GetInstanceAndCreateListenersCreatesDefaultListeners)
     {
-        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
-        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
-        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getLogWriter());
+        EXPECT_TRUE(nullptr != OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
+        EXPECT_TRUE(nullptr != OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
+        EXPECT_TRUE(nullptr != OutputManager::getInstanceAndCreateListeners().getLogWriter());
     }