Merge pull request #21 from eficode/feat/robotframework-4-support/pr

Support for robotframework 4.x

Author: Matej Cotman

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         python: [python38, python39]
-        rfVersion: [3.1.2, 3.2, 3.2.1, 3.2.2]
+        rfVersion: ['3.1.2', '3.2', '3.2.1', '3.2.2', '4.0', '4.0.1', '4.0.2', '4.0.3', '4.1']
     runs-on: windows-latest
     name: Windows (${{ matrix.python }}, robotframework-${{ matrix.rfVersion }})
     defaults:
@@ -62,7 +62,7 @@ jobs:
       fail-fast: false
       matrix:
         python: [python38, python39]
-        rfVersion: [3.1.2, 3.2, 3.2.1, 3.2.2]
+        rfVersion: ['3.1.2', '3.2', '3.2.1', '3.2.2', '4.0', '4.0.1', '4.0.2', '4.0.3', '4.1']
     runs-on: ubuntu-latest
     name: Linux (${{ matrix.python }}, robotframework-${{ matrix.rfVersion }})
     steps:
@@ -80,7 +80,7 @@ jobs:
       fail-fast: false
       matrix:
         python: [python38, python39]
-        rfVersion: [3.1.2, 3.2, 3.2.1, 3.2.2]
+        rfVersion: ['3.1.2', '3.2', '3.2.1', '3.2.2', '4.0', '4.0.1', '4.0.2', '4.0.3', '4.1']
     runs-on: macos-latest
     name: MacOS (${{ matrix.python }}, robotframework-${{ matrix.rfVersion }})
     steps:

src/oxygen/__init__.py

@@ -1,10 +1,6 @@
+from .version import VERSION
 from .base_handler import BaseHandler
 from .oxygen import listener, OxygenLibrary
-from .robot_interface import RobotInterface
-from .version import VERSION
 
-__all__ = ['BaseHandler', 'listener', 'OxygenLibrary', 'RobotInterface']
+__all__ = ['BaseHandler', 'listener', 'OxygenLibrary']
 __version__ = VERSION
-
-
-

src/oxygen/base_handler.py

@@ -1,6 +1,8 @@
 import re
 
-from .robot_interface import RobotInterface
+from .robot_interface import (RobotInterface, get_keywords_from,
+                              set_special_keyword)
+
 
 class BaseHandler(object):
     DEFAULT_CLI = {tuple(['resultfile']): {}}
@@ -43,7 +45,9 @@ def check_for_keyword(self, test, data):
 
         test: A Robot test
         '''
-        for curr, keyword in enumerate(test.keywords):
+        test_keywords = get_keywords_from(test)
+
+        for curr, keyword in enumerate(test_keywords):
             keyword_name = self._normalize_keyword_name(keyword.name)
             if not (keyword_name == self.keyword):
                 continue
@@ -52,8 +56,8 @@ def check_for_keyword(self, test, data):
             # ALL keywords, setup or not, preceding the trigger will be treated
             # as setup keywords later. Same goes for keywords succeeding the
             # trigger; they will become teardown keywords.
-            setup_keywords = test.keywords[:curr]
-            teardown_keywords = test.keywords[(curr+1):]
+            setup_keywords = test_keywords[:curr]
+            teardown_keywords = test_keywords[(curr+1):]
 
             self._report_oxygen_run(keyword, setup_keywords, teardown_keywords)
 
@@ -107,10 +111,10 @@ def _build_results(self, keyword, setup_keyword, teardown_keyword):
         self._set_suite_tags(result_suite, *(self._tags + list(test.tags)))
 
         if setup_keyword:
-            result_suite.keywords.append(setup_keyword)
+            set_special_keyword(result_suite, 'setup', setup_keyword)
 
         if teardown_keyword:
-            result_suite.keywords.append(teardown_keyword)
+            set_special_keyword(result_suite, 'teardown', teardown_keyword)
 
         self._inject_suite_report(test, result_suite)