More tests for custom keyword name using robot_name(robotframework#1835).

pekkaklarck · pekkaklarck · commit 271e001609e9 · 2015-01-23T17:25:22.000+02:00
Added some more tests. Most importantly for custom  non-ASCII names.
diff --git a/atest/robot/keywords/keyword_names.robot b/atest/robot/keywords/keyword_names.robot
@@ -61,10 +61,21 @@ User Keyword Name Ending With Dot
     Check Test And Three Keyword Names    User Keyword Name Ending With Dot    User Keyword.
 
 Name Set Using 'robot_name' Attribute
-    Check Test Case  ${TESTNAME}
+    ${tc} =    Check Test Case    ${TESTNAME}
+     Check Log Message    ${tc.kws[0].msgs[0]}    My name was set using 'robot_name' attribute!
+
+Name Set Using 'robot.api.deco.keyword' Decorator
+    ${tc} =    Check Test Case    ${TESTNAME}
+     Check Log Message    ${tc.kws[0].msgs[0]}    My name was set using 'robot.api.deco.keyword' decorator!
+
+Custom non-ASCII name
+    Check Test Case    ${TESTNAME}
 
 Old Name Doesn't Work If Name Set Using 'robot_name'
-    Check Test Case  ${TESTNAME}
+    Check Test Case    ${TESTNAME}
+
+Keyword can just be marked without changing its name
+    Check Test Case    ${TESTNAME}
 
 *** Keywords ***
 Check Test And Three Keyword Names
diff --git a/atest/testdata/keywords/keyword_names.robot b/atest/testdata/keywords/keyword_names.robot
@@ -52,12 +52,22 @@ User Keyword Name Ending With Dot
     _US_er_ K EY_word .
 
 Name Set Using 'robot_name' Attribute
-    Name Set Using Robot Name Attribute
+    Name set using 'robot_name' attribute
+
+Name Set Using 'robot.api.deco.keyword' decorator
+    Name set using 'robot.api.deco.keyword' decorator
+
+Custom non-ASCII name
+    Custom nön-ÄSCII name
 
 Old Name Doesn't Work If Name Set Using 'robot_name'
     [Documentation]  FAIL No keyword with name 'Name Set In Method Signature' found.
     Name Set In Method Signature
 
+Keyword can just be marked without changing its name
+    No Custom Name Given 1
+    No Custom Name Given 2
+
 *** Keywords ***
 Keyword Only In Test Case File
     Log  Keyword from test case file
diff --git a/atest/testdata/keywords/resources/MyLibrary1.py b/atest/testdata/keywords/resources/MyLibrary1.py
@@ -1,4 +1,7 @@
-from robot.api import deco
+# coding=UTF-8
+
+from robot.api.deco import keyword
+
 
 class MyLibrary1:
 
@@ -29,6 +32,23 @@ def copy_directory(self):
     def no_operation(self):
         print "Overrides keyword from BuiltIn library"
 
-    @deco.keyword('Name Set Using Robot Name Attribute')
+    def method(self):
+        print "My name was set using 'robot_name' attribute!"
+
+    method.robot_name = "Name set using 'robot_name' attribute"
+
+    @keyword("Name set using 'robot.api.deco.keyword' decorator")
     def name_set_in_method_signature(self):
+        print "My name was set using 'robot.api.deco.keyword' decorator!"
+
+    @keyword(name=u'Custom nön-ÄSCII name')
+    def non_ascii_would_not_work_here(self):
+        pass
+
+    @keyword()
+    def no_custom_name_given_1(self):
+        pass
+
+    @keyword
+    def no_custom_name_given_2(self):
         pass
diff --git a/utest/api/test_deco.py b/utest/api/test_deco.py
@@ -0,0 +1,32 @@
+import unittest
+
+from robot.api.deco import keyword
+from robot.utils.asserts import assert_equals
+
+
+class TestKeywordName(unittest.TestCase):
+
+    def test_give_name_to_function(self):
+        @keyword('Given name')
+        def func():
+            pass
+        assert_equals(func.robot_name, 'Given name')
+
+    def test_give_name_to_method(self):
+        class Class:
+            @keyword('Given name')
+            def method(self):
+                pass
+        assert_equals(Class.method.robot_name, 'Given name')
+
+    def test_no_name(self):
+        @keyword()
+        def func():
+            pass
+        assert_equals(func.robot_name, None)
+
+    def test_no_name_nor_parens(self):
+        @keyword
+        def func():
+            pass
+        assert_equals(func.robot_name, None)
