junitparser 3.1.1__tar.gz → 3.2.0__tar.gz

{junitparser-3.1.1 → junitparser-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junitparser
-Version: 3.1.1
+Version: 3.2.0
 Summary: Manipulates JUnit/xUnit Result XML files
 Home-page: https://github.com/weiwei/junitparser
 Author: Weiwei Wang
@@ -28,12 +28,12 @@ existing Result XML files, or create new JUnit/xUnit result XMLs from scratch.
 Features
 --------
 
-* Parse or modify existing JUnit/xUnit xml files.
-* Parse or modify non-standard or customized JUnit/xUnit xml files, by monkey
+* Parse or modify existing JUnit/xUnit XML files.
+* Parse or modify non-standard or customized JUnit/xUnit XML files, by monkey
   patching existing element definitions.
 * Create JUnit/xUnit test results from scratch.
-* Merge test result xml files.
-* Specify xml parser. For example you can use lxml to speed things up.
+* Merge test result XML files.
+* Specify XML parser. For example you can use lxml to speed things up.
 * Invoke from command line, or `python -m junitparser`
 * Python 2 and 3 support (As of Nov 2020, 1/4 of the users are still on Python
   2, so there is no plan to drop Python 2 support)
@@ -41,7 +41,7 @@ Features
 Note on version 2
 -----------------
 
-Version 2 improved support for pytest result xml files by fixing a few issues,
+Version 2 improved support for pytest result XML files by fixing a few issues,
 notably that there could be multiple <Failure> or <Error> entries. There is a
 breaking change that ``TestCase.result`` is now a list instead of a single item.
 If you are using this attribute, please update your code accordingly.
@@ -149,7 +149,7 @@ Schema Support
 ~~~~~~~~~~~~~~~
 
 By default junitparser supports the schema of windyroad_, which is a relatively
-simple schema. 
+simple schema.
 
 .. _windyroad: https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd
 
@@ -295,7 +295,7 @@ Command Line
 Test
 ----
 
-The tests are written with python `unittest`, to run them, use pytest::
+The tests are written with python ``unittest``, to run them, use pytest::
 
     pytest test.py
 

{junitparser-3.1.1 → junitparser-3.2.0}/README.rst

@@ -12,12 +12,12 @@ existing Result XML files, or create new JUnit/xUnit result XMLs from scratch.
 Features
 --------
 
-* Parse or modify existing JUnit/xUnit xml files.
-* Parse or modify non-standard or customized JUnit/xUnit xml files, by monkey
+* Parse or modify existing JUnit/xUnit XML files.
+* Parse or modify non-standard or customized JUnit/xUnit XML files, by monkey
   patching existing element definitions.
 * Create JUnit/xUnit test results from scratch.
-* Merge test result xml files.
-* Specify xml parser. For example you can use lxml to speed things up.
+* Merge test result XML files.
+* Specify XML parser. For example you can use lxml to speed things up.
 * Invoke from command line, or `python -m junitparser`
 * Python 2 and 3 support (As of Nov 2020, 1/4 of the users are still on Python
   2, so there is no plan to drop Python 2 support)
@@ -25,7 +25,7 @@ Features
 Note on version 2
 -----------------
 
-Version 2 improved support for pytest result xml files by fixing a few issues,
+Version 2 improved support for pytest result XML files by fixing a few issues,
 notably that there could be multiple <Failure> or <Error> entries. There is a
 breaking change that ``TestCase.result`` is now a list instead of a single item.
 If you are using this attribute, please update your code accordingly.
@@ -133,7 +133,7 @@ Schema Support
 ~~~~~~~~~~~~~~~
 
 By default junitparser supports the schema of windyroad_, which is a relatively
-simple schema. 
+simple schema.
 
 .. _windyroad: https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd
 
@@ -279,7 +279,7 @@ Command Line
 Test
 ----
 
-The tests are written with python `unittest`, to run them, use pytest::
+The tests are written with python ``unittest``, to run them, use pytest::
 
     pytest test.py
 

{junitparser-3.1.1 → junitparser-3.2.0}/junitparser/__init__.py

@@ -14,4 +14,4 @@ from .junitparser import (
     FloatAttr,
 )
 
-version = "3.1.1"
+version = "3.2.0"

{junitparser-3.1.1 → junitparser-3.2.0}/junitparser/junitparser.py

@@ -8,9 +8,9 @@ This, according to the document, is Apache Ant's JUnit output.
 
 See the documentation for other supported schemas.
 """
-
 import itertools
 from copy import deepcopy
+from typing import List, Union
 
 try:
     from lxml import etree
@@ -314,6 +314,7 @@ class TestCase(Element):
     name = Attr()
     classname = Attr()
     time = FloatAttr()
+    __test__ = False
 
     def __init__(self, name: str = None, classname: str = None, time: float = None):
         super().__init__(self._tag)
@@ -362,14 +363,17 @@ class TestCase(Element):
         return results
 
     @result.setter
-    def result(self, value: Result):
+    def result(self, value: Union[Result, List[Result]]):
         # First remove all existing results
         for entry in self.result:
             if any(isinstance(entry, r) for r in POSSIBLE_RESULTS):
                 self.remove(entry)
-        for entry in value:
-            if any(isinstance(entry, r) for r in POSSIBLE_RESULTS):
-                self.append(entry)
+        if isinstance(value, Result):
+            self.append(value)
+        elif isinstance(value, list):
+            for entry in value:
+                if any(isinstance(entry, r) for r in POSSIBLE_RESULTS):
+                    self.append(entry)
 
     @property
     def system_out(self):
@@ -489,6 +493,7 @@ class TestSuite(Element):
     failures = IntAttr()
     errors = IntAttr()
     skipped = IntAttr()
+    __test__ = False
 
     def __init__(self, name=None):
         super().__init__(self._tag)
@@ -552,7 +557,7 @@ class TestSuite(Element):
         result.add_testsuite(other)
         return result
 
-    def remove_testcase(self, testcase):
+    def remove_testcase(self, testcase: TestCase):
         """Remove testcase *testcase* from the testsuite."""
         for case in self:
             if case == testcase:
@@ -580,7 +585,7 @@ class TestSuite(Element):
         self.skipped = skipped
         self.time = round(time, 3)
 
-    def add_property(self, name, value):
+    def add_property(self, name: str, value: str):
         """Add a property *name* = *value* to the testsuite.
 
         See :class:`Property` and :class:`Properties`.
@@ -593,17 +598,17 @@ class TestSuite(Element):
         prop = Property(name, value)
         props.add_property(prop)
 
-    def add_testcase(self, testcase):
+    def add_testcase(self, testcase: TestCase):
         """Add a testcase *testcase* to the testsuite."""
         self.append(testcase)
         self.update_statistics()
 
-    def add_testcases(self, testcases):
+    def add_testcases(self, testcases: List[TestCase]):
         """Add testcases *testcases* to the testsuite."""
         self.extend(testcases)
         self.update_statistics()
 
-    def _add_testcase_no_update_stats(self, testcase):
+    def _add_testcase_no_update_stats(self, testcase: TestCase):
         """Add *testcase* to the testsuite (without updating statistics).
 
         For internal use only to avoid quadratic behaviour in merge.
@@ -662,6 +667,8 @@ class JUnitXml(Element):
     errors = IntAttr()
     skipped = IntAttr()
 
+    testsuite = TestSuite
+
     def __init__(self, name=None):
         super().__init__(self._tag)
         self.filepath = None
@@ -726,7 +733,7 @@ class JUnitXml(Element):
         if root_elem.tag == "testsuites":
             instance = cls()
         elif root_elem.tag == "testsuite":
-            instance = TestSuite()
+            instance = cls.testsuite()
         else:
             raise JUnitXmlError("Invalid format.")
         instance._elem = root_elem

{junitparser-3.1.1 → junitparser-3.2.0}/junitparser/xunit2.py

@@ -19,26 +19,6 @@ from . import junitparser
 T = TypeVar("T")
 
 
-class JUnitXml(junitparser.JUnitXml):
-    # Pytest and xunit schema doesn't have "skipped" in testsuites
-    skipped = None
-
-    def update_statistics(self):
-        """Update test count, time, etc."""
-        time = 0
-        tests = failures = errors = 0
-        for suite in self:
-            suite.update_statistics()
-            tests += suite.tests
-            failures += suite.failures
-            errors += suite.errors
-            time += suite.time
-        self.tests = tests
-        self.failures = failures
-        self.errors = errors
-        self.time = round(time, 3)
-
-
 class TestSuite(junitparser.TestSuite):
     """TestSuite for Pytest, with some different attributes."""
 
@@ -93,6 +73,28 @@ class TestSuite(junitparser.TestSuite):
             self.append(err)
 
 
+class JUnitXml(junitparser.JUnitXml):
+    # Pytest and xunit schema doesn't have "skipped" in testsuites
+    skipped = None
+
+    testsuite = TestSuite
+
+    def update_statistics(self):
+        """Update test count, time, etc."""
+        time = 0
+        tests = failures = errors = 0
+        for suite in self:
+            suite.update_statistics()
+            tests += suite.tests
+            failures += suite.failures
+            errors += suite.errors
+            time += suite.time
+        self.tests = tests
+        self.failures = failures
+        self.errors = errors
+        self.time = round(time, 3)
+
+
 class StackTrace(junitparser.System):
     _tag = "stackTrace"
 

{junitparser-3.1.1 → junitparser-3.2.0}/junitparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junitparser
-Version: 3.1.1
+Version: 3.2.0
 Summary: Manipulates JUnit/xUnit Result XML files
 Home-page: https://github.com/weiwei/junitparser
 Author: Weiwei Wang
@@ -28,12 +28,12 @@ existing Result XML files, or create new JUnit/xUnit result XMLs from scratch.
 Features
 --------
 
-* Parse or modify existing JUnit/xUnit xml files.
-* Parse or modify non-standard or customized JUnit/xUnit xml files, by monkey
+* Parse or modify existing JUnit/xUnit XML files.
+* Parse or modify non-standard or customized JUnit/xUnit XML files, by monkey
   patching existing element definitions.
 * Create JUnit/xUnit test results from scratch.
-* Merge test result xml files.
-* Specify xml parser. For example you can use lxml to speed things up.
+* Merge test result XML files.
+* Specify XML parser. For example you can use lxml to speed things up.
 * Invoke from command line, or `python -m junitparser`
 * Python 2 and 3 support (As of Nov 2020, 1/4 of the users are still on Python
   2, so there is no plan to drop Python 2 support)
@@ -41,7 +41,7 @@ Features
 Note on version 2
 -----------------
 
-Version 2 improved support for pytest result xml files by fixing a few issues,
+Version 2 improved support for pytest result XML files by fixing a few issues,
 notably that there could be multiple <Failure> or <Error> entries. There is a
 breaking change that ``TestCase.result`` is now a list instead of a single item.
 If you are using this attribute, please update your code accordingly.
@@ -149,7 +149,7 @@ Schema Support
 ~~~~~~~~~~~~~~~
 
 By default junitparser supports the schema of windyroad_, which is a relatively
-simple schema. 
+simple schema.
 
 .. _windyroad: https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd
 
@@ -295,7 +295,7 @@ Command Line
 Test
 ----
 
-The tests are written with python `unittest`, to run them, use pytest::
+The tests are written with python ``unittest``, to run them, use pytest::
 
     pytest test.py
 

{junitparser-3.1.1 → junitparser-3.2.0}/tests/test_general.py

@@ -578,7 +578,8 @@ class Test_TestCase:
 
     def test_update_results(self):
         case = TestCase()
-        case.result = [Skipped()]
+        case.result = Skipped()
+        assert len(case.result) == 1
         case.result = [Failure(), Skipped()]
         assert len(case.result) == 2
 

{junitparser-3.1.1 → junitparser-3.2.0}/tests/test_xunit2.py

@@ -101,3 +101,14 @@ class Test_JUnitXml:
         assert xml.skipped is None
         assert xml.tostring().count(b"errors") == 2
         assert xml.tostring().count(b"skipped") == 1
+
+    def test_fromstring(self):
+        text = """<testsuite name="suite name">
+         <testcase name="test name 1"/>
+         <testcase name="test name 2"/>
+        </testsuite>"""
+        suite = JUnitXml.fromstring(text)
+        assert isinstance(suite, TestSuite)
+        assert suite.name == "suite name"
+        assert len(list(suite)) == 2
+        assert [test.name for test in suite] == ["test name 1", "test name 2"]