respect junit xsd (issue #90)

Author: dnozay

tests/testsuite.py

@@ -305,6 +305,25 @@ def test_junitxml_properties(self):
         suite.properties = dict(key='value')
         self._test_xmlrunner(suite)
 
+    def test_junitxml_xsd_validation(self):
+        suite = unittest.TestSuite()
+        suite.addTest(self.DummyTest('test_fail'))
+        suite.addTest(self.DummyTest('test_pass'))
+        suite.properties = dict(key='value')
+        outdir = BytesIO()
+        runner = xmlrunner.XMLTestRunner(
+            stream=self.stream, output=outdir, verbosity=self.verbosity,
+            **self.runner_kwargs)
+        runner.run(suite)
+        outdir.seek(0)
+        output = outdir.read()
+        # poor man's schema validation; see issue #90
+        i_properties = output.index('<properties>'.encode('utf8'))
+        i_system_out = output.index('<system-out>'.encode('utf8'))
+        i_system_err = output.index('<system-err>'.encode('utf8'))
+        i_testcase = output.index('<testcase'.encode('utf8'))
+        self.assertTrue(i_properties < i_testcase < i_system_out < i_system_err)
+
     def test_xmlrunner_elapsed_times(self):
         self.runner_kwargs['elapsed_times'] = False
         suite = unittest.TestSuite()

xmlrunner/result.py

@@ -312,7 +312,7 @@ def _report_testsuite_properties(xml_testsuite, xml_document, properties):
 
     _report_testsuite_properties = staticmethod(_report_testsuite_properties)
 
-    def _report_testsuite(suite_name, tests, xml_document, parentElement,
+    def _report_testsuite(suite_name, suite, tests, xml_document, parentElement,
                           properties):
         """
         Appends the testsuite section to the XML document.
@@ -335,6 +335,9 @@ def _report_testsuite(suite_name, tests, xml_document, parentElement,
         _XMLTestResult._report_testsuite_properties(
             testsuite, xml_document, properties)
 
+        for test in tests:
+            _XMLTestResult._report_testcase(suite, test, testsuite, xml_document)
+
         systemout = xml_document.createElement('system-out')
         testsuite.appendChild(systemout)
 
@@ -447,10 +450,8 @@ def generate_reports(self, test_runner):
 
             # Build the XML file
             testsuite = _XMLTestResult._report_testsuite(
-                suite_name, tests, doc, parentElement, self.properties
+                suite_name, suite, tests, doc, parentElement, self.properties
             )
-            for test in tests:
-                _XMLTestResult._report_testcase(suite, test, testsuite, doc)
             xml_content = doc.toprettyxml(
                 indent='\t',
                 encoding=test_runner.encoding