Unit test for Union problem

Author: aaltat

src/robotlibcore.py

@@ -18,19 +18,17 @@
 examples see the project pages at
 https://github.com/robotframework/PythonLibCore
 """
-
 import inspect
 import os
+import typing
 
+from robot import version as robot_version
 from robot.utils import PY_VERSION
 
-try:
-    import typing
-except ImportError:
-    typing = None
 
 from robot.api.deco import keyword  # noqa F401
 
+RF32 = robot_version < '4.'
 
 __version__ = '2.2.2.dev1'
 
@@ -51,6 +49,8 @@ def add_library_components(self, library_components):
                 if callable(func) and hasattr(func, 'robot_name'):
                     kw = getattr(component, name)
                     kw_name = func.robot_name or name
+                    if kw_name == "keyword_optional_with_none":
+                        print(kw_name)
                     self.keywords[kw_name] = kw
                     self.keywords_spec[kw_name] = KeywordBuilder.build(kw)
                     # Expose keywords as attributes both using original
@@ -246,8 +246,10 @@ def _get_typing_hints(cls, function):
             # remove return and self statements
             if arg_with_hint not in all_args:
                 hints.pop(arg_with_hint)
-        default = cls._get_defaults(arg_spec)
-        return cls._remove_optional_none_type_hints(hints, default)
+        if RF32:
+            default = cls._get_defaults(arg_spec)
+            return cls._remove_optional_none_type_hints(hints, default)
+        return hints
 
     @classmethod
     def _args_as_list(cls, function, arg_spec):

utest/test_get_keyword_types.py

@@ -1,7 +1,18 @@
-from typing import List, Union
+import sys
+from os.path import dirname, abspath, join
 
 import pytest
+import typing
+
+from robotlibcore import RF32
+
+from typing import List, Union
 
+curdir = dirname(abspath(__file__))
+atest_dir = join(curdir, '..', 'atest')
+src = join(curdir, '..', 'src')
+sys.path.insert(0, src)
+sys.path.insert(0, atest_dir)
 from DynamicTypesAnnotationsLibrary import DynamicTypesAnnotationsLibrary
 from DynamicTypesAnnotationsLibrary import CustomObject
 from DynamicTypesLibrary import DynamicTypesLibrary
@@ -182,6 +193,15 @@ def test_keyword_with_decorator_arguments(lib_types):
     assert types == {'arg1': bool, 'arg2': bool}
 
 
-def test_keyword_optional_with_none_1(lib_types):
-    types = lib_types.get_keyword_types('keyword_optional_with_none')
-    assert types == {'arg': Union[str, type(None)]}
+@pytest.mark.skipif(RF32, reason='Only for RF4+')
+def test_keyword_optional_with_none_rf32(lib_types):
+    lib = DynamicTypesAnnotationsLibrary("111")
+    types = lib.get_keyword_types('keyword_optional_with_none')
+    assert types == {'arg': typing.Union[str, type(None)]}
+
+
+@pytest.mark.skipif(not RF32, reason='Only for RF3.2+')
+def test_keyword_optional_with_none_rf32(lib_types):
+    lib = DynamicTypesAnnotationsLibrary("111")
+    types = lib.get_keyword_types('keyword_optional_with_none')
+    assert types == {'arg': str}