- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/test/util/output/LogWriterTest.cc
r10624 r11054 4 4 #include "util/Convert.h" 5 5 #include "util/output/OutputManager.h" 6 #include "util/SharedPtr.h"7 6 8 7 namespace orxonox … … 13 12 { 14 13 public: 15 virtual void printLine(const std::string& line, OutputLevel level) 14 virtual void printLine(const std::string& line, OutputLevel level) override 16 15 { this->LogWriter::printLine(line, level); } 17 16 }; … … 21 20 { 22 21 public: 23 virtual void SetUp() 22 virtual void SetUp() override 24 23 { 25 24 // reset output manager 26 OutputManager::Testing::getInstancePointer() = new OutputManager();25 OutputManager::Testing::getInstancePointer().reset(new OutputManager()); 27 26 } 28 27 29 virtual void TearDown() 28 virtual void TearDown() override 30 29 { 31 30 } … … 138 137 std::string line = getLineWhichContains(path, "myothertestoutput"); 139 138 EXPECT_FALSE(line.empty()); 139 ASSERT_TRUE(line.length() > 12); 140 140 141 EXPECT_TRUE(isdigit(line[0])); 141 142 EXPECT_TRUE(isdigit(line[1])); … … 146 147 EXPECT_TRUE(isdigit(line[6])); 147 148 EXPECT_TRUE(isdigit(line[7])); 148 EXPECT_EQ(' ', line[8]); 149 EXPECT_EQ(':', line[8]); 150 EXPECT_TRUE(isdigit(line[9])); 151 EXPECT_TRUE(isdigit(line[10])); 152 EXPECT_TRUE(isdigit(line[11])); 153 EXPECT_EQ(' ', line[12]); 149 154 } 150 155
Note: See TracChangeset
for help on using the changeset viewer.