fix icon for failed test

Author: Samat Gaynutdinov

server/src/coverage/TestRunner.cpp

@@ -196,7 +196,7 @@ size_t TestRunner::buildTests(const utbot::ProjectContext& projectContext, const
 testsgen::TestStatus TestRunner::runTest(const MakefileUtils::MakefileCommand &command, const std::optional <std::chrono::seconds> &testTimeout) {
     auto res = command.run(projectContext.buildDir, true, true, testTimeout);
     GTestLogger::log(res.output);
-    if (StringUtils::contains(res.output, "[  PASSED  ]")) {
+    if (StringUtils::contains(res.output, "[  PASSED  ] 1 test")) {
         return testsgen::TEST_PASSED;
     }
     if (StringUtils::contains(res.output, "[  FAILED  ] 1 test")) {

server/test/framework/Server_Tests.cpp

@@ -1342,6 +1342,9 @@ namespace {
         ASSERT_FALSE(statusMap.empty());
 
         testUtils::checkStatuses(statusMap, tests);
+
+        StatusCountMap expectedStatusCountMap{{testsgen::TEST_PASSED, 25}};
+        testUtils::checkStatusesCount(statusMap, tests, expectedStatusCountMap);
     }
 
 
@@ -1476,7 +1479,7 @@ namespace {
             buildDirRelativePath, std::move(testFilter));
         auto coverageAndResultsWriter = std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
         CoverageAndResultsGenerator coverageGenerator{ runRequest.get(), coverageAndResultsWriter.get() };
-        utbot::SettingsContext settingsContext{ true, true, 15, 0, true, false };
+        utbot::SettingsContext settingsContext{ true, true, 45, 0, true, false };
         coverageGenerator.generate(false, settingsContext);
 
         ASSERT_TRUE(coverageGenerator.getCoverageMap().empty());
@@ -1486,7 +1489,11 @@ namespace {
 
         ASSERT_FALSE(statusMap.empty());
         EXPECT_GT(statusMap.getNumberOfTests(), 2);
+
         testUtils::checkStatuses(statusMap, tests);
+
+        StatusCountMap expectedStatusCountMap{{testsgen::TEST_PASSED, 7}};
+        testUtils::checkStatusesCount(statusMap, tests, expectedStatusCountMap);
     }
 
     struct ProjectInfo {
@@ -1560,6 +1567,10 @@ namespace {
                       statusMap.begin()->second.begin()->second);
         } else {
             testUtils::checkStatuses(statusMap, tests);
+
+            StatusCountMap expectedStatusCountMap{
+                {testsgen::TEST_PASSED, 3}};
+            testUtils::checkStatusesCount(statusMap, tests, expectedStatusCountMap);
         }
     }
 

server/test/framework/Syntax_Tests.cpp

@@ -2075,7 +2075,7 @@ namespace {
         static auto coverageAndResultsWriter =
             std::make_unique<ServerCoverageAndResultsWriter>(nullptr);
         CoverageAndResultsGenerator coverageGenerator{ runRequest.get(), coverageAndResultsWriter.get() };
-        utbot::SettingsContext settingsContext{ true, false, 15, 0, false, false };
+        utbot::SettingsContext settingsContext{ true, false, 45, 0, false, false };
         coverageGenerator.generate(false, settingsContext);
 
         EXPECT_FALSE(coverageGenerator.hasExceptions());
@@ -2084,6 +2084,7 @@ namespace {
         auto statusMap = coverageGenerator.getTestStatusMap();
         auto tests = coverageGenerator.getTestsToLaunch();
 
+        // TODO: add checkStatusesCount after linkedlist fix
         testUtils::checkStatuses(statusMap, tests);
     }
 
@@ -2117,6 +2118,11 @@ namespace {
         auto tests = coverageGenerator.getTestsToLaunch();
 
         testUtils::checkStatuses(statusMap, tests);
+
+        StatusCountMap expectedStatusCountMap{
+            {testsgen::TEST_DEATH, 4},
+            {testsgen::TEST_PASSED, 6}};
+        testUtils::checkStatusesCount(statusMap, tests, expectedStatusCountMap);
     }
 
     TEST_F(Syntax_Test, Simple_parameter_cpp) {

server/test/framework/TestUtils.cpp

@@ -134,9 +134,29 @@ namespace testUtils {
     void checkStatuses(const Coverage::TestStatusMap &testStatusMap,
                        const vector<UnitTest> &tests) {
         for (auto const &[filename, suitename, testname] : tests) {
+            if (suitename == tests::Tests::ERROR_SUITE_NAME) {
+                continue;
+            }
             const auto status = testStatusMap.at(filename).at(testname);
             EXPECT_TRUE((testsgen::TestStatus::TEST_PASSED == status) ||
-                        (testsgen::TestStatus::TEST_DEATH == status));
+            (testsgen::TestStatus::TEST_DEATH == status));
+        }
+    }
+
+
+    void checkStatusesCount(const Coverage::TestStatusMap &testStatusMap,
+                       const vector<UnitTest> &tests,
+                       const StatusCountMap &expectedStatusCountMap) {
+        StatusCountMap actualStatusCountMap;
+        for (auto const &[filename, suitename, testname] : tests) {
+            if (suitename == tests::Tests::ERROR_SUITE_NAME) {
+                continue;
+            }
+            const auto status = testStatusMap.at(filename).at(testname);
+            actualStatusCountMap[status]++;
+        }
+        for (const auto& [status, count] : actualStatusCountMap) {
+            ASSERT_GE(count, expectedStatusCountMap.at(status));
         }
     }
 

server/test/framework/TestUtils.h

@@ -23,6 +23,7 @@ using Params = const std::vector<shared_ptr<tests::AbstractValueView>> &;
 using ReturnValue = const std::shared_ptr<tests::AbstractValueView> &;
 using TestCasePredicate = std::function<bool(tests::Tests::MethodTestCase)>;
 using CoverageLines = CollectionUtils::MapFileTo<std::set<int>>;
+using StatusCountMap = std::unordered_map<testsgen::TestStatus, int>;
 
 namespace testUtils {
     using std::function;
@@ -46,6 +47,10 @@ namespace testUtils {
 
     void checkStatuses(const Coverage::TestStatusMap &testStatusMap, const vector<UnitTest> &tests);
 
+    void checkStatusesCount(const Coverage::TestStatusMap &testStatusMap,
+                            const vector<UnitTest> &tests,
+                            const StatusCountMap &expectedStatusCountMap);
+
     int getNumberOfTests(const tests::TestsMap &tests);
 
     void checkMinNumberOfTests(const tests::TestsMap &tests, int minNumber);