Changeset 9547 for code/branches/testing/test/util

Timestamp:

Mar 12, 2013, 10:05:25 PM (12 years ago)

Author:

landauf

Message:

return pointers instead of references because they could be null

Location:

code/branches/testing/test/util/output

Files:

• ConsoleWriterTest.cc (modified) (1 diff)
• OutputManagerTest.cc (modified) (3 diffs)
• OutputStreamTest.cc (modified) (2 diffs)

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

@@ -66 +66 @@
     {
         OutputManager::getInstanceAndCreateListeners();
-        EXPECT_EQ(std::cout, OutputManager::getInstance().getConsoleWriter().getOutputStream());
+        EXPECT_EQ(std::cout, OutputManager::getInstance().getConsoleWriter()->getOutputStream());
     }
 }

code/branches/testing/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(NULL == OutputManager::getInstance().getMemoryWriter());
+        EXPECT_TRUE(NULL == OutputManager::getInstance().getConsoleWriter());
+        EXPECT_TRUE(NULL == 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(NULL != OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
+        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
+        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getLogWriter());
     }
 
@@ -70 +70 @@
     TEST(OutputManagerTest, GetInstanceAndCreateListenersDoesNotCreateDefaultListenersTwice)
     {
-        MemoryWriter* memoryWriter = &OutputManager::getInstanceAndCreateListeners().getMemoryWriter();
-        ConsoleWriter* consoleWriter = &OutputManager::getInstanceAndCreateListeners().getConsoleWriter();
-        LogWriter* logWriter = &OutputManager::getInstanceAndCreateListeners().getLogWriter();
-
-        EXPECT_TRUE(memoryWriter == &OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
-        EXPECT_TRUE(consoleWriter == &OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
-        EXPECT_TRUE(logWriter == &OutputManager::getInstanceAndCreateListeners().getLogWriter());
+        MemoryWriter* memoryWriter = OutputManager::getInstanceAndCreateListeners().getMemoryWriter();
+        ConsoleWriter* consoleWriter = OutputManager::getInstanceAndCreateListeners().getConsoleWriter();
+        LogWriter* logWriter = OutputManager::getInstanceAndCreateListeners().getLogWriter();
+
+        EXPECT_TRUE(memoryWriter == OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
+        EXPECT_TRUE(consoleWriter == OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
+        EXPECT_TRUE(logWriter == OutputManager::getInstanceAndCreateListeners().getLogWriter());
     }
 

code/branches/testing/test/util/output/OutputStreamTest.cc

@@ -64 +64 @@
     {
         // disable MemoryWriter because otherwise we would always accept all output
-        OutputManager::getInstance().getMemoryWriter().disable();
+        OutputManager::getInstance().getMemoryWriter()->disable();
 
         {
@@ -140 +140 @@
     {
         // disable MemoryWriter because otherwise we would always accept all output
-        OutputManager::getInstanceAndCreateListeners().getMemoryWriter().disable();
+        OutputManager::getInstanceAndCreateListeners().getMemoryWriter()->disable();
 
         OutputStream stream;