diff options
Diffstat (limited to 'dviware/dvisvgm/tests/gtest/src/gtest-test-part.cc')
-rw-r--r-- | dviware/dvisvgm/tests/gtest/src/gtest-test-part.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/dviware/dvisvgm/tests/gtest/src/gtest-test-part.cc b/dviware/dvisvgm/tests/gtest/src/gtest-test-part.cc index c88860d923..178317a6bc 100644 --- a/dviware/dvisvgm/tests/gtest/src/gtest-test-part.cc +++ b/dviware/dvisvgm/tests/gtest/src/gtest-test-part.cc @@ -41,18 +41,21 @@ using internal::GetUnitTestImpl; // in it. std::string TestPartResult::ExtractSummary(const char* message) { const char* const stack_trace = strstr(message, internal::kStackTraceMarker); - return stack_trace == NULL ? message : - std::string(message, stack_trace); + return stack_trace == nullptr ? message : std::string(message, stack_trace); } // Prints a TestPartResult object. std::ostream& operator<<(std::ostream& os, const TestPartResult& result) { - return os - << result.file_name() << ":" << result.line_number() << ": " - << (result.type() == TestPartResult::kSuccess ? "Success" : - result.type() == TestPartResult::kFatalFailure ? "Fatal failure" : - "Non-fatal failure") << ":\n" - << result.message() << std::endl; + return os << result.file_name() << ":" << result.line_number() << ": " + << (result.type() == TestPartResult::kSuccess + ? "Success" + : result.type() == TestPartResult::kSkip + ? "Skipped" + : result.type() == TestPartResult::kFatalFailure + ? "Fatal failure" + : "Non-fatal failure") + << ":\n" + << result.message() << std::endl; } // Appends a TestPartResult to the array. @@ -67,7 +70,7 @@ const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const { internal::posix::Abort(); } - return array_[index]; + return array_[static_cast<size_t>(index)]; } // Returns the number of TestPartResult objects in the array. |