testbench2robotframework 0.8.0a1__tar.gz → 0.8.0a3__tar.gz

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/.gitignore

@@ -153,4 +153,8 @@ results/
 report.html
 ExampleConfiguration/toml_config_minimal.toml
 ExampleConfiguration/toml_new_names.toml
-README_new.md
+README_new.md
+report/
+reportt/
+itorx_report/
+config.json

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: testbench2robotframework
-Version: 0.8.0a1
+Version: 0.8.0a3
 Summary: Robot Framework Code Generator from Keyword-Driven Tests in imbus TestBench 3.0 and newer
 Author-email: imbus AG <support@imbus.de>
-Requires-Python: >= 3.9
+Requires-Python: >= 3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click >= 8.0
@@ -26,7 +26,7 @@ Provides-Extra: dev
 
 # Installation des Robot Code Generators
 
-Voraussetzung für die Installation der Software ist eine vorhandene Python Installation. Die minimal benötigte Version ist Python 3.9. Zum Überprüfen, ob die korrekte Python Version installiert ist, kann der folgende Kommandozeilen Befehl verwendet werden:
+Voraussetzung für die Installation der Software ist eine vorhandene Python Installation. Die minimal benötigte Version ist Python 3.10. Zum Überprüfen, ob die korrekte Python Version installiert ist, kann der folgende Kommandozeilen Befehl verwendet werden:
 
 ```powershell
 python --version

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/README.md

@@ -1,6 +1,6 @@
 # Installation des Robot Code Generators
 
-Voraussetzung für die Installation der Software ist eine vorhandene Python Installation. Die minimal benötigte Version ist Python 3.9. Zum Überprüfen, ob die korrekte Python Version installiert ist, kann der folgende Kommandozeilen Befehl verwendet werden:
+Voraussetzung für die Installation der Software ist eine vorhandene Python Installation. Die minimal benötigte Version ist Python 3.10. Zum Überprüfen, ob die korrekte Python Version installiert ist, kann der folgende Kommandozeilen Befehl verwendet werden:
 
 ```powershell
 python --version

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/pyproject.toml

@@ -2,6 +2,8 @@
 requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
 
+[tool.testbench2robotframework.console-logging]
+logLevel = "DEBUG"
 
 [project]
 name = "testbench2robotframework"
@@ -9,7 +11,7 @@ authors = [
     {name = "imbus AG", email = "support@imbus.de"},
 ]
 description = "Robot Framework Code Generator from Keyword-Driven Tests in imbus TestBench 3.0 and newer"
-requires-python = ">= 3.9"
+requires-python = ">= 3.10"
 readme = "README.md"
 license = {text = "Apache 2.0 License"}
 dynamic = ["version"]
