Handle XML parsing failures and Cppcheck XML version 1 error.

Author: johnthagen

cppcheck_junit.py

@@ -56,12 +56,15 @@ def parse_cppcheck(file_name):
         Dict[str, List[CppcheckError]]: Parsed errors grouped by file name.
 
     Raises:
+        FileNotFoundError: If file_name does not exist.
+        xml.etree.ElementTree.ParseError: If file_name is not a valid XML file.
         ValueError: If unsupported Cppcheck XML version.
     """
     root = ElementTree.parse(file_name).getroot()  # type: ElementTree.Element
 
-    if not int(root.get('version')) == 2:
-        raise ValueError('Parser only supports Cppcheck XML version 2.  Use --xml-version=2')
+    if (root.get('version') is None or
+       int(root.get('version')) != 2):
+        raise ValueError('Parser only supports Cppcheck XML version 2.  Use --xml-version=2.')
 
     error_root = root.find('errors')
 
@@ -123,9 +126,16 @@ def main():
 
     try:
         errors = parse_cppcheck(args.input_file)
+    except ValueError as e:
+        print(str(e))
+        return EXIT_FAILURE
     except FileNotFoundError as e:
         print(str(e))
         return EXIT_FAILURE
+    except ElementTree.ParseError as e:
+        print('{} is a malformed XML file. Did you use --xml-version=2?\n{}'.format(
+            args.input_file, e))
+        return EXIT_FAILURE
 
     if len(errors) > 0:
         generate_test_suite(errors, args.output_file)

test.py

@@ -3,6 +3,7 @@
 """cppcheck-junit tests."""
 
 import unittest
+from xml.etree import ElementTree
 
 from cppcheck_junit import parse_cppcheck
 
@@ -51,5 +52,18 @@ def test_all(self):
         self.assertEqual(errors[file2][1].message,
                          "Array 'a[10]' accessed at index 10, which is out of bounds.")
 
+    def test_xml_version_1(self):
+        with self.assertRaises(ValueError):
+            parse_cppcheck('tests/cppcheck-out-bad-xml-version-1.xml')
+
+    def test_file_not_found(self):
+        with self.assertRaises(FileNotFoundError):
+            parse_cppcheck('tests/file_does_not_exist.xml')
+
+    def test_malformed(self):
+        with self.assertRaises(ElementTree.ParseError):
+            parse_cppcheck('tests/cppcheck-out-malformed.xml')
+
+
 if __name__ == '__main__':
     unittest.main()