add/update tests

Author: ludviggunne

gui/test/resultstree/testresultstree.cpp

@@ -157,7 +157,7 @@ void TestResultsTree::testReportType() const
     QCOMPARE(report.output, "id1,,\nunusedVariable,,");
 
     // switch to Misra C report and check that "id1" is not shown
-    tree.setReportType(ReportType::misraC);
+    tree.setReportType(ReportType::misraC2012);
     tree.saveResults(&report);
     QCOMPARE(report.output, "unusedVariable,Advisory,2.8");
 
@@ -187,7 +187,7 @@ void TestResultsTree::testGetGuidelineError() const
 
     // normal report with 2 errors
     ResultsTree tree(nullptr);
-    tree.setReportType(ReportType::misraC);
+    tree.setReportType(ReportType::misraC2012);
     tree.addErrorItem(createErrorItem(Severity::error, "id1")); // error severity => guideline 1.3
     tree.saveResults(&report);
     QCOMPARE(report.output, "id1,Required,1.3");

test/testcmdlineparser.cpp

@@ -502,6 +502,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(reportTypeCertC);
         TEST_CASE(reportTypeMisraC2012);
         TEST_CASE(reportTypeMisraC2023);
+        TEST_CASE(reportTypeMisraC2025);
         TEST_CASE(reportTypeMisraCpp2008);
         TEST_CASE(reportTypeMisraCpp2023);
         TEST_CASE(invalidReportType);
@@ -3453,14 +3454,21 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char *const argv[] = { "cppcheck", "--report-type=misra-c-2012", "file.cpp" };
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS_ENUM(ReportType::misraC, settings->reportType);
+        ASSERT_EQUALS_ENUM(ReportType::misraC2012, settings->reportType);
     }
 
     void reportTypeMisraC2023() {
         REDIRECT;
         const char *const argv[] = { "cppcheck", "--report-type=misra-c-2023", "file.cpp" };
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS_ENUM(ReportType::misraC, settings->reportType);
+        ASSERT_EQUALS_ENUM(ReportType::misraC2023, settings->reportType);
+    }
+
+    void reportTypeMisraC2025() {
+        REDIRECT;
+        const char *const argv[] = { "cppcheck", "--report-type=misra-c-2025", "file.cpp" };
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS_ENUM(ReportType::misraC2025, settings->reportType);
     }
 
     void reportTypeMisraCpp2008() {

test/testerrorlogger.cpp

@@ -78,6 +78,7 @@ class TestErrorLogger : public TestFixture {
         TEST_CASE(isCriticalErrorId);
 
         TEST_CASE(ErrorMessageReportTypeMisraC);
+        TEST_CASE(ErrorMessageReportTypeMisraCDirective);
         TEST_CASE(ErrorMessageReportTypeCertC);
     }
 
@@ -317,7 +318,7 @@ class TestErrorLogger : public TestFixture {
 
     void ErrorMessageReportTypeMisraC() const {
         std::list<ErrorMessage::FileLocation> locs = { fooCpp5 };
-        const auto reportType = ReportType::misraC;
+        const auto reportType = ReportType::misraC2012;
         const auto mapping = createGuidelineMapping(reportType);
         const std::string format = "{severity} {id}";
         ErrorMessage msg(std::move(locs), emptyString, Severity::error, "", "unusedVariable", Certainty::normal);
@@ -328,6 +329,19 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS("Advisory 2.8", msg.toString(true, format, ""));
     }
 
+    void ErrorMessageReportTypeMisraCDirective() const {
+        std::list<ErrorMessage::FileLocation> locs = { fooCpp5 };
+        const auto reportType = ReportType::misraC2012;
+        const auto mapping = createGuidelineMapping(reportType);
+        const std::string format = "{severity} {id}";
+        ErrorMessage msg(std::move(locs), emptyString, Severity::style, "", "premium-misra-c-2012-dir-4.6", Certainty::normal);
+        msg.guideline = getGuideline(msg.id, reportType, mapping, msg.severity);
+        msg.classification = getClassification(msg.guideline, reportType);
+        ASSERT_EQUALS("Advisory", msg.classification);
+        ASSERT_EQUALS("Dir 4.6", msg.guideline);
+        ASSERT_EQUALS("Advisory Dir 4.6", msg.toString(true, format, ""));
+    }
+
     void ErrorMessageReportTypeCertC() const {
         std::list<ErrorMessage::FileLocation> locs = { fooCpp5 };
         const auto reportType = ReportType::certC;