Fixed atests

Author: aaltat

atest/DynamicTypesLibrary.py

@@ -53,6 +53,10 @@ 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))

atest/tests_types.robot

@@ -13,7 +13,7 @@ Keyword Default Argument As Abject None Default Value
 
 Keyword Default Argument As String None
     ${return} =    DynamicTypesLibrary.Keyword None    None
-    Should Match Regexp    ${return}    None: <(class|type) 'NoneType'>
+    Should Match Regexp    ${return}    None: <(class|type) '(unicode|str|NoneType)'>
 
 Keyword Default As Booleans With Defaults
     ${return}    DynamicTypesLibrary.Keyword Booleans
@@ -35,23 +35,18 @@ Keyword Annonations And Bool Defaults Using Default
 Keyword Annonations And Bool Defaults Defining All Arguments
     [Tags]    py3
     ${return} =    DynamicTypesAnnotationsLibrary.Keyword Default And Annotation    1    true
-    Should Match Regexp    ${return}    1: <(class|type) 'int'>, True: <(class|type) 'bool'>
+    Should Match Regexp    ${return}    1: <(class|type) 'int'>, true: <(class|type) 'str'>
 
 Keyword Annonations And Bool Defaults Defining All Arguments And With Number
     [Tags]    py3
     ${return} =    DynamicTypesAnnotationsLibrary.Keyword Default And Annotation    ${1}    true
-    Should Match Regexp    ${return}    1: <(class|type) 'int'>, True: <(class|type) 'bool'>
+    Should Match Regexp    ${return}    1: <(class|type) 'int'>, true: <(class|type) 'str'>
 
 Keyword Annonations And Robot Types Disbales Argument Conversion
     [Tags]    py3
     ${return} =    DynamicTypesAnnotationsLibrary.Keyword Robot Types Disabled And Annotations    111
     Should Match Regexp    ${return}    111: <(class|type) 'str'>
 
-Keyword Annonations And Robot Types Defined
-    [Tags]    py3
-    ${return} =    DynamicTypesAnnotationsLibrary.Keyword Robot Types And Bool Defaults    tidii    111
-    Should Match Regexp    ${return}    tidii: <(class|type) 'str'>, 111: <(class|type) 'str'>
-
 Keyword Annonations And Keyword Only Arguments
     [Tags]    py3
     ${return} =    DynamicTypesAnnotationsLibrary.Keyword Only Arguments    1    ${1}    some=222

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.pop('return', None)
+        types = self.__join_defaults_with_types(method, types)
         return types
 
     def __get_keyword(self, keyword_name):
@@ -137,6 +137,16 @@ def __get_keyword(self, keyword_name):
             raise ValueError('Keyword "%s" not found.' % keyword_name)
         return method
 
+    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):
+                types[name] = type(value)
+        for name, value in spec.kwonlydefaults:
+            if name not in types and isinstance(value, bool):
+                types[name] = type(value)
+        return types
+
     def __get_typing_hints(self, method):
         if PY2:
             return {}

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}
+    assert types == {'arg1': str, 'arg2': bool}
 
 
 def test_one_keyword_type_defined(lib):
@@ -188,7 +188,7 @@ def test_keyword_only_arguments_many_positional_and_default(lib_types):
 @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 == {}
+    assert types == {'value': bool}
 
 
 @pytest.mark.skipif(PY2, reason='Only applicable on Python 3')

utest/test_robotlibcore.py

@@ -41,6 +41,7 @@ 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',
@@ -75,6 +76,7 @@ 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',