From 789f3591ef1ff05eaa816565956035628d9a08fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Fri, 6 Sep 2019 18:29:57 +0200 Subject: [PATCH] Do not write singular characters into stream as C-strings --- include/reporters/catch_reporter_console.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/reporters/catch_reporter_console.cpp b/include/reporters/catch_reporter_console.cpp index b88f3b14..ff3953e4 100644 --- a/include/reporters/catch_reporter_console.cpp +++ b/include/reporters/catch_reporter_console.cpp @@ -268,7 +268,7 @@ public: } friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& { - return os << duration.value() << " " << duration.unitsAsString(); + return os << duration.value() << ' ' << duration.unitsAsString(); } }; } // end anon namespace @@ -300,9 +300,9 @@ public: headerCols += Column(info.name).width(static_cast(info.width - 2)); headerCols += spacer; } - m_os << headerCols << "\n"; + m_os << headerCols << '\n'; - m_os << Catch::getLineOfChars<'-'>() << "\n"; + m_os << Catch::getLineOfChars<'-'>() << '\n'; } } void close() { @@ -327,7 +327,7 @@ public: tp.open(); if (tp.m_currentColumn == static_cast(tp.m_columnInfos.size() - 1)) { tp.m_currentColumn = -1; - tp.m_os << "\n"; + tp.m_os << '\n'; } tp.m_currentColumn++; @@ -336,15 +336,15 @@ public: ? std::string(colInfo.width - (strSize + 2), ' ') : std::string(); if (colInfo.justification == ColumnInfo::Left) - tp.m_os << colStr << padding << " "; + tp.m_os << colStr << padding << ' '; else - tp.m_os << padding << colStr << " "; + tp.m_os << padding << colStr << ' '; return tp; } friend TablePrinter& operator << (TablePrinter& tp, RowBreak) { if (tp.m_currentColumn > 0) { - tp.m_os << "\n"; + tp.m_os << '\n'; tp.m_currentColumn = -1; } return tp; @@ -449,7 +449,7 @@ void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) { void ConsoleReporter::benchmarkFailed(std::string const& error) { Colour colour(Colour::Red); (*m_tablePrinter) - << "Benchmark failed (" << error << ")" + << "Benchmark failed (" << error << ')' << ColumnBreak() << RowBreak(); } #endif // CATCH_CONFIG_ENABLE_BENCHMARKING