add status parsing from json

Author: Lana243

server/src/coverage/CoverageAndResultsGenerator.cpp

@@ -49,7 +49,6 @@ grpc::Status CoverageAndResultsGenerator::generate(bool withCoverage,
         return Status::CANCELLED;
     }
     showErrors();
-    fs::remove(Paths::getGTestResultsJsonPath(projectContext));
     return Status::OK;
 }
 

server/src/coverage/TestRunner.cpp

@@ -130,6 +130,7 @@ grpc::Status TestRunner::runTests(bool withCoverage, const std::optional<std::ch
     MEASURE_FUNCTION_EXECUTION_TIME
     ExecUtils::throwIfCancelled();
 
+    fs::remove(Paths::getGTestResultsJsonPath(projectContext));
     const auto buildRunCommands = coverageTool->getBuildRunCommands(testsToLaunch, withCoverage);
     ExecUtils::doWorkWithProgress(buildRunCommands, progressWriter, "Running tests",
                               [this, testTimeout] (BuildRunCommand const &buildRunCommand) {
@@ -195,37 +196,41 @@ testsgen::TestResultObject TestRunner::runTest(const BuildRunCommand &command, c
     auto res = command.runCommand.run(projectContext.buildDir, true, true, testTimeout);
     GTestLogger::log(res.output);
 
+    testsgen::TestResultObject testRes;
+    testRes.set_testfilepath(command.unitTest.testFilePath);
+    testRes.set_testname(command.unitTest.testname);
     auto executionTime = new google::protobuf::Duration;
-    if (fs::exists(Paths::getGTestResultsJsonPath(projectContext))) {
-        nlohmann::json gtestResultsJson = JsonUtils::getJsonFromFile(Paths::getGTestResultsJsonPath(projectContext));
-        if (!google::protobuf::util::TimeUtil::FromString(gtestResultsJson["time"], executionTime)) {
-            LOG_S(WARNING) << "Cannot parse duration of test execution";
-        }
-    } else {
+
+    if (BaseForkTask::wasInterrupted(res.status)) {
+        testRes.set_status(testsgen::TEST_INTERRUPTED);
         if (testTimeout.has_value()) {
             *executionTime = google::protobuf::util::TimeUtil::SecondsToDuration(testTimeout.value().count());
         } else {
-            LOG_S(WARNING) << "Google test results are not generated, timeout not found";
+            LOG_S(WARNING) << StringUtils::stringFormat("Test %s:%s execution was interrupted without timeout set",
+                                                        fs::relative(command.unitTest.testFilePath,
+                                                                     projectContext.projectPath),
+                                                        command.unitTest.testname);
         }
+        testRes.set_allocated_executiontime(executionTime);
+        return testRes;
     }
 
-    testsgen::TestResultObject testRes;
-    testRes.set_testfilepath(command.unitTest.testFilePath);
-    testRes.set_testname(command.unitTest.testname);
-    testRes.set_allocated_executiontime(executionTime);
-    if (StringUtils::contains(res.output, "[  PASSED  ] 1 test")) {
-        testRes.set_status(testsgen::TEST_PASSED);
+    if (!fs::exists(Paths::getGTestResultsJsonPath(projectContext))) {
+        testRes.set_status(testsgen::TEST_DEATH);
         return testRes;
     }
-    if (StringUtils::contains(res.output, "[  FAILED  ] 1 test")) {
-        testRes.set_status(testsgen::TEST_FAILED);
-        return testRes;
+
+    nlohmann::json gtestResultsJson = JsonUtils::getJsonFromFile(Paths::getGTestResultsJsonPath(projectContext));
+    if (!google::protobuf::util::TimeUtil::FromString(gtestResultsJson["time"], executionTime)) {
+        LOG_S(WARNING) << "Cannot parse duration of test execution";
     }
-    if (BaseForkTask::wasInterrupted(res.status)) {
-        testRes.set_status(testsgen::TEST_INTERRUPTED);
-        return testRes;
+    testRes.set_allocated_executiontime(executionTime);
+    if (gtestResultsJson["failures"] != 0) {
+        testRes.set_status(testsgen::TEST_FAILED);
+    } else {
+        testRes.set_status(testsgen::TEST_PASSED);
     }
-    testRes.set_status(testsgen::TEST_DEATH);
+    fs::remove(Paths::getGTestResultsJsonPath(projectContext));
     return testRes;
 }
 

server/src/printers/CoverageAndResultsStatisticsPrinter.cpp

@@ -49,10 +49,10 @@ namespace printer {
             insert({sourcePath, FileCoverageAndResultsStatistics(testsResult, fileCoverage)});
         }
         std::vector<std::string> metricNames = {
-                "filename", "executionTime (s)",
-                "totalTestsNumber", "passedTestsNumber", "failedTestsNumber", "deathTestsNumber",
-                "interruptedTestsNumber",
-                "totalLinesNumber", "coveredLinesNumber", "lineCoverageRatio (%)"
+                "Filename", "Google Test Execution Time (s)",
+                "Total Tests Number", "Passed Tests Number", "Failed Tests Number", "Death Tests Number",
+                "Interrupted Tests Number",
+                "Total Lines Number", "Covered Lines Number", "Line Coverage Ratio (%)"
         };
         std::string header = StringUtils::joinWith(metricNames, ",");
         std::stringstream ss;

server/src/printers/CoverageAndResultsStatisticsPrinter.h

@@ -45,4 +45,4 @@ namespace printer {
     };
 }
 
-#endif //UNITTESTBOT_COVERAGEANDRESULTSSTATISTICSPRINTER_H
+#endif //UNITTESTBOT_COVERAGEANDRESULTSSTATISTICSPRINTER_H