TestSingleExecutor: applied changes from other executor tests / marked failed tests with TODO

Author: firewave

test/testsingleexecutor.cpp

@@ -52,7 +52,7 @@ class TestSingleExecutor : public TestFixture {
         return std::to_string(i);
     }
 
-    void check(int files, int result, const std::string &data, SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE, const char* const plistOutput = nullptr, const std::vector<std::string>& filesList = {}) {
+    void check(int files, int result, const std::string &data, bool quiet = true, SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE, const char* const plistOutput = nullptr, const std::vector<std::string>& filesList = {}) {
         errout.str("");
         output.str("");
 
@@ -71,6 +71,7 @@ class TestSingleExecutor : public TestFixture {
         }
 
         settings.showtime = showtime;
+        settings.quiet = quiet;
         if (plistOutput)
             settings.plistOutput = plistOutput;
         // NOLINTNEXTLINE(performance-unnecessary-value-param)
@@ -100,26 +101,25 @@ class TestSingleExecutor : public TestFixture {
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
         TEST_CASE(markup);
+        TEST_CASE(showtime_top5_file);
+        TEST_CASE(showtime_top5_summary);
+        TEST_CASE(showtime_file);
+        TEST_CASE(showtime_summary);
     }
 
     void many_files() {
-        const Settings settingsOld = settings;
-        settings.quiet = false;
-
         check(100, 100,
               "int main()\n"
               "{\n"
               "  char *a = malloc(10);\n"
               "  return 0;\n"
-              "}");
+              "}", false);
         std::string expected;
         for (int i = 1; i <= 100; ++i) {
             expected += "Checking file_" + zpad3(i) + ".cpp ...\n";
             expected += std::to_string(i) + "/100 files checked " + std::to_string(i) + "% done\n";
         }
         ASSERT_EQUALS(expected, output.str());
-
-        settings = settingsOld;
     }
 
     void many_files_showtime() {
@@ -129,7 +129,7 @@ class TestSingleExecutor : public TestFixture {
               "{\n"
               "  char *a = malloc(10);\n"
               "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_SUMMARY);
+              "}", true, SHOWTIME_MODES::SHOWTIME_SUMMARY);
     }
 
     void many_files_plist() {
@@ -141,7 +141,7 @@ class TestSingleExecutor : public TestFixture {
               "{\n"
               "  char *a = malloc(10);\n"
               "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_NONE, plistOutput);
+              "}", true, SHOWTIME_MODES::SHOWTIME_NONE, plistOutput);
     }
 
     void no_errors_more_files() {
@@ -201,7 +201,7 @@ class TestSingleExecutor : public TestFixture {
               "  char *a = malloc(10);\n"
               "  return 0;\n"
               "}",
-              SHOWTIME_MODES::SHOWTIME_NONE, nullptr, files);
+              false, SHOWTIME_MODES::SHOWTIME_NONE, nullptr, files);
         // TODO: filter out the "files checked" messages
         ASSERT_EQUALS("Checking file_2.cpp ...\n"
                       "1/4 files checked 25% done\n"
@@ -214,6 +214,51 @@ class TestSingleExecutor : public TestFixture {
         settings = settingsOld;
     }
 
+    // TODO: provide data which actually shows values above 0
+
+    void showtime_top5_file() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_TOP5_FILE);
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // for each file: top5 results + overall + empty line
+        TODO_ASSERT_EQUALS((5 + 1 + 1) * 2, (5 + 1 + 1), cppcheck::count_all_of(output_s, '\n'));
+    }
+
+    void showtime_top5_summary() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY);
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // once: top5 results + overall + empty line
+        TODO_ASSERT_EQUALS(5 + 1 + 1, 0, cppcheck::count_all_of(output_s, '\n'));
+        // should only report the top5 once
+        ASSERT(output_s.find("1 result(s)") == std::string::npos);
+        TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);
+    }
+
+    void showtime_file() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_FILE);
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        TODO_ASSERT_EQUALS(2, 1, cppcheck::count_all_of(output_s, "Overall time:"));
+    }
+
+    void showtime_summary() {
+        REDIRECT;
+        check(2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_SUMMARY);
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        // should only report the actual summary once
+        ASSERT(output_s.find("1 result(s)") == std::string::npos);
+        TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);
+    }
+
     // TODO: test clang-tidy
     // TODO: test whole program analysis
 };