Support defining keywords in main lib

Author: pekkaklarck

atest/DynamicLibrary.py

@@ -1,4 +1,4 @@
-from robotlibcore import DynamicCore
+from robotlibcore import DynamicCore, keyword
 
 import librarycomponents
 
@@ -15,3 +15,10 @@ def __init__(self, arg=None):
                       librarycomponents.DocsAndTags()]
         DynamicCore.__init__(self, components)
         self.instance_attribute = 'not keyword'
+
+    @keyword
+    def keyword_in_main(self):
+        pass
+
+    def not_keyword_in_main(self):
+        pass

atest/HybridLibrary.py

@@ -1,4 +1,4 @@
-from robotlibcore import HybridCore
+from robotlibcore import HybridCore, keyword
 
 import librarycomponents
 
@@ -14,3 +14,10 @@ def __init__(self):
                       librarycomponents.DocsAndTags()]
         HybridCore.__init__(self, components)
         self.instance_attribute = 'not keyword'
+
+    @keyword
+    def keyword_in_main(self):
+        pass
+
+    def not_keyword_in_main(self):
+        pass

atest/librarycomponents.py

@@ -22,6 +22,10 @@ def _whatever(self):
     def not_keyword(self):
         pass
 
+    @keyword
+    def keyword_in_main(self):
+        raise AssertionError('Should be overridden by the main library!')
+
 
 class Arguments(object):
 

atest/tests.robot

@@ -6,6 +6,7 @@ ${LIBRARY}    DynamicLibrary
 
 *** Test Cases ***
 Keyword names
+    Keyword in main
     Function
     FUNCTION
     Method

src/robotlibcore.py

@@ -20,9 +20,10 @@ def decorator(func):
 class HybridCore(object):
 
     def __init__(self, libraries):
-        self.keywords = dict(self._find_keywords(libraries))
+        self.keywords = dict(self._find_keywords(*libraries))
+        self.keywords.update(self._find_keywords(self))
 
-    def _find_keywords(self, libraries):
+    def _find_keywords(self, *libraries):
         for library in libraries:
             for name, func in self._get_members(library):
                 if callable(func) and hasattr(func, 'robot_name'):

utest/test_robotlibcore.py

@@ -11,6 +11,7 @@ def test_keyword_names():
                 'defaults',
                 'doc_and_tags',
                 'function',
+                'keyword_in_main',
                 'mandatory',
                 'method',
                 'multi_line_doc',
@@ -33,10 +34,12 @@ def test_dir():
                 'get_keyword_documentation',
                 'get_keyword_names',
                 'instance_attribute',
+                'keyword_in_main',
                 'keywords',
                 'mandatory',
                 'method',
                 'multi_line_doc',
+                'not_keyword_in_main',
                 'one_line_doc',
                 'run_keyword',
                 'tags',