TestProcessExecutor: applied TestThreadExecutor changes / use TODO asserts for currently broken tests

Author: firewave

test/testprocessexecutor.cpp

@@ -50,7 +50,7 @@ class TestProcessExecutor : public TestFixture {
      * Execute check using n jobs for y files which are have
      * identical data, given within data.
      */
-    void check(unsigned int jobs, 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(unsigned int jobs, 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 TestProcessExecutor : public TestFixture {
 
         settings.jobs = jobs;
         settings.showtime = showtime;
+        settings.quiet = quiet;
         if (plistOutput)
             settings.plistOutput = plistOutput;
         // TODO: test with settings.project.fileSettings;
@@ -95,6 +96,12 @@ class TestProcessExecutor : public TestFixture {
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
         TEST_CASE(markup);
+        TEST_CASE(showtime_top5);
+        TEST_CASE(showtime_file);
+        TEST_CASE(showtime_summary);
+        TEST_CASE(showtime_top5_j);
+        TEST_CASE(showtime_file_j);
+        TEST_CASE(showtime_summary_j);
 #endif // !WIN32
     }
 
@@ -110,6 +117,7 @@ class TestProcessExecutor : public TestFixture {
         check(2, 3, 3, oss.str());
     }
 
+    // TODO: check the output
     void many_threads() {
         check(16, 100, 100,
               "int main()\n"
@@ -127,7 +135,7 @@ class TestProcessExecutor : public TestFixture {
               "{\n"
               "  char *a = malloc(10);\n"
               "  return 0;\n"
-              "}", SHOWTIME_MODES::SHOWTIME_SUMMARY);
+              "}", true, SHOWTIME_MODES::SHOWTIME_SUMMARY);
     }
 
     void many_threads_plist() {
@@ -139,7 +147,7 @@ class TestProcessExecutor : 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() {
@@ -184,7 +192,6 @@ class TestProcessExecutor : public TestFixture {
               "}");
     }
 
-
     void markup() {
         const Settings settingsOld = settings;
         settings.library.mMarkupExtensions.emplace(".cp1");
@@ -201,7 +208,7 @@ class TestProcessExecutor : public TestFixture {
               "  char *a = malloc(10);\n"
               "  return 0;\n"
               "}",
-              SHOWTIME_MODES::SHOWTIME_NONE, nullptr, files);
+              false, SHOWTIME_MODES::SHOWTIME_NONE, nullptr, files);
         // TODO: order of "Checking" and "checked" is affected by thread
         /*TODO_ASSERT_EQUALS("Checking " + fprefix() + "_2.cpp ...\n"
                            "1/4 files checked 25% done\n"
@@ -222,6 +229,70 @@ class TestProcessExecutor : public TestFixture {
                            output.str());*/
         settings = settingsOld;
     }
+
+
+    // TODO: provide data which actually shows values above 0
+
+    // TODO: should this be logged only once like summary?
+    void showtime_top5() {
+        REDIRECT;
+        check(1, 2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_TOP5);
+        // for each file: top5 results + overall + empty line
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        TODO_ASSERT_EQUALS((5 + 1 + 1) * 2, 0, cppcheck::find_all_of(output_s, '\n'));
+    }
+
+    void showtime_file() {
+        REDIRECT;
+        check(1, 2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_FILE);
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        TODO_ASSERT_EQUALS(2, 0, cppcheck::find_all_of(output_s, "Overall time:"));
+    }
+
+    void showtime_summary() {
+        REDIRECT;
+        check(1, 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);
+    }
+
+    void showtime_top5_j() {
+        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
+        check(2, 2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_TOP5);
+        // for each file: top5 results + overall + empty line
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        TODO_ASSERT_EQUALS((5 + 1 + 1) * 2, 0, cppcheck::find_all_of(output_s, '\n'));
+    }
+
+    void showtime_file_j() {
+        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
+        check(2, 2, 0,
+              "int main() {}",
+              true, SHOWTIME_MODES::SHOWTIME_FILE);
+        const std::string output_s = GET_REDIRECT_OUTPUT;
+        TODO_ASSERT_EQUALS(2, 0, cppcheck::find_all_of(output_s, "Overall time:"));
+    }
+
+    void showtime_summary_j() {
+        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
+        check(2, 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);
+    }
 };
 
 REGISTER_TEST(TestProcessExecutor)