@@ -53,7 +55,7 @@ ignore = [
 
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.10"
 ignore_missing_imports = true
 no_implicit_optional = true
 strict_optional = true

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/testbench2robotframework/__init__.py

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 """A Python package for converting TestBench reports to Robot Framework test
- suites and enhancing the TestBench report with execution results from Robot Framework."""
+suites and enhancing the TestBench report with execution results from Robot Framework."""
 
 from .testbench2robotframework import testbench2robotframework  # noqa: F401
 
-__version__ = "0.8.0a1"
+__version__ = "0.8.0a3"

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/testbench2robotframework/config.py

@@ -1,6 +1,7 @@
 # pylint: skip-file
 from __future__ import annotations
 
+from enum import Enum, auto
 import json
 import sys
 from dataclasses import dataclass
@@ -11,7 +12,6 @@ if sys.version_info >= (3, 11):
     import tomllib
 else:
     import tomli as tomllib
-from .model import StrEnum
 
 DEFAULT_LIBRARY_REGEX = r"(?:.*\.)?(?P<resourceName>[^.]+?)\s*\[Robot-Library\].*"
 DEFAULT_LIBRARY_ROOTS: Final[list[str]] = ["RF", "RF-Library"]
@@ -19,6 +19,18 @@ DEFAULT_RESOURCE_REGEX = r"(?:.*\.)?(?P<resourceName>[^.]+?)\s*\[Robot-Resource\
 DEFAULT_RESOURCE_ROOTS: Final[list[str]] = ["RF-Resource"]
 DEFAULT_GENERATION_DIRECTORY = "{root}/Generated"
 
+class StrEnum(str, Enum):
+    def __new__(cls, *args):
+        for arg in args:
+            if not isinstance(arg, (str, auto)):
+                raise TypeError(f"Values of StrEnums must be strings: {arg!r} is a {type(arg)}")
+        return super().__new__(cls, *args)
+
+    def __str__(self):
+        return self.value
+
+    def _generate_next_value_(name, *_):
+        return name
 
 
 def find_pyproject_toml() -> Path:
@@ -36,6 +48,8 @@ def get_testbench2robotframework_toml_dict(toml_path: Path):
             toml_dict = tomllib.load(toml_file)
     except FileNotFoundError:
         return {}
+    except PermissionError:
+        return {}
     return toml_dict.get("tool", {}).get("testbench2robotframework", {})
 
 

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/testbench2robotframework/html_parser.py

@@ -14,7 +14,7 @@ class TextExtractor(HTMLParser):
 
 
 def extract_text_from_html(html):
-    html = html.replace(' ', ' ')
+    html = html.replace(" ", " ")
     parser = TextExtractor()
     parser.feed(html)
-    return parser.get_text().strip().replace('\n', '\n    ...').replace('\u00A0',' ')
+    return parser.get_text().strip().replace("\n", "\n    ...").replace("\u00a0", " ")

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/testbench2robotframework/json_reader.py

@@ -9,9 +9,10 @@ from .log import logger
 from .model import (
     TestCaseDetails,
     TestCaseSetDetails,
-    TestStructureElementType,
+    TestCaseSetNode,
     TestStructureTree,
 )
+from .model_utils import from_dict
 
 TEST_STRUCTURE_TREE_FILE = "cycle_structure.json"
 TEST_STRUCTURE_TREE_TOV_FILE = "tov_structure.json"
@@ -56,10 +57,7 @@ class TestBenchJsonReader:
             test_theme_path = self.get_structure_tree_path()
             logger.debug(f"Loading TestThemeTree from {test_theme_path}")
             test_structure_tree = read_json(str(test_theme_path))
-            self._test_theme_tree = TestStructureTree.from_dict(
-                test_structure_tree,
-                bool(str(test_theme_path).endswith(TEST_STRUCTURE_TREE_TOV_FILE)),
-            )
+            self._test_theme_tree = from_dict(TestStructureTree, test_structure_tree)
             logger.info(f"{len(self._test_theme_tree.nodes)} nodes from TestThemeTree loaded.")
         return self._test_theme_tree
 
@@ -103,11 +101,7 @@ class TestBenchJsonReader:
     def get_test_case_set_uids(self) -> list[str]:
         nodes = [self.test_theme_tree.root]
         nodes.extend(self.test_theme_tree.nodes)
-        return [
-            tse.base.uniqueID
-            for tse in nodes
-            if tse.elementType == TestStructureElementType.TestCaseSetNode
-        ]
+        return [tse.base.uniqueID for tse in nodes if isinstance(tse, TestCaseSetNode)]
 
     def get_test_case_uids(self, test_case_set_uid: str) -> list[str]:
         if not self._test_case_sets:
@@ -123,20 +117,20 @@ class TestBenchJsonReader:
         tcs_dict = read_json(str(Path(self.json_dir, f"{uid}.json")))
         if tcs_dict is None:
             return None
-        return TestCaseSetDetails.from_dict(tcs_dict)
+        return from_dict(TestCaseSetDetails, tcs_dict)
 
     def read_test_case(self, uid) -> Optional[TestCaseDetails]:
         tc_dict = read_json(str(Path(self.json_dir, f"{uid}.json")))
         if tc_dict is None:
             return None
             # return None  # TODO: wenn nicht da dann Fehler?
-        return TestCaseDetails.from_dict(tc_dict)
+        return from_dict(TestCaseDetails, tc_dict)
 
     def read_test_theme_tree(self, is_tov=False) -> Optional[TestStructureTree]:
         test_structure_tree = read_json(str(Path(self.json_dir, TEST_STRUCTURE_TREE_FILE)))
         if test_structure_tree is None:
             return None
-        return TestStructureTree.from_dict(test_structure_tree, is_tov)
+        return from_dict(TestStructureTree, test_structure_tree)
 
 
 def read_json(filepath: str, silent=True):

{testbench2robotframework-0.8.0a1 → testbench2robotframework-0.8.0a3}/testbench2robotframework/json_writer.py

@@ -1,14 +1,15 @@
 import json
 from dataclasses import asdict
+from enum import Enum
 from pathlib import Path
 from typing import Union
 
 from .config import Configuration
 from .log import logger
 from .model import (
-    ProtocolTestCaseSetExecutionSummary,
     TestCaseDetails,
     TestCaseSetDetails,
+    TestCaseSetExecutionForImport,
     TestStructureTree,
 )
 
@@ -24,16 +25,24 @@ def write_test_structure_element(
     else:
         filepath = Path(json_dir) / Path(f"{test_structure_element.uniqueID}.json")
     with Path(filepath).open("w+", encoding="utf8") as output_file:
-        json.dump(asdict(test_structure_element), output_file, indent=2)
+        json.dump(
+            asdict(test_structure_element),
+            output_file,
+            indent=2,
+            default=lambda o: o.value if isinstance(o, Enum) else str(o),
+        )
 
 
-def write_main_protocol(
-    json_dir: str, main_protocol: list[ProtocolTestCaseSetExecutionSummary]
-) -> None:
+def write_main_protocol(json_dir: str, main_protocol: list[TestCaseSetExecutionForImport]) -> None:
     protocol = [asdict(tcs) for tcs in main_protocol]
     filepath = Path(json_dir) / Path("protocol.json")
     with Path(filepath).open("w+", encoding="utf8") as output_file:
-        json.dump(protocol, output_file, indent=2)
+        json.dump(
+            protocol,
+            output_file,
+            indent=2,
+            default=lambda o: o.value if isinstance(o, Enum) else str(o),
+        )
 
 
 def write_default_config(config_file):