add tests

Author: wjakobsson

gui/test/resultstree/testresultstree.cpp

@@ -265,6 +265,31 @@ void TestResultsTree::resultsInSameFile() const
     }
 }
 
+void TestResultsTree::clearRecheckFile() const
+{
+    // #14893 - rechecking a file removes its results, the results of the other files are kept
+    ResultsTree tree(nullptr);
+    QVERIFY(tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "test", "bugId")));
+    QVERIFY(tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "test", "bugId")));
+    QVERIFY(tree.addErrorItem(createErrorItem("file2.c", 10, Severity::style, "test", "bugId")));
+
+    const auto* model = dynamic_cast<QStandardItemModel*>(tree.model());
+    QVERIFY(model != nullptr);
+    QCOMPARE(model->rowCount(), 2);
+
+    tree.clearRecheckFile("file1.c");
+    QCOMPARE(model->rowCount(), 1);
+    QCOMPARE(model->item(0,0)->text(), "file2.c");
+
+    // the recheck reports the results of the rechecked file again, they must not be treated as duplicates
+    QVERIFY(tree.addErrorItem(createErrorItem("file1.c", 10, Severity::style, "test", "bugId")));
+    QVERIFY(tree.addErrorItem(createErrorItem("file1.c", 20, Severity::style, "test", "bugId")));
+    QCOMPARE(model->rowCount(), 2);
+
+    // the results of the other files are still known
+    QVERIFY(!tree.addErrorItem(createErrorItem("file2.c", 10, Severity::style, "test", "bugId")));
+}
+
 void TestResultsTree::testReportType() const
 {
     TestReport report("{id},{classification},{guideline}");

gui/test/resultstree/testresultstree.h

@@ -26,6 +26,7 @@ private slots:
     void duplicateResults() const;
     void multiLineResult() const;
     void resultsInSameFile() const;
+    void clearRecheckFile() const;
     void testReportType() const;
     void testReportTypeIcon() const;
     void testGetGuidelineError() const;

test/testanalyzerinformation.cpp

@@ -53,6 +53,41 @@ class TestAnalyzerInformation : public TestFixture {
         ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f, "file1.c", "", 0));
         f.str(filesTxt);
         ASSERT_EQUALS("file1.a4", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f, "./file1.c", "", 0));
+
+        // an exact match wins over a suffix match - "executor.cpp" is a suffix of
+        // "processexecutor.cpp" so both used to resolve to the same analyzer info file
+        {
+            constexpr char suffixTxt[] = "executor.a1:::executor.cpp\n"
+                                         "processexecutor.a2:::processexecutor.cpp\n";
+            std::istringstream f1(suffixTxt);
+            ASSERT_EQUALS("executor.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "executor.cpp", "", 0));
+            std::istringstream f2(suffixTxt);
+            ASSERT_EQUALS("processexecutor.a2", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "processexecutor.cpp", "", 0));
+        }
+
+        // the same, with the exact match on the first line
+        {
+            constexpr char suffixTxt[] = "processexecutor.a1:::processexecutor.cpp\n"
+                                         "executor.a2:::executor.cpp\n";
+            std::istringstream f1(suffixTxt);
+            ASSERT_EQUALS("processexecutor.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "processexecutor.cpp", "", 0));
+            std::istringstream f2(suffixTxt);
+            ASSERT_EQUALS("executor.a2", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f2, "executor.cpp", "", 0));
+        }
+
+        // a suffix match is still used when there is no exact match
+        {
+            constexpr char relTxt[] = "a.a1:::src/a.c\n";
+            std::istringstream f1(relTxt);
+            ASSERT_EQUALS("a.a1", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "/home/proj/src/a.c", "", 0));
+        }
+
+        // no match at all
+        {
+            constexpr char noneTxt[] = "a.a1:::a.c\n";
+            std::istringstream f1(noneTxt);
+            ASSERT_EQUALS("", AnalyzerInformationTest::getAnalyzerInfoFileFromFilesTxt(f1, "b.c", "", 0));
+        }
     }
 
     void getAnalyzerInfoFile() const {