Some test nits

Author: olabetskyi

test/testsingleexecutor.cpp

@@ -242,8 +242,8 @@ class TestSingleExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall + empty line
-        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
+        // for each file: top5 results + overall
+        ASSERT_EQUALS((5 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_top5_summary() {
@@ -253,8 +253,8 @@ class TestSingleExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + overall + empty line
-        ASSERT_EQUALS(5 + 1 + 1, cppcheck::count_all_of(output_s, '\n'));
+        // once: top5 results + overall
+        ASSERT_EQUALS(5 + 1, cppcheck::count_all_of(output_s, '\n'));
         // should only report the top5 once
         ASSERT(output_s.find("1 result(s)") == std::string::npos);
         ASSERT(output_s.find("2 result(s)") != std::string::npos);
@@ -267,7 +267,7 @@ class TestSingleExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = SHOWTIME_MODES::SHOWTIME_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        ASSERT_EQUALS(2, cppcheck::count_all_of(output_s, "Overall time:"));
+        ASSERT_EQUALS(1, cppcheck::count_all_of(output_s, "Overall time:"));
     }
 
     void showtime_summary() {

test/testthreadexecutor.cpp

@@ -233,10 +233,9 @@ class TestThreadExecutorBase : public TestFixture {
               "int main() {}",
               dinit(CheckOptions,
                     $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE));
-        // for each file: top5 results + overall + empty line
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall + empty line
-        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
+        // for each file: top5 results + overall
+        ASSERT_EQUALS((5 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_top5_summary() {
@@ -246,8 +245,8 @@ class TestThreadExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + overall + empty line
-        ASSERT_EQUALS(5 + 1 + 1, cppcheck::count_all_of(output_s, '\n'));
+        // once: top5 results + overall
+        ASSERT_EQUALS(5 + 1, cppcheck::count_all_of(output_s, '\n'));
         // should only report the top5 once
         ASSERT(output_s.find("1 result(s)") == std::string::npos);
         ASSERT(output_s.find("2 result(s)") != std::string::npos);
@@ -260,7 +259,7 @@ class TestThreadExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = SHOWTIME_MODES::SHOWTIME_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        ASSERT_EQUALS(2, cppcheck::count_all_of(output_s, "Overall time:"));
+        ASSERT_EQUALS(1, cppcheck::count_all_of(output_s, "Overall time:"));
     }
 
     void showtime_summary() {