test

Author: danmar

lib/suppressions.cpp

@@ -245,6 +245,15 @@ SuppressionList::Suppression SuppressionList::parseLine(const std::string &line)
                     suppression.fileName.erase(pos);
                 }
             }
+
+            // when parsing string generated internally by toString() there can be newline
+            std::string extra;
+            while (std::getline(lineStream, extra)) {
+                if (startsWith(extra, "symbol="))
+                    suppression.symbolName = extra.substr(7);
+                else if (extra == "polyspace=1")
+                    suppression.isPolyspace = true;
+            }
         }
     }
 
@@ -633,7 +642,7 @@ void SuppressionList::markUnmatchedInlineSuppressionsAsChecked(const Tokenizer &
 std::string SuppressionList::Suppression::toString() const
 {
     std::string s;
-    s+= errorId;
+    s += errorId;
     if (!fileName.empty()) {
         s += ':';
         s += fileName;
@@ -642,10 +651,10 @@ std::string SuppressionList::Suppression::toString() const
             s += std::to_string(lineNumber);
         }
     }
-    if (!symbolName.empty()) {
-        s += ':';
-        s += symbolName;
-    }
+    if (!symbolName.empty())
+        s += "\nsymbol=" + symbolName;
+    if (isPolyspace)
+        s += "\npolyspace=1";
     return s;
 }
 

test/testsuppressions.cpp

@@ -55,6 +55,7 @@ class TestSuppressions : public TestFixture {
 
     void run() override {
         mNewTemplate = true;
+        TEST_CASE(parseLine);
         TEST_CASE(suppressionsBadId1);
         TEST_CASE(suppressionsDosFormat);     // Ticket #1836
         TEST_CASE(suppressionsFileNameWithColon);    // Ticket #1919 - filename includes colon
@@ -141,6 +142,17 @@ class TestSuppressions : public TestFixture {
         TEST_CASE(polyspaceExtraComments);
     }
 
+
+    void parseLine() const {
+        ASSERT_EQUALS("bad:test.c:1", SuppressionList::parseLine("bad:test.c:1").toString());
+        
+        // symbol
+        ASSERT_EQUALS("bad:test.c:1\nsymbol=x", SuppressionList::parseLine("bad:test.c:1\nsymbol=x").toString());
+        
+        // polyspace
+        ASSERT_EQUALS("bad:test.c:1\npolyspace=1", SuppressionList::parseLine("bad:test.c:1\npolyspace=1").toString());
+    }
+
     void suppressionsBadId1() const {
         SuppressionList suppressions;
         std::istringstream s1("123");
@@ -1810,7 +1822,7 @@ class TestSuppressions : public TestFixture {
             SuppressionList::Suppression s;
             s.errorId = "unitvar";
             s.symbolName = "sym";
-            ASSERT_EQUALS("unitvar:sym", s.toString());
+            ASSERT_EQUALS("unitvar\nsymbol=sym", s.toString());
         }
     }