testbench2robotframework 0.9.1a2__tar.gz → 0.9.2a1__tar.gz

{testbench2robotframework-0.9.1a2 → testbench2robotframework-0.9.2a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testbench2robotframework
-Version: 0.9.1a2
+Version: 0.9.2a1
 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.10

{testbench2robotframework-0.9.1a2 → testbench2robotframework-0.9.2a1}/testbench2robotframework/__init__.py

@@ -17,4 +17,4 @@ suites and enhancing the TestBench report with execution results from Robot Fram
 
 from .testbench2robotframework import testbench2robotframework  # noqa: F401
 
-__version__ = "0.9.1a2"
+__version__ = "0.9.2a1"

{testbench2robotframework-0.9.1a2 → testbench2robotframework-0.9.2a1}/testbench2robotframework/config.py

@@ -60,6 +60,8 @@ def find_private_robot_toml() -> Path:
 
 
 def get_testbench2robotframework_toml_dict(toml_path: Path):
+    if not toml_path or not toml_path.is_file():
+        return {}
     try:
         with Path(toml_path).open("rb") as toml_file:
             toml_dict = tomllib.load(toml_file)

{testbench2robotframework-0.9.1a2 → testbench2robotframework-0.9.2a1}/testbench2robotframework/model.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.yml
-#   timestamp: 2025-11-24T08:45:38+00:00
+#   timestamp: 2025-12-15T08:54:07+00:00
 
 from __future__ import annotations
 
@@ -505,7 +505,7 @@ class TOVResponse:
 
 
 @dataclass
-class OptionalLocalDateTime:
+class OptionalLocalDate:
     optional: Optional[str] = None
 
 
@@ -993,6 +993,7 @@ class TestCaseSpecification(TestStructureSpecification):
 class TestStructureItemBaseInformation:
     key: str
     numbering: str
+    path: str
     parentKey: str
     name: str
     uniqueID: str
@@ -1128,6 +1129,7 @@ class TestThemeDetails:
     name: str
     uniqueID: str
     numbering: str
+    path: str
     spec: TestThemeSpecification
     exec: Optional[TestThemeExecution] = None
 
@@ -1403,6 +1405,19 @@ class DefaultValue:
     valueType: ArgumentValueType
 
 
+@dataclass
+class SubdivisionDetails:
+    key: str
+    name: str
+    uniqueID: str
+    description: str
+    path: str
+    references: List[str]
+    locker: Optional[UserReference] = None
+    parentUniqueID: Optional[str] = None
+    libraryKey: Optional[str] = None
+
+
 @dataclass
 class KeywordParameterForInsert:
     name: str
@@ -1767,6 +1782,20 @@ class KeywordForInsert:
     callType: Optional[KeywordCallType] = None
 
 
+@dataclass
+class SubdivisionForInsert:
+    name: str
+    parentKey: Optional[str] = None
+    uid: Optional[str] = None
+    description: Optional[RichTextInfo] = None
+
+
+@dataclass
+class SubdivisionForUpdate:
+    name: Optional[str] = None
+    description: Optional[RichTextInfo] = None
+
+
 @dataclass
 class KeywordDetailsForUpdate:
     name: Optional[str] = None
@@ -1782,7 +1811,7 @@ class SpecificationDetailsForUpdate:
     reviewer: Optional[OptionalUser] = None
     locker: Optional[OptionalUser] = None
     priority: Optional[Priority] = None
-    dueDate: Optional[OptionalLocalDateTime] = None
+    dueDate: Optional[OptionalLocalDate] = None
     description: Optional[RichTextInfo] = None
     reviewComment: Optional[RichTextInfo] = None
 
@@ -1801,8 +1830,8 @@ class ProjectDetailsForUpdate:
     isVisibleToTester: Optional[bool] = None
     isTestingIntelligenceActive: Optional[bool] = None
     description: Optional[RichTextInfo] = None
-    startDate: Optional[OptionalLocalDateTime] = None
-    endDate: Optional[OptionalLocalDateTime] = None
+    startDate: Optional[OptionalLocalDate] = None
+    endDate: Optional[OptionalLocalDate] = None
     inspections: Optional[List[str]] = None
     variantsManagementEnabled: Optional[OperationalState] = None
 
@@ -1810,13 +1839,13 @@ class ProjectDetailsForUpdate:
 @dataclass
 class TOVForUpdate:
     name: Optional[str] = None
-    endDate: Optional[OptionalLocalDateTime] = None
+    endDate: Optional[OptionalLocalDate] = None
     visible: Optional[bool] = None
     description: Optional[RichTextInfo] = None
     isBaseTov: Optional[bool] = None
     status: Optional[ProjectStatus] = None
     testingIntelligence: Optional[bool] = None
-    startDate: Optional[OptionalLocalDateTime] = None
+    startDate: Optional[OptionalLocalDate] = None
     cloningVisibility: Optional[bool] = None
 
 
@@ -1824,6 +1853,7 @@ class TOVForUpdate:
 class TestCaseSetDetails:
     key: str
     numbering: str
+    path: str
     uniqueID: str
     name: str
     spec: TestCaseSetSpecificationSummary
@@ -1848,9 +1878,9 @@ class TestCaseDetails:
 @dataclass
 class CycleForUpdate:
     name: Optional[str] = None
-    endDate: Optional[OptionalLocalDateTime] = None
+    endDate: Optional[OptionalLocalDate] = None
     visible: Optional[bool] = None
     description: Optional[RichTextInfo] = None
     status: Optional[ProjectStatus] = None
     testingIntelligence: Optional[bool] = None
-    startDate: Optional[OptionalLocalDateTime] = None
+    startDate: Optional[OptionalLocalDate] = None

{testbench2robotframework-0.9.1a2 → testbench2robotframework-0.9.2a1}/testbench2robotframework/result_writer.py

@@ -160,6 +160,13 @@ class ResultWriter(ResultVisitor):
                 self._set_compound_keyword_execution_verdict(
                     keyword, itb_test_case.testSequence
                 )
+            textual_interactions = list(
+                self._get_interactions_by_type(itb_test_case.interactions, KeywordType.Textual)
+            )
+            for step in textual_interactions:
+                if step.exec is None:
+                    step.exec = KeywordCallExecution.from_dict({})
+                step.exec.verdict = KeywordVerdict.Skipped
             self._set_itb_testcase_execution_result(itb_test_case, self.test_chain)
             self._set_itb_testcase_execution_comment(itb_test_case, self.test_chain)
             self._set_itb_testcase_references(itb_test_case, self.test_chain)

{testbench2robotframework-0.9.1a2 → testbench2robotframework-0.9.2a1}/testbench2robotframework/testbench2rf.py

@@ -20,18 +20,22 @@ from robot.parsing.model.blocks import (
 from robot.parsing.model.statements import (
     Comment,
     EmptyLine,
-    KeywordCall as RFKeywordCall,
     LibraryImport,
     Metadata,
     ResourceImport,
     SectionHeader,
     Setup,
     Statement,
-    Tags as RFTags,
     Teardown,
     TestCaseName,
     VariablesImport,
 )
+from robot.parsing.model.statements import (
+    KeywordCall as RFKeywordCall,
+)
+from robot.parsing.model.statements import (
+    Tags as RFTags,
+)
 
 from testbench2robotframework.utils import robot_tag_from_udf
 
@@ -45,6 +49,8 @@ from .json_reader import TestCaseSet
 from .log import logger
 from .model import (
     KeywordCall as TBKeywordCall,
+)
+from .model import (
     KeywordDetails,
     KeywordType,
     ParameterEvaluationType,
@@ -825,21 +831,23 @@ class RobotSuiteFileBuilder:
         setting_section.body.extend(self._create_rf_resource_imports(subdivisions))
         setting_section.body.extend(self._create_rf_unknown_imports(subdivisions))
         setting_section_meta_data = self.test_case_set.metadata
-        for md_name, md_expression in self.config.metadata.items():
-            from .utils import safe_eval
-            md_expression = re.sub(r"\$tcs", "tcs", md_expression)
-            try:
-                setting_section_meta_data[md_name] = safe_eval(
-                    md_expression, {"tcs": self.test_case_set.details}
-                )
-            except ValueError as ve:
-                logger.warning(
-                    f"Value '{md_expression}' from the custom metadata setting could not be evaluated: {ve}"
-                )
-            except Exception as e:
-                logger.error(
-                    f"Error while evaluating the custom metadata setting '{md_expression}': {e}"
-                )
+        # for md_name, md_expression in self.config.metadata.items():
+        #     try:
+        #         md_expression = re.sub(r"\$tcs", "tcs", md_expression)
+        #         for match in re.finditer(r"(\{[^}]*\})", md_expression):
+        #             re.sub() = safe_eval(
+        #                 md_expression, {"tcs": self.test_case_set.details}
+        #             )
+        #             print(match.group(1))
+        #         setting_section_meta_data[md_name] = str(md_expression)
+        #     except ValueError as ve:
+        #         logger.warning(
+        #             f"Value '{md_expression}' from the custom metadata setting could not be evaluated: {ve}"
+        #         )
+        #     except Exception as e:
+        #         logger.error(
+        #             f"Error while evaluating the custom metadata setting '{md_expression}': {e}"
+        #         )
         setting_section.body.extend(
             [
                 create_meta_data(metadata_name, metadata_value)

{testbench2robotframework-0.9.1a2 → testbench2robotframework-0.9.2a1}/testbench2robotframework/utils.py

@@ -1,11 +1,9 @@
-import ast
 import re
 import shutil
 import sys
 from pathlib import Path, PurePath
 from typing import Optional
 from zipfile import ZipFile
-from .log import logger
 
 from testbench2robotframework.model import (
     RootNode,
@@ -18,6 +16,8 @@ from testbench2robotframework.model import (
     UserDefinedField,
 )
 
+from .log import logger
+
 
 def robot_tag_from_udf(udf: UserDefinedField) -> Optional[str]:
     if (udf.udfType == UDFType.Enumeration and udf.value) or (
@@ -88,7 +88,7 @@ class PathResolver:
             self.tt_catalog[tse.base.uniqueID] = tse
 
     def _file_prefix(self, tse) -> str:
-        prefix_separator = "_" * self._log_suite_numbers
+        prefix_separator = "_" * (not self._log_suite_numbers)
         return f"{self._get_padded_index(tse)}_{prefix_separator}"
 
     def _get_padded_index(self, tse) -> str:
@@ -97,55 +97,22 @@ class PathResolver:
         return index.zfill(max_length)
 
 
-def safe_eval(expr: str, names: dict):
-    tree = ast.parse(expr, mode="eval")
-    allowed_nodes = (
-        ast.Expression,
-        ast.Call,
-        ast.Attribute,
-        ast.Load,
-        ast.Name,
-        ast.ListComp,
-        ast.GeneratorExp,
-        ast.comprehension,
-        ast.List,
-        ast.Tuple,
-        ast.Constant,
-        ast.Subscript,
-        ast.JoinedStr,
-        ast.FormattedValue,
-        ast.BinOp,
-        ast.UnaryOp,
-        ast.Compare,
-        ast.BoolOp,
-        ast.Eq,
-        ast.NotEq,
-        ast.Gt,
-        ast.Lt,
-        ast.GtE,
-        ast.LtE,
-        ast.In,
-        ast.And,
-        ast.Or,
-        ast.Not,
-        ast.Add,
-        ast.Sub,
-        ast.Mult,
-        ast.Div,
-        ast.Mod,
-        ast.Store,
-        ast.keyword,
-    )
-    for node in ast.walk(tree):
-        if not isinstance(node, allowed_nodes):
-            raise ValueError(f"Disallowed expression: {type(node).__name__}")
-        if isinstance(node, ast.Attribute) and node.attr.startswith("_"):
-            raise ValueError(f"Access to private attribute {node.attr} is not allowed")
-        if isinstance(node, ast.Name) and node.id == "__import__":
-            raise ValueError("Use of __import__ is forbidden")
-
-    code = compile(tree, "<safe_eval>", "eval")
-    return eval(code, {"__builtins__": {}}, names)
+# def safe_eval(expr: str, names: dict):
+#     tree = ast.parse(expr, mode="eval")
+#     def resolve(node):
+#         if isinstance(node, ast.Name):
+#             if node.id not in names:
+#                 raise ValueError(f"Unknown name: {node.id}")
+#             return names[node.id]
+#         if isinstance(node, ast.Attribute):
+#             if node.attr.startswith("_"):
+#                 raise ValueError("Private attributes are forbidden")
+#             value = resolve(node.value)
+#             return getattr(value, node.attr)
+#         raise ValueError(f"Disallowed expression: {type(node).__name__}")
+#     if not isinstance(tree.body, (ast.Name, ast.Attribute)):
+#         raise ValueError("Only attribute access is allowed")
+#     return resolve(tree.body)
 
 
 def get_directory(json_report_path: Optional[str]) -> str: