Check extra comments in tests

Author: ludviggunne

test/testsuppressions.cpp

@@ -1925,17 +1925,20 @@ class TestSuppressions : public TestFixture {
     struct PolyspaceParseResult {
         std::string errorId;
         int lineNumber;
+        std::string extraComment;
         SuppressionList::Type type = SuppressionList::Type::unique;
         int lineBegin = SuppressionList::Suppression::NO_LINE;
         int lineEnd = SuppressionList::Suppression::NO_LINE;
 
         PolyspaceParseResult(const std::string &&errorId,
                              int lineNumber,
+                             const std::string &&extraComment = "",
                              SuppressionList::Type type = SuppressionList::Type::unique,
                              int lineBegin = SuppressionList::Suppression::NO_LINE,
                              int lineEnd = SuppressionList::Suppression::NO_LINE)
             : errorId(errorId)
             , lineNumber(lineNumber)
+            , extraComment(extraComment)
             , type(type)
             , lineBegin(lineBegin)
             , lineEnd(lineEnd)
@@ -1966,6 +1969,7 @@ class TestSuppressions : public TestFixture {
             ASSERT(supprIt->isInline);
             ASSERT_EQUALS(fileName, supprIt->fileName);
             ASSERT_EQUALS(resultIt->errorId, supprIt->errorId);
+            ASSERT_EQUALS(resultIt->extraComment, supprIt->extraComment);
             ASSERT_EQUALS_ENUM(resultIt->type, supprIt->type);
             ASSERT_EQUALS(resultIt->lineNumber, supprIt->lineNumber);
             ASSERT_EQUALS(resultIt->lineBegin, supprIt->lineBegin);
@@ -2093,8 +2097,8 @@ class TestSuppressions : public TestFixture {
         testPolyspaceSuppression(
             settings,
             { { "/* polyspace MISRA2012 : 2.7 [Justified:Low] \"comment 1\" polyspace MISRA-CPP : 7-1-1 \"comment 2\"*/", 1 } },
-            { { "premium-misra-c-2012-2.7", 1 },
-                { "premium-misra-cpp-2008-7-1-1", 1 }, }
+            { { "premium-misra-c-2012-2.7", 1, "comment 1" },
+                { "premium-misra-cpp-2008-7-1-1", 1, "comment 2" }, }
             );
     }
 
@@ -2104,7 +2108,7 @@ class TestSuppressions : public TestFixture {
         testPolyspaceSuppression(
             settings,
             { { "/* polyspace +3 MISRA2012 : 2.7 */", 1 } },
-            { { "premium-misra-c-2012-2.7", 1, SuppressionList::Type::block, 1, 4 } }
+            { { "premium-misra-c-2012-2.7", 1, "", SuppressionList::Type::block, 1, 4 } }
             );
     }
 
@@ -2115,7 +2119,7 @@ class TestSuppressions : public TestFixture {
             settings,
             { { "/* polyspace-begin MISRA2012 : 2.7 */", 1 },
                 { "/* polyspace-end MISRA2012 : 2.7 */", 5 } },
-            { { "premium-misra-c-2012-2.7", 1, SuppressionList::Type::block, 1, 5 } }
+            { { "premium-misra-c-2012-2.7", 1, "", SuppressionList::Type::block, 1, 5 } }
             );
     }
 };