specmatic 1.3.25__py3-none-any.whl → 1.3.27__py3-none-any.whl

specmatic/coverage/sanic_app_route_adapter.py

@@ -15,5 +15,5 @@ class SanicAppRouteAdapter(AppRouteAdapter):
         return self.routes_as_list()
 
     def convert_to_spring_actuator_url_format(self, flask_route_url):
-        pattern = r'<(\w+):(\w+)>'
-        return re.sub(pattern, r'{\1}', flask_route_url)
+        pattern = r"<(\w+):([^\/]+)>"
+        return re.sub(pattern, r"{\1}", flask_route_url)

specmatic/generators/pytest_generator.py

@@ -15,14 +15,14 @@ class PyTestGenerator(TestGeneratorBase):
 
     @staticmethod
     def _generate_passing_test():
-        def test(self):
+        def test_pass(self):
             assert 1 == 1
 
-        return test
+        return test_pass
 
     @staticmethod
     def _generate_failing_test(error):
-        def test(self):
+        def test_fail(self):
             pytest.fail(error)
 
-        return test
+        return test_fail

specmatic/generators/test_generator_base.py

@@ -1,15 +1,29 @@
+import re
 import xml.etree.ElementTree as ET
-
+from typing import Callable, Type
 
 class TestGeneratorBase:
+    pattern = re.compile(r"[\s\S]*dynamic-test:#(\d+)[\s\S]*")
     @staticmethod
-    def generate_tests(junit_report_path, test_class, passing_test_fn, failing_test_fn):
-        root = ET.parse(junit_report_path).getroot()
-        for testcase in root.iter('testcase'):
-            scenario = testcase.find('system-out').text.split('display-name:')[1].strip()
-            test_name = "test_" + scenario
-            failure = testcase.find('failure')
-            if failure is None:
-                setattr(test_class, test_name, passing_test_fn())
-            else:
-                setattr(test_class, test_name, failing_test_fn(failure.get('message') + failure.text))
+    def generate_tests(junit_report_path: str, test_class: Type, passing_test_fn: Callable, failing_test_fn: Callable) -> None:
+        test_cases = []
+        
+        try:
+            root = ET.parse(junit_report_path).getroot()
+            for testcase in root.iter('testcase'):
+                test_case_info = re.match(TestGeneratorBase.pattern, testcase.find('system-out').text) # type: ignore
+                if test_case_info is None:
+                    raise ValueError("Invalid test case information")
+                unique_id = test_case_info.groups()[0]
+                test_name = f"test [{unique_id}] {testcase.get("name")}"
+                failure_message = testcase.findtext('failure')
+                if failure_message is None:
+                    test_cases.append((unique_id, test_name, passing_test_fn()))
+                else:
+                    test_cases.append((unique_id, test_name, failing_test_fn(failure_message)))
+        except ET.ParseError as e:
+            raise ValueError("Invalid XML file") from e
+
+        test_cases.sort(key=lambda testcase : int(testcase[0]))
+        for (unique_id, test_name, test_fn) in test_cases:
+            setattr(test_class, test_name, test_fn)

specmatic/generators/unittest_generator.py

@@ -9,17 +9,17 @@ class UnitTestGenerator(TestGeneratorBase):
 
     @staticmethod
     def _gen_passing_test():
-        def test(self):
+        def test_pass(self):
             self.assertTrue(1 == 1)
 
-        return test
+        return test_pass
 
     @staticmethod
     def _gen_failing_test(error):
-        def test(self):
+        def test_fail(self):
             self.fail(error)
 
