Cleanup and fixes to @Keyword support (issue #35, PR #37)

- Dont' require keywords to always have `robot_tags`.
- Minor cleanup elsewhere in code.
- Test enhancements. Tags not really tested yet.

Author: pekkaklarck

src/robotremoteserver.py

@@ -194,14 +194,13 @@ def __init__(self, library):
 
     def get_keyword_names(self):
         names = []
-        for name, value in inspect.getmembers(self._library):
-            if is_function_or_method(value):
-                if getattr(value, 'robot_name', None) not in (None, ''):
-                    names.append(value.robot_name)
-                    self._robot_name_index[value.robot_name] = name
-                else:
-                    if name[0] != '_':
-                        names.append(name)
+        for name, kw in inspect.getmembers(self._library):
+            if is_function_or_method(kw):
+                if getattr(kw, 'robot_name', None):
+                    names.append(kw.robot_name)
+                    self._robot_name_index[kw.robot_name] = name
+                elif name[0] != '_':
+                    names.append(name)
         return names
 
     def run_keyword(self, name, args, kwargs=None):
@@ -240,7 +239,7 @@ def get_keyword_documentation(self, name):
             return ''
         keyword = self._get_keyword(name)
         doc = inspect.getdoc(keyword) or ''
-        if len(getattr(keyword, 'robot_tags')):
+        if getattr(keyword, 'robot_tags', []):
             doc += "\nTags: %s\n" % ', '.join(keyword.robot_tags)
         return doc
 

test/atest/keyword_decorator.robot

@@ -1,14 +1,21 @@
 *** Settings ***
 Resource          resource.robot
-Suite Setup       Start And Import Remote Library    keyword_decorator.py
+Suite Setup       Start And Import Remote Library    KeywordDecorator.py
 Suite Teardown    Stop Remote Library
 
 *** Test Cases ***
-Keyword with 2 arguments
-    Add 7 Copies Of Coffee To Cart
+Custom name
+    [Documentation]    FAIL Keyword 'Remote.Custom Name' expected 1 argument, got 3.
+    Custom name    arg
+    Custom name    too    many    args
 
-When embedded name is empty keyword is still callable
-    Embedded name empty
+Embedded arguments
+    Result of 1 + 2 should be 3
+    Result of (1+2) * 3 should be 9
 
-Tags added with keyword decorator
-    login  admin
+No custom name
+    Just marker
+
+Tags
+    Tags
+    Tags with doc (and custom name)

test/libs/KeywordDecorator.py

@@ -0,0 +1,31 @@
+from robot.api.deco import keyword
+
+
+class KeywordDecorator(object):
+
+    @keyword('Custom name')
+    def _this_name_doesnt_matter(self, arg):
+        assert arg == 'arg'
+
+    @keyword('Result of ${expression} should be ${result:\d+}')
+    def calculate(self, expression, expected):
+        assert eval(expression) == int(expected)
+
+    @keyword
+    def just_marker(self):
+        pass
+
+    @keyword(tags=['tag1', 'tag2'])
+    def tags(self):
+        pass
+
+    @keyword('Tags with doc (and custom name)', ['tag1'])
+    def tags_(self):
+        """Keyword documentation."""
+
+
+if __name__ == '__main__':
+    import sys
+    from robotremoteserver import RobotRemoteServer
+
+    RobotRemoteServer(KeywordDecorator(), '127.0.0.1', *sys.argv[1:])