Simplify XML generation function and unit test.

Author: johnthagen

cppcheck_junit.py

@@ -82,15 +82,14 @@ def parse_cppcheck(file_name):
     return errors
 
 
-def generate_test_suite(errors, output_file):
-    """Writes a JUnit test file from parsed Cppcheck errors.
+def generate_test_suite(errors):
+    """Converts parsed Cppcheck errors into JUnit XML tree.
 
     Args:
         errors (Dict[str, List[CppcheckError]]):
-        output_file (str): File path to create JUnit XML file.
 
     Returns:
-        Nothing.
+        ElementTree.ElementTree: XML test suite.
     """
     test_suite = ElementTree.Element('testsuite')
     test_suite.attrib['errors'] = str(len(errors))
@@ -112,8 +111,7 @@ def generate_test_suite(errors, output_file):
                                                                 error.severity,
                                                                 error.message))
 
-    tree = ElementTree.ElementTree(test_suite)
-    tree.write(output_file, encoding='utf-8', xml_declaration=True)
+    return ElementTree.ElementTree(test_suite)
 
 
 def main():
@@ -138,7 +136,8 @@ def main():
         return EXIT_FAILURE
 
     if len(errors) > 0:
-        generate_test_suite(errors, args.output_file)
+        tree = generate_test_suite(errors)
+        tree.write(args.output_file, encoding='utf-8', xml_declaration=True)
 
     return EXIT_SUCCESS
 

test.py

@@ -5,7 +5,7 @@
 import unittest
 from xml.etree import ElementTree
 
-from cppcheck_junit import parse_cppcheck
+from cppcheck_junit import CppcheckError, generate_test_suite, parse_cppcheck
 
 
 class ParseCppcheckTestCase(unittest.TestCase):
@@ -65,5 +65,29 @@ def test_malformed(self):
             parse_cppcheck('tests/cppcheck-out-malformed.xml')
 
 
+class GenerateTestSuiteTestCase(unittest.TestCase):
+    def test_single(self):
+        errors = {'file_name':
+                  [CppcheckError('file_name',
+                                 4,
+                                 'error message',
+                                 'severity',
+                                 'error_id',
+                                 'verbose error message')]}
+        tree = generate_test_suite(errors)
+        root = tree.getroot()
+        self.assertEqual(root.get('errors'), str(1))
+        self.assertEqual(root.get('failures'), str(0))
+        self.assertEqual(root.get('tests'), str(1))
+
+        test_case_element = root.find('testcase')
+        self.assertEqual(test_case_element.get('name'), 'file_name')
+
+        error_element = test_case_element.find('error')
+        self.assertEqual(error_element.get('file'), 'file_name')
+        self.assertEqual(error_element.get('line'), str(4))
+        self.assertEqual(error_element.get('message'), '4: (severity) error message')
+
+
 if __name__ == '__main__':
     unittest.main()