Fixed code and utest

Author: aaltat

atest/DynamicTypesAnnotationsLibrary.py

@@ -55,7 +55,7 @@ def keyword_with_webdriver(self, arg: CustomObject):
         return arg
 
     @keyword
-    def keyword_default_and_annotation(self: 'DynamicTypesAnnotationsLibrary', arg1: int, arg2=False) -> str:
+    def keyword_default_and_annotation(self: 'DynamicTypesAnnotationsLibrary', arg1: int, arg2: Union[bool, str] = False) -> str:
         return '%s: %s, %s: %s' % (arg1, type(arg1), arg2, type(arg2))
 
     @keyword(types={'arg': str})
@@ -67,7 +67,7 @@ def keyword_robot_types_disabled_and_annotations(self, arg: int):
         return '%s: %s' % (arg, type(arg))
 
     @keyword(types={'arg1': str})
-    def keyword_robot_types_and_bool_defaults(self, arg1, arg2=False):
+    def keyword_robot_types_and_bool_hint(self, arg1, arg2: bool):
         return '%s: %s, %s: %s' % (arg1, type(arg1), arg2, type(arg2))
 
     @keyword
@@ -87,7 +87,9 @@ def keyword_only_arguments_no_vararg(self, *, other):
         return f'{other}: {type(other)}'
 
     @keyword
-    def keyword_only_arguments_many_positional_and_default(self: 'DynamicTypesAnnotationsLibrary', *varargs, one, two, three, four=True, five=None, six=False):
+    def keyword_only_arguments_many_positional_and_default(self: 'DynamicTypesAnnotationsLibrary', *varargs, one, two,
+                                                           three, four: Union[int, str] = 1, five=None,
+                                                           six: Union[bool, str] = False):
         return f'{varargs}, {one}, {two}, {three}, {four}, {five}, {six}'
 
     @keyword
@@ -99,7 +101,7 @@ def keyword_only_arguments_many(self, *varargs, some='value', other=None):
         return f'{some}: {type(some)}, {other}: {type(other)}, {varargs}: {type(varargs)}'
 
     @keyword
-    def keyword_mandatory_and_keyword_only_arguments(self, arg: int, *vararg, some=True):
+    def keyword_mandatory_and_keyword_only_arguments(self, arg: int, *vararg, some: bool):
         return f'{arg}, {vararg}, {some}'
 
     @keyword

atest/DynamicTypesLibrary.py

@@ -53,10 +53,6 @@ def keyword_default_types(self, arg=None):
     def keyword_many_default_types(self, arg1=1, arg2='Foobar'):
         return arg1, arg2
 
-    @keyword
-    def keyword_booleans(self, arg1=True, arg2=False):
-        return '%s: %s, %s: %s' % (arg1, type(arg1), arg2, type(arg2))
-
     @keyword
     def keyword_none(self, arg=None):
         return '%s: %s' % (arg, type(arg))

src/robotlibcore.py

@@ -124,7 +124,7 @@ def get_keyword_types(self, keyword_name):
             return types
         if not types:
             types = self.__get_typing_hints(method)
-        types = self.__join_defaults_with_types(method, types)
+        types.pop('return', None)
         return types
 
     def __get_keyword(self, keyword_name):
@@ -143,16 +143,6 @@ def __get_typing_hints(self, method):
         spec = ArgumentSpec.from_function(method)
         return spec.get_typing_hints()
 
-    def __join_defaults_with_types(self, method, types):
-        spec = ArgumentSpec.from_function(method)
-        for name, value in spec.defaults:
-            if name not in types and isinstance(value, (bool, type(None))):
-                types[name] = type(value)
-        for name, value in spec.kwonlydefaults:
-            if name not in types and isinstance(value, (bool, type(None))):
-                types[name] = type(value)
-        return types
-
     def get_keyword_source(self, keyword_name):
         method = self.__get_keyword(keyword_name)
         path = self.__get_keyword_path(method)

utest/test_get_keyword_source.py

@@ -52,7 +52,7 @@ def test_location_in_class(lib, lib_path_components):
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
 def test_decorator_wrapper(lib_types, lib_path_types):
     source = lib_types.get_keyword_source('keyword_wrapped')
-    assert source == '%s:76' % lib_path_types
+    assert source == '%s:72' % lib_path_types
 
 
 def test_location_in_class_custom_keyword_name(lib, lib_path_components):
