Changeset 11071 for code/trunk/test/util/output/ConsoleWriterTest.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/test/util/output/ConsoleWriterTest.cc
r10712 r11071 3 3 #include "util/output/ConsoleWriter.h" 4 4 #include "util/output/OutputManager.h" 5 #include "util/SharedPtr.h"6 5 7 6 namespace orxonox … … 13 12 { 14 13 public: 15 virtual void SetUp() 14 virtual void SetUp() override 16 15 { 17 16 // reset output manager 18 OutputManager::Testing::getInstancePointer() = new OutputManager();17 OutputManager::Testing::getInstancePointer().reset(new OutputManager()); 19 18 } 20 19 21 virtual void TearDown() 20 virtual void TearDown() override 22 21 { 23 22 } … … 27 26 TEST_F(ConsoleWriterTest, Disable) 28 27 { 29 std::ostream stream( NULL);28 std::ostream stream(nullptr); 30 29 EXPECT_EQ(0U, OutputManager::getInstance().getListeners().size()); 31 30 ConsoleWriter writer(stream); … … 37 36 TEST_F(ConsoleWriterTest, Enable) 38 37 { 39 std::ostream stream( NULL);38 std::ostream stream(nullptr); 40 39 ConsoleWriter writer(stream); 41 40 writer.disable();
Note: See TracChangeset
for help on using the changeset viewer.