testbench2robotframework 0.9.0a1__tar.gz → 0.9.1a2__tar.gz

{testbench2robotframework-0.9.0a1 → testbench2robotframework-0.9.1a2}/.gitignore

@@ -164,4 +164,5 @@ robot.toml
 cli-export-config.json
 cli-import-config.json
 robot_tests/
-reports/
+reports/
+.github/

{testbench2robotframework-0.9.0a1 → testbench2robotframework-0.9.1a2}/ExampleConfiguration/json_config.json

@@ -1,6 +1,6 @@
 {
   "library-root": [
-    "Interactions",
+    "Keywords",
     "RF-Library"
   ],
   "resource-root": [
@@ -11,7 +11,7 @@
   "log-suite-numbering": true,
   "resource-directory": "{root}/Resources",
   "clean": true,
-  "compound-interaction-logging": "GROUP",
+  "compound-keyword-logging": "GROUP",
   "library-mapping": {
       "SeleniumLibrary": "SeleniumLibrary    timeout=10    implicit_wait=1    run_on_failure=Capture Page Screenshot",
       "SuperRemoteLibrary": "Remote    http://127.0.0.1:8270       WITH NAME    SuperRemoteLibrary"

{testbench2robotframework-0.9.0a1 → testbench2robotframework-0.9.1a2}/ExampleConfiguration/pyproject_example.toml

@@ -7,7 +7,7 @@ fully-qualified = false
 output-directory = "{root}/Generated"
 log-suite-numbering = false
 clean = true
-compound-interaction-logging = true
+compound-keyword-logging = true
 resource-directory = "{root}/Resources"
 testcase-split-regex = ".*StopWithRestart.*"
 phase-pattern = "{testcase} : Phase {index}/{length}"

{testbench2robotframework-0.9.0a1 → testbench2robotframework-0.9.1a2}/ExampleConfiguration/toml_config.toml

@@ -7,7 +7,7 @@ fully-qualified = false
 output-directory = "{root}/Generated"
 log-suite-numbering = false
 clean = true
-compound-interaction-logging = true
+compound-keyword-logging = true
 resource-directory = "{root}/Resources"
 testcase-split-regex = ".*StopWithRestart.*"
 phase-pattern = "{testcase} : Phase {index}/{length}"

testbench2robotframework-0.9.1a2/PKG-INFO

@@ -0,0 +1,158 @@
+Metadata-Version: 2.4
+Name: testbench2robotframework
+Version: 0.9.1a2
+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
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: click >= 8.0
+Requires-Dist: robotframework >= 5.0
+Requires-Dist: tomli; python_version < '3.11'
+Requires-Dist: build ; extra == "dev"
+Requires-Dist: check-manifest ; extra == "dev"
+Requires-Dist: flit ; extra == "dev"
+Requires-Dist: invoke ; extra == "dev"
+Requires-Dist: mypy ; extra == "dev"
+Requires-Dist: pylint ; extra == "dev"
+Requires-Dist: pytest ; extra == "dev"
+Requires-Dist: pytest-cov ; extra == "dev"
+Requires-Dist: pytest-spec ; extra == "dev"
+Requires-Dist: robotframework-tidy ; extra == "dev"
+Requires-Dist: ruff ; extra == "dev"
+Requires-Dist: twine ; extra == "dev"
+Project-URL: Repository, https://github.com/imbus/testbench2robotframework
+Provides-Extra: dev
+
+# TestBench2RobotFramework
+
+**TestBench2RobotFramework** is a CLI tool used to convert a TestBench JSON report into Robot Framework test suites and to write the execution results provided by Robot Framework to the TestBench report.
+
+## Installation
+
+You can install TestBench2RobotFramework via pip using the following command:
+
+```powershell
+pip install testbench2robotframework
+```
+
+Python 3.10 or higher is required to run this tool.
+
+## Remark
+TestBench2RobotFramework requires TestBench version >= 4. If you're running an older version please contact the TestBench support for information on how to connect your Version of TestBench to Robot Framework. The TestBench Report can be either be exported via the TestBench Rest API with tools like the testbench-cli-reporter or directly from the client.
+
+## Usage
+
+TestBench2RobotFramework supports two main use cases, which are described in more detail in the following sections:
+
+1. Generating Robot Framework test suites from a TestBench report.
+2. Fetching results from a Robot Framework output XML file and saving them back to a TestBench report.
+
+### Generating Robot Framework Test Suites
+To generate Robot Framework test suites, use the `generate-tests` subcommand:
+
+```powershell
+testbench2robotframework generate-tests TESTBENCH_REPORT
+```
+
+This command generates a Robot Framework test suite for each test case set specified in the `TESTBENCH_REPORT`.
+
+![](./images/testthemen.PNG)  
+![](./images/generated.PNG)
+
+The example above demonstrates how Robot Framework test suites are generated based on the *Test Theme Tree* defined in TestBench.
+
+
+
+#### Configuration
+
+There are multiple configuration options available for **TestBench2RobotFramework** that can be used to customize the generated test suites. Options can be specified either via the command line, in a `pyproject.toml` file or in a `robot.toml` file.
+
+To use options via the command line, the following syntax is used:
+
+```powershell
+testbench2robotframework generate-tests [OPTIONS] TESTBENCH_REPORT
+```
+
+| Option | Description |
+|--------|-------------|
+| `-c`, `--config PATH` | Path to a configuration file for TestBench2RobotFramework. |
+| `--clean` | Deletes all files present in the output-directory before new test suites are created. |
+| `-d`, `--output-directory PATH` | Directory or ZIP archive containing the generated test suites. |
+| `--compound-keyword-logging` | Mode for logging compound keywords. Options: `GROUP`, `COMMENT`, or `NONE`. |
+| `--fully-qualified` | Calls Robot Framework keywords by their fully qualified names in the generated test suites. |
+| `--log-suite-numbering` | Enables logging of the test suite numbering. |
+| `--metadata` | Add extra metadata to the settings of the generated Robot Framework test suite. Provide entries as key:value pairs, where *key* is the metadata name and *value* is the corresponding value. Values may also be Python expressions. The special variable '$tcs' gives access to the TestBench Python model of the test case set. |
+| `--resource-directory PATH` | Directory containing the Robot Framework resource files. |
+| `--resource-directory-regex TEXT` | Regex that can be used to identify the TestBench Subdivision that corresponds to the <resource-directory>. Resources will be imported relative to this subdivision based on the test elements structure in TestBench. |
+| `--library-regex TEXT` | Regular expression used to identify TestBench subdivisions corresponding to Robot Framework libraries. |
+| `--library-root TEXT` | TestBench root subdivision whose direct children correspond to Robot Framework libraries. |
+| `--resource-regex TEXT` | Regular expression used to identify TestBench subdivisions corresponding to Robot Framework resources. |
+| `--resource-root TEXT` | TestBench root subdivision whose direct children correspond to Robot Framework resources. |
+| `--library-mapping TEXT` | Library import statement to use when a keyword from the specified TestBench subdivision is encountered. |
+| `--resource-mapping TEXT` | Resource import statement to use when a keyword from the specified TestBench subdivision is encountered. |
+| `--help` | Displays the help message and exits. |
+| `--version` | Writes the TestBench2RobotFramework, Robot Framework and Python version to console. |
+
+
+### Saving Robot Framework Results
+
+Saving the results requires a Robot Framework output XML file, along with the original TestBench report from which the test suites were generated.
+
+Use the following command:
+
+```powershell
+testbench2robotframework fetch-results [OPTIONS] ROBOT_RESULT TESTBENCH_REPORT
+```
+
+| Option | Description |
+|--------|-------------|
+| `-c`, `--config PATH` | Path to a configuration file for TestBench2RobotFramework. |
+| `-d`, `--output-directory PATH` | Path to the directory or ZIP file where the updated TestBench JSON report (with results) should be saved. |
+| `--help` | Displays the help message and exits. |
+
+
+
+### Using pyproject.toml
+All CLI options available for ``testbench2robotframework`` can also be defined in your ``pyproject.toml`` file, ``robot.toml``, or a workspace-local ``.robot.toml``. This offers a convenient way to store and reuse configuration settings, particularly in larger projects or automated environments.
+
+#### Example
+```toml
+[tool.testbench2robotframework]
+library-regex = ['(?:.*\.)?(?P<resourceName>[^.]+?)\s*\[Robot-Library\].*']
+resource-regex = ['(?:.*\.)?(?P<resourceName>[^.]+?)\s*\[Robot-Resource\].*']
+library-root = ["RF", "RF-Library"]
+resource-root = ["RF-Resource"]
+fully-qualified = false
+output-directory = "{root}/Generated"
+log-suite-numbering = false
+clean = true
+compound-keyword-logging = GROUP
+resource-directory = "{root}/Resources"
+resource-directory-regex = ".*\\[Robot-Resources\\].*"
+reference-behaviour = "ATTACHMENT"
+attachment-conflict-behaviour = "USE_EXISTING"
+
+[tool.testbench2robotframework.library-mapping]
+SeleniumLibrary = "SeleniumLibrary    timeout=10    implicit_wait=1    run_on_failure=Capture Page Screenshot"
+SuperRemoteLibrary = "Remote    http://127.0.0.1:8270       WITH NAME    SuperRemoteLibrary"
+
+[tool.testbench2robotframework.resource-mapping]
+MyKeywords = "{root}/../MyKeywords.resource"
+MyOtherKeywords = "{resourceDirectory}/subdir/MyOtherKeywords.resource"
+
+[tool.testbench2robotframework.forced-import]
+libraries = ["test.py"]
+resources = []
+variables = []
+
+[tool.testbench2robotframework.console-logging]
+logLevel = "INFO"
+logFormat = "%(levelname)s: %(message)s"
+
+[tool.testbench2robotframework.file-logging]
+logLevel = "DEBUG"
+logFormat = "%(asctime)s - %(filename)s:%(lineno)d - %(levelname)8s - %(message)s"
+fileName = "testbench2robotframework.log"
+```
+

testbench2robotframework-0.9.1a2/README.md

@@ -0,0 +1,131 @@
+# TestBench2RobotFramework
+
+**TestBench2RobotFramework** is a CLI tool used to convert a TestBench JSON report into Robot Framework test suites and to write the execution results provided by Robot Framework to the TestBench report.
+
+## Installation
+
+You can install TestBench2RobotFramework via pip using the following command:
+
+```powershell
+pip install testbench2robotframework
+```
+
+Python 3.10 or higher is required to run this tool.
+
+## Remark
+TestBench2RobotFramework requires TestBench version >= 4. If you're running an older version please contact the TestBench support for information on how to connect your Version of TestBench to Robot Framework. The TestBench Report can be either be exported via the TestBench Rest API with tools like the testbench-cli-reporter or directly from the client.
+
+## Usage
+
+TestBench2RobotFramework supports two main use cases, which are described in more detail in the following sections:
+
+1. Generating Robot Framework test suites from a TestBench report.
+2. Fetching results from a Robot Framework output XML file and saving them back to a TestBench report.
+
+### Generating Robot Framework Test Suites
+To generate Robot Framework test suites, use the `generate-tests` subcommand:
+
+```powershell
+testbench2robotframework generate-tests TESTBENCH_REPORT
+```
+
+This command generates a Robot Framework test suite for each test case set specified in the `TESTBENCH_REPORT`.
+
+![](./images/testthemen.PNG)  
+![](./images/generated.PNG)
+
+The example above demonstrates how Robot Framework test suites are generated based on the *Test Theme Tree* defined in TestBench.
+
+
+
+#### Configuration
+
+There are multiple configuration options available for **TestBench2RobotFramework** that can be used to customize the generated test suites. Options can be specified either via the command line, in a `pyproject.toml` file or in a `robot.toml` file.
+
+To use options via the command line, the following syntax is used:
+
+```powershell
+testbench2robotframework generate-tests [OPTIONS] TESTBENCH_REPORT
+```
+
+| Option | Description |
+|--------|-------------|
+| `-c`, `--config PATH` | Path to a configuration file for TestBench2RobotFramework. |
+| `--clean` | Deletes all files present in the output-directory before new test suites are created. |
+| `-d`, `--output-directory PATH` | Directory or ZIP archive containing the generated test suites. |
+| `--compound-keyword-logging` | Mode for logging compound keywords. Options: `GROUP`, `COMMENT`, or `NONE`. |
+| `--fully-qualified` | Calls Robot Framework keywords by their fully qualified names in the generated test suites. |
+| `--log-suite-numbering` | Enables logging of the test suite numbering. |
+| `--metadata` | Add extra metadata to the settings of the generated Robot Framework test suite. Provide entries as key:value pairs, where *key* is the metadata name and *value* is the corresponding value. Values may also be Python expressions. The special variable '$tcs' gives access to the TestBench Python model of the test case set. |
+| `--resource-directory PATH` | Directory containing the Robot Framework resource files. |
+| `--resource-directory-regex TEXT` | Regex that can be used to identify the TestBench Subdivision that corresponds to the <resource-directory>. Resources will be imported relative to this subdivision based on the test elements structure in TestBench. |
+| `--library-regex TEXT` | Regular expression used to identify TestBench subdivisions corresponding to Robot Framework libraries. |
+| `--library-root TEXT` | TestBench root subdivision whose direct children correspond to Robot Framework libraries. |
+| `--resource-regex TEXT` | Regular expression used to identify TestBench subdivisions corresponding to Robot Framework resources. |
+| `--resource-root TEXT` | TestBench root subdivision whose direct children correspond to Robot Framework resources. |
+| `--library-mapping TEXT` | Library import statement to use when a keyword from the specified TestBench subdivision is encountered. |
+| `--resource-mapping TEXT` | Resource import statement to use when a keyword from the specified TestBench subdivision is encountered. |
+| `--help` | Displays the help message and exits. |
+| `--version` | Writes the TestBench2RobotFramework, Robot Framework and Python version to console. |
+
+
+### Saving Robot Framework Results
+
+Saving the results requires a Robot Framework output XML file, along with the original TestBench report from which the test suites were generated.
+
+Use the following command:
+
+```powershell
+testbench2robotframework fetch-results [OPTIONS] ROBOT_RESULT TESTBENCH_REPORT
+```
+
+| Option | Description |
+|--------|-------------|
+| `-c`, `--config PATH` | Path to a configuration file for TestBench2RobotFramework. |
+| `-d`, `--output-directory PATH` | Path to the directory or ZIP file where the updated TestBench JSON report (with results) should be saved. |
+| `--help` | Displays the help message and exits. |
+
+
+
+### Using pyproject.toml
+All CLI options available for ``testbench2robotframework`` can also be defined in your ``pyproject.toml`` file, ``robot.toml``, or a workspace-local ``.robot.toml``. This offers a convenient way to store and reuse configuration settings, particularly in larger projects or automated environments.
+
+#### Example
+```toml
+[tool.testbench2robotframework]
+library-regex = ['(?:.*\.)?(?P<resourceName>[^.]+?)\s*\[Robot-Library\].*']
+resource-regex = ['(?:.*\.)?(?P<resourceName>[^.]+?)\s*\[Robot-Resource\].*']
+library-root = ["RF", "RF-Library"]
+resource-root = ["RF-Resource"]
+fully-qualified = false
+output-directory = "{root}/Generated"
+log-suite-numbering = false
+clean = true
+compound-keyword-logging = GROUP
+resource-directory = "{root}/Resources"
+resource-directory-regex = ".*\\[Robot-Resources\\].*"
+reference-behaviour = "ATTACHMENT"
+attachment-conflict-behaviour = "USE_EXISTING"
+
+[tool.testbench2robotframework.library-mapping]
+SeleniumLibrary = "SeleniumLibrary    timeout=10    implicit_wait=1    run_on_failure=Capture Page Screenshot"
+SuperRemoteLibrary = "Remote    http://127.0.0.1:8270       WITH NAME    SuperRemoteLibrary"
+
+[tool.testbench2robotframework.resource-mapping]
+MyKeywords = "{root}/../MyKeywords.resource"
+MyOtherKeywords = "{resourceDirectory}/subdir/MyOtherKeywords.resource"
+
+[tool.testbench2robotframework.forced-import]
+libraries = ["test.py"]
+resources = []
+variables = []
+
+[tool.testbench2robotframework.console-logging]
+logLevel = "INFO"
+logFormat = "%(levelname)s: %(message)s"
+
+[tool.testbench2robotframework.file-logging]
+logLevel = "DEBUG"
+logFormat = "%(asctime)s - %(filename)s:%(lineno)d - %(levelname)8s - %(message)s"
+fileName = "testbench2robotframework.log"
+```

{testbench2robotframework-0.9.0a1 → testbench2robotframework-0.9.1a2}/atest/robot/libs/json_config.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 data = {
     # "rfLibraryRoots": [
-    #     "Interactions",
+    #     "Keywords",
     #     "RF-Library"
     # ],
     # "rfResourceRoots": [
@@ -15,7 +15,7 @@ data = {
     # "logSuiteNumbering": True,
     # "resourceDirectory": "{root}/Resources",
     # "clearGenerationDirectory": True,
-    # "logCompoundInteractions": True,
+    # "logCompoundKeywords": True,
     # "subdivisionsMapping": {
     #     "libraries": {
     #         "SeleniumLibrary": "SeleniumLibrary    timeout=10    implicit_wait=1    run_on_failure=Capture Page Screenshot",

{testbench2robotframework-0.9.0a1 → testbench2robotframework-0.9.1a2}/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.0a1"
+__version__ = "0.9.1a2"

{testbench2robotframework-0.9.0a1 → testbench2robotframework-0.9.1a2}/testbench2robotframework/cli.py

@@ -85,9 +85,9 @@ def testbench2robotframework_cli():
     help="Directory or ZIP archive containing the generated test suites.",
 )
 @click.option(
-    "--compound-interaction-logging",
+    "--compound-keyword-logging",
     type=click.Choice(["GROUP", "COMMENT", "NONE"], case_sensitive=False),
-    help="Mode for logging compound interactions.",
+    help="Mode for logging compound keywords.",
 )
 @click.option(
     "--log-suite-numbering", is_flag=True, help="Enables logging of the test suite numbering."
@@ -159,7 +159,7 @@ def testbench2robotframework_cli():
 @click.argument("testbench-report", type=click.Path(path_type=Path))
 def generate_tests(  # noqa: PLR0913
     clean: bool,
-    compound_interaction_logging: str,
+    compound_keyword_logging: str,
     config: Path,
     fully_qualified: bool,
     library_regex: tuple[str],
@@ -198,8 +198,8 @@ def generate_tests(  # noqa: PLR0913
     else:
         configuration["log-suite-numbering"] = configuration.get("log-suite-numbering", False)
     configuration["metadata"] = metadata or configuration.get("metadata", {})
-    configuration["compound-interaction-logging"] = (
-        compound_interaction_logging or configuration.get("compound-interaction-logging", "GROUP")
+    configuration["compound-keyword-logging"] = (
+        compound_keyword_logging or configuration.get("compound-keyword-logging", "GROUP")
     )
     configuration["resource-directory"] = (
         resource_directory.as_posix()

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

@@ -163,7 +163,7 @@ class LoggingConfig:
         )
 
 
-class CompoundInteractionLogging(StrEnum):
+class CompoundKeywordLogging(StrEnum):
     GROUP = "GROUP"
     COMMENT = "COMMENT"
     NONE = "NONE"
@@ -186,7 +186,7 @@ class AttachmentConflictBehaviour(StrEnum):
 class Configuration:
     attachmentConflictBehaviour: AttachmentConflictBehaviour
     clean: bool
-    compound_interaction_logging: CompoundInteractionLogging
+    compound_keyword_logging: CompoundKeywordLogging
     forced_import: ForcedImport
     fully_qualified: bool
     library_regex: list[str]
@@ -229,7 +229,7 @@ class Configuration:
                 }
             ),
             metadata=dictionary.get("metadata", {}),
-            compound_interaction_logging=CompoundInteractionLogging(dictionary.get("compound-interaction-logging", "GROUP").upper()),
+            compound_keyword_logging=CompoundKeywordLogging(dictionary.get("compound-keyword-logging", "GROUP").upper()),
             resource_directory=dictionary.get("resource-directory", "").replace(
                 "\\", "/"
             ),

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

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  openapi.yml
-#   timestamp: 2025-11-07T10:20:17+00:00
+#   timestamp: 2025-11-24T08:45:38+00:00
 
 from __future__ import annotations
 
@@ -118,7 +118,7 @@ class VerdictStatus(Enum):
     Pass = 'Pass'
 
 
-class InteractionVerdict(Enum):
+class KeywordVerdict(Enum):
     Pass = 'Pass'
     Fail = 'Fail'
     Skipped = 'Skipped'
@@ -134,12 +134,12 @@ class SequencePhase(Enum):
     Teardown = 'Teardown'
 
 
-class InteractionCallType(Enum):
+class KeywordCallType(Enum):
     Flow = 'Flow'
     Check = 'Check'
 
 
-class InteractionType(Enum):
+class KeywordType(Enum):
     Atomic = 'Atomic'
     Compound = 'Compound'
     Textual = 'Textual'
@@ -615,7 +615,7 @@ class UDFEnumerationValue:
 
 
 @dataclass
-class Keyword:
+class Tag:
     key: str
     name: str
     isVariantsMarker: bool
@@ -735,7 +735,7 @@ class TestCaseSetSpecificationSummary:
     preConditions: List[ConditionSummary]
     postConditions: List[ConditionSummary]
     udfs: List[UserDefinedField]
-    keywords: List[Keyword]
+    tags: List[Tag]
     references: List[str]
     requirements: List[RequirementReference]
     responsible: Optional[UserReference] = None
@@ -748,7 +748,7 @@ class TestCaseSpecificationDetails:
     key: str
     comments: str
     udfs: List[UserDefinedField]
-    keywords: List[Keyword]
+    tags: List[Tag]
     requirements: List[RequirementReference]
     version: Optional[str] = None
 
@@ -761,7 +761,7 @@ class TestThemeSpecification:
     status: SpecStatus
     priority: Priority
     udfs: List[UserDefinedField]
-    keywords: List[Keyword]
+    tags: List[Tag]
     requirements: List[RequirementReference]
     references: List[str]
     dueDate: Optional[str] = None
@@ -774,7 +774,7 @@ class TestCaseSetExecutionSummary:
     key: str
     comments: str
     udfs: List[UserDefinedField]
-    keywords: List[Keyword]
+    tags: List[Tag]
 
 
 @dataclass
@@ -815,7 +815,7 @@ class TestCaseExecutionDetails:
     comments: str
     defects: List[str]
     udfs: List[UserDefinedField]
-    keywords: List[Keyword]
+    tags: List[Tag]
     references: List[str]
     version: Optional[str] = None
     tester: Optional[UserReference] = None
@@ -1116,7 +1116,7 @@ class TestThemeExecution:
     execStatus: ExecStatus
     verdict: VerdictStatus
     udfs: List[UserDefinedField]
-    keywords: List[Keyword]
+    tags: List[Tag]
     references: List[str]
     comments: Optional[str] = None
     responsible: Optional[UserReference] = None
@@ -1332,8 +1332,8 @@ class TestCaseSetExecutionForImport:
 
 
 @dataclass
-class InteractionCallExecution:
-    verdict: InteractionVerdict
+class KeywordCallExecution:
+    verdict: KeywordVerdict
     duration: int
     currentUser: UserReference
     comments: str
@@ -1404,7 +1404,7 @@ class DefaultValue:
 
 
 @dataclass
-class InteractionParameterForInsert:
+class KeywordParameterForInsert:
     name: str
     dataTypeKey: Optional[str] = None
     evaluationType: Optional[ParameterEvaluationType] = None
@@ -1646,12 +1646,12 @@ class ImageInfo:
 
 
 @dataclass
-class InteractionDetails:
+class KeywordDetails:
     key: str
     name: str
     uniqueID: str
     status: TestElementStatus
-    defaultCallType: InteractionCallType
+    defaultCallType: KeywordCallType
     description: str
     path: str
     parameters: List[ParameterDetails]
@@ -1734,44 +1734,44 @@ class RichTextInfo:
 
 
 @dataclass
-class InteractionCallSpecification:
+class KeywordCallSpecification:
     key: str
     name: str
     sequencePhase: SequencePhase
-    callType: InteractionCallType
+    callType: KeywordCallType
     comments: str
     callParameters: List[ParameterSummary]
-    interactionType: Optional[InteractionType] = None
+    keywordType: Optional[KeywordType] = None
     description: Optional[str] = None
-    interactionKey: Optional[str] = None
-    callingInteractionKey: Optional[str] = None
+    keywordKey: Optional[str] = None
+    callingKeywordKey: Optional[str] = None
 
 
 @dataclass
-class InteractionCall:
+class KeywordCall:
     sequenceID: str
     numbering: str
-    spec: InteractionCallSpecification
+    spec: KeywordCallSpecification
     parentID: Optional[str] = None
-    exec: Optional[InteractionCallExecution] = None
+    exec: Optional[KeywordCallExecution] = None
 
 
 @dataclass
-class InteractionForInsert:
+class KeywordForInsert:
     parentKey: str
     name: str
-    parameters: List[InteractionParameterForInsert]
+    parameters: List[KeywordParameterForInsert]
     uid: Optional[str] = None
     description: Optional[RichTextInfo] = None
     advancedContent: Optional[AdvancedContent] = None
-    callType: Optional[InteractionCallType] = None
+    callType: Optional[KeywordCallType] = None
 
 
 @dataclass
-class InteractionDetailsForUpdate:
+class KeywordDetailsForUpdate:
     name: Optional[str] = None
     description: Optional[RichTextInfo] = None
-    callType: Optional[InteractionCallType] = None
+    callType: Optional[KeywordCallType] = None
     locker: Optional[OptionalUser] = None
     advancedContent: Optional[OptionalAdvancedContent] = None
 
@@ -1828,9 +1828,9 @@ class TestCaseSetDetails:
     name: str
     spec: TestCaseSetSpecificationSummary
     testCases: List[TestCaseSummary]
-    testSequence: List[InteractionCall]
+    testSequence: List[KeywordCall]
     parameters: List[ParameterDetails]
-    interactions: List[InteractionDetails]
+    keywords: List[KeywordDetails]
     exec: Optional[TestCaseSetExecutionSummary] = None
 
 
@@ -1838,9 +1838,9 @@ class TestCaseSetDetails:
 class TestCaseDetails:
     uniqueID: str
     spec: TestCaseSpecificationDetails
-    testSequence: List[InteractionCall]
+    testSequence: List[KeywordCall]
     parameters: List[ParameterSummary]
-    interactions: List[InteractionDetails]
+    keywords: List[KeywordDetails]
     exec: Optional[TestCaseExecutionDetails] = None
     origin: Optional[TestCaseDetailsOrigin] = None