@@ -81,7 +81,7 @@ def test_no_path_and_no_line_number(lib, when):
 
 def test_def_in_decorator(lib_types, lib_path_types):
     source = lib_types.get_keyword_source('keyword_with_def_deco')
-    assert source == '%s:70' % lib_path_types
+    assert source == '%s:66' % lib_path_types
 
 
 def test_error_in_getfile(lib, when):

utest/test_get_keyword_types.py

@@ -33,7 +33,7 @@ def test_types_disabled(lib):
 
 def test_keyword_types_and_bool_default(lib):
     types = lib.get_keyword_types('keyword_robot_types_and_bool_default')
-    assert types == {'arg1': str, 'arg2': bool}
+    assert types == {'arg1': str}
 
 
 def test_one_keyword_type_defined(lib):
@@ -51,14 +51,9 @@ def test_not_keyword(lib):
         lib.get_keyword_types('not_keyword')
 
 
-def test_keyword_booleans(lib):
-    types = lib.get_keyword_types('keyword_booleans')
-    assert types == {'arg1': bool, 'arg2': bool}
-
-
 def test_keyword_none(lib):
     types = lib.get_keyword_types('keyword_none')
-    assert types == {'arg': type(None)}
+    assert types == {}
 
 
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
@@ -79,11 +74,6 @@ def test_multiple_types(lib_types):
     assert types == {'arg': Union[List, None]}
 
 
-def test_keyword_with_default_type(lib):
-    types = lib.get_keyword_types('keyword_default_types')
-    assert types == {'arg': type(None)}
-
-
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
 def test_keyword_new_type(lib_types):
     types = lib_types.get_keyword_types('keyword_new_type')
@@ -123,7 +113,7 @@ def test_keyword_with_annotation_external_class(lib_types):
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
 def test_keyword_with_annotation_and_default(lib_types):
     types = lib_types.get_keyword_types('keyword_default_and_annotation')
-    assert types == {'arg1': int, 'arg2': bool}
+    assert types == {'arg1': int, 'arg2': Union[bool, str]}
 
 
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
@@ -140,13 +130,13 @@ def test_keyword_with_robot_types_disbaled_and_annotations(lib_types):
 
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
 def test_keyword_with_robot_types_and_bool_annotations(lib_types):
-    types = lib_types.get_keyword_types('keyword_robot_types_and_bool_defaults')
-    assert types == {'arg1': str, 'arg2': bool}
-
+    types = lib_types.get_keyword_types('keyword_robot_types_and_bool_hint')
+    assert types == {'arg1': str}
 
-def test_init_args(lib):
-    types = lib.get_keyword_types('__init__')
-    assert types == {'arg': bool}
+@pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
+def test_init_args(lib_types):
+    types = lib_types.get_keyword_types('__init__')
+    assert types == {'arg': str}
 
 
 def test_dummy_magic_method(lib):
@@ -180,7 +170,7 @@ def test_keyword_only_arguments(lib_types):
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
 def test_keyword_only_arguments_many(lib_types):
     types = lib_types.get_keyword_types('keyword_only_arguments_many')
-    assert types == {'other': type(None)}
+    assert types == {}
 
 
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
@@ -192,13 +182,13 @@ def test_keyword_mandatory_and_keyword_only_arguments(lib_types):
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
 def test_keyword_only_arguments_many_positional_and_default(lib_types):
     types = lib_types.get_keyword_types('keyword_only_arguments_many_positional_and_default')
-    assert types == {'four': bool, 'five': type(None), 'six': bool}
+    assert types == {'four': Union[int, str], 'six': Union[bool, str]}
 
 
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')
 def test_keyword_all_args(lib_types):
     types = lib_types.get_keyword_types('keyword_all_args')
-    assert types == {'value': bool}
+    assert types == {}
 
 
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')

utest/test_robotlibcore.py

@@ -41,7 +41,6 @@ def test_dir():
                 '_DynamicCore__get_keyword_line',
                 '_DynamicCore__get_keyword_path',
                 '_DynamicCore__get_typing_hints',
-                '_DynamicCore__join_defaults_with_types',
                 '_HybridCore__get_members',
                 '_HybridCore__get_members_from_instance',
                 '_custom_name',
@@ -76,7 +75,6 @@ def test_dir():
                                                  '_DynamicCore__get_keyword',
                                                  '_DynamicCore__get_keyword_line',
                                                  '_DynamicCore__get_keyword_path',
-                                                 '_DynamicCore__join_defaults_with_types',
                                                  'get_keyword_arguments',
                                                  'get_keyword_documentation',
                                                  'get_keyword_source',