Revision: 2997
Author: jprantan
Date: Thu Apr 15 05:30:04 2010
Log: Refactored tests.
http://code.google.com/p/robotframework/source/detail?r=2997
Modified:
/trunk/atest/robot/keywords/user_keyword_argument_tracelog.txt
/trunk/atest/testdata/keywords/user_keyword_argument_tracelog.txt
=======================================
--- /trunk/atest/robot/keywords/user_keyword_argument_tracelog.txt Wed Apr
14 10:54:52 2010
+++ /trunk/atest/robot/keywords/user_keyword_argument_tracelog.txt Thu Apr
15 05:30:04 2010
@@ -3,78 +3,71 @@
Force Tags regression pybot jybot
Resource atest_resource.txt
+
+*** Variables ***
+${NON ASCII} u'Hyv\\xe4\\xe4 P\\xe4iv\\xe4\\xe4'
+${OBJECT REPR} u'Circle is 360\\xb0, Hyv\\xe4\\xe4 \\xfc\\xf6t\\xe4,
\\u0989\\u09c4 \\u09f0 \\u09fa \\u099f \\u09eb \\u09ea \\u09b9'
+
*** Test Cases ***
-UK with Only Mandatory Arguments
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} \${mand1}=u'arg1' |
\${mand2}=u'arg2'
- Check Argument Value Trace ${tc.kws[1]} \${mand1}=-123L |
\${mand2}=0.0
-
-UK with Mandatory And Default Arguments
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} \${mand}=u'mandatory' |
\${default}=u'default value'
-
-UK with Multiple Default Values
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} \${a1}=u'10' | \${a2}=u'2' |
\${a3}=u'30' | \${a4}=4L
-
-UK with Using Named Arguments
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} \${mand}=u'foo' |
\${default}=u'bar'
- Check Argument Value Trace ${tc.kws[1]} \${mand}=True |
\${default}=None
-
-UK with Using Variable Number of Arguments
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} \${mand}=u'a' |
\...@{vargs}=[u'b', u'c', u'd']
- Check Argument Value Trace ${tc.kws[1]} \${mand}=u'mandatory' |
\...@{vargs}=[u'a', u'b', u'c', u'd']
- Check Argument Value Trace ${tc.kws[2]} \${mand}=u'mandatory' |
\...@{vargs}=[]
-
-Library Keyword with Only Mandatory Arguments
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} u'arg1' | u'arg2'
- Check Argument Value Trace ${tc.kws[1]} -123L | 0.0
-
-Library Keyword with Mandatory And Default Arguments
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} u'mandatory'
-
-Library Keyword with Multiple Default Values
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} u'10' | a3=u'30'
-
-Library Keyword with Using Named Arguments
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} u'foo' | default=u'bar'
- Check Argument Value Trace ${tc.kws[1]} True | default=None
- Check Argument Value Trace ${tc.kws[2]} True | u'foo=bar'
-
-Library Keyword with Using Variable Number of Arguments
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} u'a' | u'b' | u'c' | u'd'
- Check Argument Value Trace ${tc.kws[1]} u'mandatory' | u'a' | u'b' |
u'c' | u'd'
- Check Argument Value Trace ${tc.kws[2]} u'mandatory'
+Only Mandatory Arguments
+ Check Argument Value Trace \${mand1}=u'arg1' | \${mand2}=u'arg2'
+ ... u'arg1' | u'arg2'
+
+Mandatory And Default Arguments
+ Check Argument Value Trace \${mand}=u'mandatory' |
\${default}=u'default value'
+ ... u'mandatory'
+
+Multiple Default Values
+ Check Argument Value Trace \${a1}=u'10' | \${a2}=u'2' | \${a3}=u'30'
| \${a4}=4L
+ ... u'10' | a3=u'30'
+
+Named Arguments
+ Check Argument Value Trace \${mand}=u'mandatory' | \${default}=u'bar'
+ ... u'mandatory' | default=u'bar'
+
+Named Arguments when Name Is Not Matching
+ Check Argument Value Trace \${mand}=u'mandatory' |
\${default}=u'foo=bar'
+ ... u'mandatory' | u'foo=bar'
+
+Variable Number of Arguments with UK
+ Check Argument Value Trace \${mand}=u'a' | \...@{vargs}=[u'b', u'c',
u'd']
+ ... \${mand}=u'mandatory' | \...@{vargs}=[u'a', u'b', u'c', u'd']
+ ... \${mand}=u'mandatory' | \...@{vargs}=[]
+
+Variable Number of Arguments with Library Keyword
+ Check Argument Value Trace u'a' | u'b' | u'c' | u'd'
+ ... u'mandatory' | u'a' | u'b' | u'c' | u'd'
+ ... u'mandatory'
Non String Object as Argument
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} 1L
+ Check Argument Value Trace \${mand}=True | \${default}=1.0
+ ... True | default=1.0
+ ... \${mand}=-123L | \...@{vargs}=[1.0]
+ ... -123L | 1.0
None as Argument
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} None
+ Check UK Default, Library KW Default, UK Varargs and Library KW
Varargs None
Non Ascii String as Argument
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[0]} u'Hyv\\xe4\\xe4
P\\xe4iv\\xe4\\xe4'
- Check Argument Value Trace ${tc.kws[1]} \${mand}=u'Hyv\\xe4\\xe4
P\\xe4iv\\xe4\\xe4' | \${default}=u'default value'
+ Check UK Default, Library KW Default, UK Varargs and Library KW
Varargs ${NON ASCII}
Object With Unicode Repr as Argument
- ${tc} = Check Test Case ${TEST NAME}
- Check Argument Value Trace ${tc.kws[1]} u'Circle is 360\\xb0,
Hyv\\xe4\\xe4 \\xfc\\xf6t\\xe4, \\u0989\\u09c4 \\u09f0 \\u09fa \\u099f
\\u09eb \\u09ea \\u09b9'
- Check Argument Value Trace ${tc.kws[2]} \${mand}=u'Circle is
360\\xb0, Hyv\\xe4\\xe4 \\xfc\\xf6t\\xe4, \\u0989\\u09c4 \\u09f0 \\u09fa
\\u099f \\u09eb \\u09ea \\u09b9' | \${default}=u'default value'
-
+ Check UK Default, Library KW Default, UK Varargs and Library KW
Varargs ${OBJECT REPR}
*** Keywords ***
Check Argument Value Trace
- [Arguments] ${kw} ${exp_variables}
- Check Log Message ${kw.msgs[0]} Arguments: [ ${exp_variables} ]
TRACE
-
+ [Arguments] @{expected}
+ ${tc} = Check Test Case ${TEST NAME}
+ ${length} = Get Length ${expected}
+ :FOR ${index} IN RANGE 0 ${length}
+ \ Check Log Message ${tc.kws[${index}].msgs[0]}
+ \ ... Arguments: [ @{expected}[${index}] ] TRACE
+
+Check UK Default, Library KW Default, UK Varargs and Library KW Varargs
+ [Arguments] ${value}
+ Check Argument Value Trace \${mand}=${value} | \${default}=${value}
+ ... ${value} | default=${value}
+ ... \${mand}=${value} | \...@{vargs}=[${value}]
+ ... ${value} | ${value}
+
=======================================
--- /trunk/atest/testdata/keywords/user_keyword_argument_tracelog.txt Wed
Apr 14 10:54:52 2010
+++ /trunk/atest/testdata/keywords/user_keyword_argument_tracelog.txt Thu
Apr 15 05:30:04 2010
@@ -1,80 +1,87 @@
*** Settings ***
Library UnicodeLibrary
Library TraceArgsLibrary.py
+Suite Setup Set Unicode Repr Object As Variable
*** Variables ***
@{VALUES} a b c d
+${NON ASCII} Hyvää Päivää
*** Test cases ***
-UK with Only Mandatory Arguments
+Only Mandatory Arguments
Only Mandatory UK arg1 arg2
- Only Mandatory UK ${-123} ${0.0}
-
-UK with Mandatory And Default Arguments
+ Only Mandatory arg1 arg2
+
+Mandatory And Default Arguments
Mandatory And Default UK mandatory
-
-UK with Multiple Default Values
+ Mandatory And Default mandatory
+
+Multiple Default Values
Multiple Default Values UK 10 a3=30
-
-UK with Using Named Arguments
- Mandatory and Default UK foo default=bar
- Mandatory and Default UK ${True} default=${None}
-
-UK with Using Variable Number of Arguments
+ Multiple Default Values 10 a3=30
+
+Named Arguments
+ Mandatory and Default UK mandatory default=bar
+ Mandatory and Default mandatory default=bar
+
+Named Arguments when Name Is Not Matching
+ Mandatory and Default UK mandatory foo=bar
+ Mandatory and Default mandatory foo=bar
+
+Variable Number of Arguments with UK
Mandatory and Varargs UK @{VALUES}
Mandatory and Varargs UK mandatory @{VALUES}
Mandatory and Varargs UK mandatory
-Library Keyword with Only Mandatory Arguments
- Only Mandatory arg1 arg2
- Only Mandatory ${-123} ${0.0}
-
-Library Keyword with Mandatory And Default Arguments
- Mandatory And Default mandatory
-
-Library Keyword with Multiple Default Values
- Multiple Default Values 10 a3=30
-
-Library Keyword with Using Named Arguments
- Mandatory and Default foo default=bar
- Mandatory and Default ${True} default=${None}
- Mandatory and Default ${True} foo=bar
-
-Library Keyword with Using Variable Number of Arguments
+Variable Number of Arguments with Library Keyword
Mandatory and Varargs @{VALUES}
Mandatory and Varargs mandatory @{VALUES}
Mandatory and Varargs mandatory
Non String Object as Argument
- Log ${1}
+ Mandatory and Default UK ${TRUE} default=${1.0}
+ Mandatory and Default ${TRUE} default=${1.0}
+ Mandatory and Varargs UK ${-123} ${1.0}
+ Mandatory and Varargs ${-123} ${1.0}
None as Argument
- Log ${NONE}
+ Mandatory and Default UK ${NONE} default=${NONE}
+ Mandatory and Default ${NONE} default=${NONE}
+ Mandatory and Varargs UK ${NONE} ${NONE}
+ Mandatory and Varargs ${NONE} ${NONE}
Non Ascii String as Argument
- Log Hyvää Päivää
- Mandatory And Default UK Hyvää Päivää
+ Mandatory and Default UK ${NON ASCII} default=${NON ASCII}
+ Mandatory and Default ${NON ASCII} default=${NON ASCII}
+ Mandatory and Varargs UK ${NON ASCII} ${NON ASCII}
+ Mandatory and Varargs ${NON ASCII} ${NON ASCII}
Object With Unicode Repr as Argument
- ${object} Print and Return Unicode Object
- Log ${object}
- Mandatory And Default UK ${object}
+ Mandatory And Default UK ${object} default=${object}
+ Mandatory And Default ${object} default=${object}
+ Mandatory and Varargs UK ${object} ${object}
+ Mandatory and Varargs ${object} ${object}
+
*** Keywords ***
+Set Unicode Repr Object As Variable
+ ${object} = Print and Return Unicode Object
+ Set Global Variable ${OBJECT}
+
Only Mandatory UK
[Arguments] ${mand1} ${mand2}
- Log Many ${mand1} ${mand2}
+ No Operation
Mandatory And Default UK
[Arguments] ${mand} ${default}=default value
- Log Many ${mand} ${default}
+ No Operation
Multiple Default Values UK
[Arguments] ${a1}=1 ${a2}=2 ${a3}=3 ${a4}=${4}
- Log Many ${a1} ${a2} ${a3} ${a4}
+ No Operation
Mandatory and Varargs UK
[Arguments] ${mand} @{vargs}
- Log Many ${mand} @{vargs}
+ No Operation
--
To unsubscribe, reply using "remove me" as the subject.
