Revision: 2144
Author: jprantan
Date: Mon Aug 10 04:13:38 2009
Log: Added tests for handling multiple matching keywords. Issue 370.
http://code.google.com/p/robotframework/source/detail?r=2144
Added:
/trunk/atest/testdata/core/keywords/resources/embedded_args_in_uk_1.tsv
Deleted:
/trunk/atest/testdata/core/keywords/resources/embedded_args_in_uk.tsv
Modified:
/trunk/atest/testdata/core/keywords/embedded_argument_in_keyword_names.tsv
=======================================
--- /dev/null
+++ /trunk/atest/testdata/core/keywords/resources/embedded_args_in_uk_1.tsv
Mon Aug 10 04:13:38 2009
@@ -0,0 +1,9 @@
+*** Keywords ***
+${name} Uses ${type} File
+ [Return] ${name}-${type}
+
+${a}-r1-${b}
+ Log ${a}-r1-${b}
+
+${a}+r1+${b}
+ Log ${a}+r1+${b}
=======================================
--- /trunk/atest/testdata/core/keywords/resources/embedded_args_in_uk.tsv
Mon Aug 10 03:50:07 2009
+++ /dev/null
@@ -1,3 +0,0 @@
-*** Keywords ***
-${name} Uses ${type} File
- [Return] ${name}-${type}
=======================================
---
/trunk/atest/testdata/core/keywords/embedded_argument_in_keyword_names.tsv
Mon Aug 10 03:50:07 2009
+++
/trunk/atest/testdata/core/keywords/embedded_argument_in_keyword_names.tsv
Mon Aug 10 04:13:38 2009
@@ -1,6 +1,7 @@
*** Settings ***
-Resource resources/embedded_args_in_uk.tsv
+Resource resources/embedded_args_in_uk_1.tsv
+Resource resources/embedded_args_in_uk_2.tsv
*** Test Cases ***
@@ -56,7 +57,7 @@
Should Be Equal ${ret} Juha-Resource
Embedded Arguments In Resource File Used Explicitly
- ${ret} = embedded_args_in_uk.peke uses resource file
+ ${ret} = embedded_args_in_uk_1.peke uses resource file
Should Be Equal ${ret} peke-resource
Keyword with normal arguments cannot have embedded arguments
@@ -70,6 +71,28 @@
User ${user} Selects ${item} From Webshop
+Keyword Matching Multiple Keywords In Test Case File
+ [Documentation] FAIL
+ foo+tc+bar
+ foo-tc-bar
+ foo+tc+bar+tc+zap
+ foo+tc+bar-tc-zap
+
+Keyword Matching Multiple Keywords In One Resource File
+ [Documentation] FAIL
+ foo+r1+bar
+ foo-r1-bar
+ foo+r1+bar-r1-zap
+
+Keyword Matching Multiple Keywords In Different Resource Files
+ [Documentation] FAIL Multiple keywords with name 'foo-r1-bar-r2-zap'
found.\n
+ ... Give the full name of the keyword you want to use.\n
+ ... Found: 'embedded_args_in_uk_1.foo-r1-bar-r2-zap'
and 'embedded_args_in_uk_2.foo-r1-bar-r2-zap'
+ foo-r1-bar
+ foo-r2-bar
+ foo-r1-bar-r2-zap
+
+
*** Keywords ***
User ${user} Selects ${item} From Webshop
@@ -90,3 +113,9 @@
Normal keyword with ${variable} in name
Variable Should Not Exist ${variable}
+
+${a}-tc-${b}
+ Log ${a}-tc-${b}
+
+${a}+tc+${b}
+ Log ${a}+tc+${b}