-        return test
+        return test_fail
 
     def generate(self):
         self.generate_tests(self.junit_report_path, self.test_class, UnitTestGenerator._gen_passing_test,

specmatic/version.py

@@ -1,2 +1,2 @@
-__version__ = '1.3.25'
-__specmatic_version__ = '1.3.25'
+__version__ = '1.3.27'
+__specmatic_version__ = '1.3.27'

{specmatic-1.3.25.dist-info → specmatic-1.3.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: specmatic
-Version: 1.3.25
+Version: 1.3.27
 Summary: A Python module for using the Specmatic Library.
 Home-page: https://github.com/znsio/specmatic-python-extensions
 Author: Specmatic Builders

{specmatic-1.3.25.dist-info → specmatic-1.3.27.dist-info}/RECORD

@@ -1,10 +1,10 @@
 specmatic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/build_utils.py,sha256=ukvyMkk8kkUqZiR6zQrxZbafKMByiVLzASSbypMsDp4,564
 specmatic/utils.py,sha256=6JDPqpO51ykl0MWCOa32jkUOXZ-0RZ6N5Ng9_7r7XaU,519
-specmatic/version.py,sha256=1oKpRsL0S2arRQHDu3UlLukaOOaEzPRFcpC4DzwrEK0,56
+specmatic/version.py,sha256=DlZsYGL9N8t47z2ROHeunepdc-rkvmTe4KyZrzT2BXE,56
 specmatic/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/core/decorators.py,sha256=E2U8ewezMYz8TpOF44qtdL1ahPa5F_HXU0nZ9uSbS1Q,3944
-specmatic/core/specmatic.jar,sha256=a-qlx0MJXR5L5ql0RS_7mD5898MXRWzcsGrHwRGJTMU,66072988
+specmatic/core/specmatic.jar,sha256=CpG542TxQV3a2oU-Jc0kj_YVx-9P5dg9UWFR0yE_HHc,65939832
 specmatic/core/specmatic.py,sha256=OkQy_rwhy9EQaUcB4L6Al_AtEDfwpTqwqZJccfpIKU4,7904
 specmatic/core/specmatic_base.py,sha256=NKFjJBB4edxinA8fgfd5aNOwJjD9xu7KpeeSsumoUTs,1735
 specmatic/core/specmatic_stub.py,sha256=_I6jc8oI7me6Q64gtPchRRqA-c8GGO5YTCIpw1nrwEo,4563
@@ -14,22 +14,22 @@ specmatic/coverage/app_route_adapter.py,sha256=hFJ54R7CZFK9jFI6VbxHtKJKJgLX4PUX4
 specmatic/coverage/coverage_route.py,sha256=WaqjG2Oh2PUfP72HoRnPkb5jG4BUmZK7Acla7gt_5Ko,284
 specmatic/coverage/fastapi_app_route_adapter.py,sha256=ziPbCCx6Mw2jxKis4Z9yd-jKNHmVKgAAVbIwFfAc3JA,869
 specmatic/coverage/flask_app_route_adapter.py,sha256=1OQXiqG3VCBwKpG5PGkjTHv27dnKjyy_spGhtg2omkE,897
-specmatic/coverage/sanic_app_route_adapter.py,sha256=LKt6YNE2CUYr7AqfjA8GS_uFGcniQ9C438BgDeFGuRs,758
+specmatic/coverage/sanic_app_route_adapter.py,sha256=zvwvV_bpSigc86hmKnMXGYWMbuXFz2DxyfOHXkXff18,761
 specmatic/coverage/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/coverage/servers/coverage_server.py,sha256=WaicRYG3LICiKmVg_TJlmuAS0espGLH9jWI6RsU6FPQ,2035
 specmatic/coverage/servers/fastapi_app_coverage_server.py,sha256=JwZcvDZrrwam6i875qMwWxIRI99Q0nXsXNEH2oNhCfk,283
 specmatic/coverage/servers/flask_app_coverage_server.py,sha256=JvswIhMaOXI7ab08Xd13T1x4p7vY2J9b2oe4MuJyC_k,275
 specmatic/coverage/servers/sanic_app_coverage_server.py,sha256=VoIxxGX8a2NPKJRkt6pfydxmw6TrV_r6lfAr94ekSdQ,275
 specmatic/generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-specmatic/generators/pytest_generator.py,sha256=x5p_k9wD0dNhV5kvIAM3_rvrQIE2ypCuJFTkyP3Q78Q,735
-specmatic/generators/test_generator_base.py,sha256=bCdJD9MOUX6FINPF2r06y9NQ5k10qN_38bfPXgWSfx4,668
-specmatic/generators/unittest_generator.py,sha256=Vkm8BP-_rZ-tFbLwUTNc90OgQCMJ4OHd8w5mShhcFyU,713
+specmatic/generators/pytest_generator.py,sha256=jUvZ9BRJp_UFIphGT9PdgDRkzNd6bYmKMWlLZeB6d_Q,755
+specmatic/generators/test_generator_base.py,sha256=X7pHFGVtUqweSrUqgE5EYX5pFMoJvOs3vxX-gVtykUo,1400
+specmatic/generators/unittest_generator.py,sha256=jrWg_IIEcF7TA-D35XsTsdSbGpf6WUIlGoqHABQqNRw,733
 specmatic/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 specmatic/servers/app_server.py,sha256=kOZviJA7-F4kmMTLGiBln2oO5uYX28wKJM2xQJTOVQY,456
 specmatic/servers/asgi_app_server.py,sha256=yn3tpWoF-nP8labOJdn49UB85vKiqIELVXk-gAugcUc,2924
 specmatic/servers/wsgi_app_server.py,sha256=3aU-o6Hh8FrnZlbjCLLpGY92HvJoU_rcqsZIb9TKVr8,1342
 specmatic/servers/wsgi_server_thread.py,sha256=XUEYW7-FP1a-5EkQVGc3FI_jkDQBocArxHLiCn3JJvc,691
-specmatic-1.3.25.dist-info/METADATA,sha256=72zA4rzIceCtXsdR8eBe1RwH3-6kkA03khgVr5w8F5w,10355
-specmatic-1.3.25.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-specmatic-1.3.25.dist-info/top_level.txt,sha256=E7kQ78YacKBoKKeKWR_N83exlG8r5J0wlzlGqFmvIfo,10
-specmatic-1.3.25.dist-info/RECORD,,
+specmatic-1.3.27.dist-info/METADATA,sha256=sM0RRrVHU1Jk7mL6-JqJBF6zVFkFxb77vIGxk-VBhH0,10355
+specmatic-1.3.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+specmatic-1.3.27.dist-info/top_level.txt,sha256=E7kQ78YacKBoKKeKWR_N83exlG8r5J0wlzlGqFmvIfo,10
+specmatic-1.3.27.dist-info/RECORD,,