add/update tests

Author: ludviggunne

test/cli/inline-suppress_test.py

@@ -55,6 +55,20 @@ def test_2():
     assert ret == 0, stdout
 
 
+def test_xml():
+    args = [
+        '-q',
+        '--template=simple',
+        '--inline-suppr',
+        '--xml-version=3',
+        'proj-inline-suppress'
+    ]
+    ret, stdout, stderr = cppcheck(args, cwd=__script_dir)
+    assert '<suppression errorId="some_warning_id" fileName="proj-inline-suppress/2.c" lineNumber="2" inline="true" comment="there should be a unmatchedSuppression warning about this" />' in stderr
+    assert stdout == ''
+    assert ret == 0, stdout
+
+
 def test_unmatched_suppression():
     args = [
         '-q',

test/cli/premium_test.py

@@ -69,7 +69,7 @@ def test_misra_c_builtin_style_checks(tmpdir):
 
     exitcode, _, stderr = cppcheck(['--xml-version=3', '--suppress=foo', test_file], cppcheck_exe=exe)
     assert exitcode == 0
-    assert '<suppression errorId="foo" />' in stderr
+    assert '<suppression errorId="foo" inline="false" />' in stderr
 
 
 def test_build_dir_hash_cppcheck_product(tmpdir):

test/testsuppressions.cpp

@@ -1014,6 +1014,17 @@ class TestSuppressions : public TestFixture {
         msg.clear();
         ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress id */", &msg));
         ASSERT_EQUALS("", msg);
+        ASSERT_EQUALS("", s.extraComment);
+
+        msg.clear();
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress id ; extra */", &msg));
+        ASSERT_EQUALS("", msg);
+        ASSERT_EQUALS("extra", s.extraComment);
+
+        msg.clear();
+        ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress id // extra */", &msg));
+        ASSERT_EQUALS("", msg);
+        ASSERT_EQUALS("extra", s.extraComment);
 
         msg.clear();
         ASSERT_EQUALS(true, s.parseComment("/* cppcheck-suppress-file id */", &msg));