Add tests to wrapper docorators and lamda

Author: aaltat

atest/DynamicTypesLibrary.py

@@ -1,3 +1,4 @@
+import functools
 import sys
 
 from robotlibcore import DynamicCore, keyword
@@ -7,6 +8,13 @@ def def_deco(func):
     return func
 
 
+def deco_wraps(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        return func(*args, **kwargs)
+    return wrapper
+
+
 class DynamicTypesLibrary(DynamicCore):
 
     def __init__(self, arg=False):
@@ -61,3 +69,9 @@ def is_python_3(self):
     @def_deco
     def keyword_with_def_deco(self):
         return 1
+
+    @deco_wraps
+    @keyword
+    @deco_wraps
+    def keyword_wrapped(self, number=1, arg=''):
+        return number, arg

src/robotlibcore.py

@@ -210,13 +210,13 @@ def get_keyword_source(self, keyword_name):
 
     def __get_keyword_line(self, method):
         try:
-            source, line_number = inspect.getsourcelines(method)
+            lines, line_number = inspect.getsourcelines(method)
         except (OSError, IOError, TypeError):
             return None
-        for line in source:
-            if line.strip().startswith('def'):
-                return line_number
-            line_number += 1
+        for increment, line in enumerate(lines):
+            if line.strip().startswith('def '):
+                return line_number + increment
+        return line_number
 
     def __get_keyword_path(self, method):
         try:

utest/test_get_keyword_source.py

@@ -2,9 +2,11 @@
 from os import path
 
 import pytest
+from mockito.matchers import Any
+
 from DynamicLibrary import DynamicLibrary
 from DynamicTypesLibrary import DynamicTypesLibrary
-from mockito.matchers import Any
+from robotlibcore import PY2
 
 
 @pytest.fixture(scope='module')
@@ -21,6 +23,7 @@ def lib_types():
 def cur_dir():
     return path.dirname(__file__)
 
+
 @pytest.fixture(scope='module')
 def lib_path(cur_dir):
     return path.normpath(path.join(cur_dir, '..', 'atest', 'DynamicLibrary.py'))
@@ -46,6 +49,12 @@ def test_location_in_class(lib, lib_path_components):
     assert source == '%s:15' % 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
+
+
 def test_location_in_class_custom_keyword_name(lib, lib_path_components):
     source = lib.get_keyword_source('Custom name')
     assert source == '%s:19' % lib_path_components
@@ -72,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:62' % lib_path_types
+    assert source == '%s:70' % lib_path_types
 
 
 def test_error_in_getfile(lib, when):
@@ -84,4 +93,4 @@ def test_error_in_getfile(lib, when):
 def test_error_in_line_number(lib, when, lib_path):
     when(inspect).getsourcelines(Any()).thenRaise(IOError('Some message'))
     source = lib.get_keyword_source('keyword_in_main')
-    assert source == lib_path
+    assert source == lib_path