Revision: 4b43128b6ebb
Branch: default
Author: Pekka Klärck
Date: Thu Sep 13 12:42:10 2012
Log: small changes to atests to hopefully make them pass on ironpython
http://code.google.com/p/robotframework/source/detail?r=4b43128b6ebb
Modified:
/atest/robot/keywords/return_values.txt
/atest/robot/standard_libraries/builtin/log_variables.txt
/atest/robot/test_libraries/hybrid_library.txt
/atest/testdata/keywords/return_values.txt
/atest/testdata/standard_libraries/builtin/set_variable_if.txt
/atest/testdata/variables/variable_table.txt
/atest/testdata/variables/variables_from_resource_files.txt
=======================================
--- /atest/robot/keywords/return_values.txt Wed Sep 28 22:44:06 2011
+++ /atest/robot/keywords/return_values.txt Thu Sep 13 12:42:10 2012
@@ -16,7 +16,7 @@
List To Scalar Variable
${test} = Check Test Case ${TEST NAME}
- Check Log Message ${test.kws[0].msgs[0]} \${setvar} = [u'a', u'b',
u'c']
+ Check Log Message ${test.kws[0].msgs[0]} \${setvar} = [*'a', 2]
pattern=yep
Multible Scalar Variables
${test} = Check Test Case ${TEST NAME}
@@ -73,7 +73,7 @@
${test} = Check Test Case ${TEST NAME}
Check Log Message ${test.kws[0].msgs[0]} \${a} = a
Check Log Message ${test.kws[0].msgs[1]} \${b} = b
- Check Log Message ${test.kws[0].msgs[2]} \${c} = [u'c', u'd', u'e',
u'f']
+ Check Log Message ${test.kws[0].msgs[2]} \${c} = [*'c', 4]
pattern=yes
Multiple Scalars With Too Few Values
${test} = Check Test Case ${TEST NAME}
=======================================
--- /atest/robot/standard_libraries/builtin/log_variables.txt Thu Aug 30
15:15:55 2012
+++ /atest/robot/standard_libraries/builtin/log_variables.txt Thu Sep 13
12:42:10 2012
@@ -33,7 +33,7 @@
Check Log Message ${kw.messages[22]} \${SUITE_METADATA} = {}
Check Log Message ${kw.messages[23]} \${SUITE_NAME} = * pattern=yes
Check Log Message ${kw.messages[24]} \${suite_setup_global_var} =
Global var set in suite setup
- Check Log Message ${kw.messages[25]} \${suite_setup_local_var} =
[u'Variable available only locally', u'in suite setup']
+ Check Log Message ${kw.messages[25]} \${suite_setup_local_var} =
[*'Variable available only locally', *'in suite setup'] pattern=yes
Check Log Message ${kw.messages[26]} \${suite_setup_suite_var} =
Suite var set in suite setup
Check Log Message ${kw.messages[27]} \${SUITE_SOURCE} = *
pattern=yes
Check Log Message ${kw.messages[28]} \${TEMPDIR} = * pattern=yes
=======================================
--- /atest/robot/test_libraries/hybrid_library.txt Tue May 24 05:58:33 2011
+++ /atest/robot/test_libraries/hybrid_library.txt Thu Sep 13 12:42:10 2012
@@ -17,7 +17,7 @@
Non Existing Keyword
Check Test Case ${TESTNAME}
- Check Log Message ${ERRORS.msgs[0]} Adding keyword 'non_existing_kw'
to library 'GetKeywordNamesLibrary' failed: AttributeError: Non-existing
keyword 'non_existing_kw' WARN
+ Check Log Message ${ERRORS.msgs[0]} Adding keyword 'non_existing_kw'
to library 'GetKeywordNamesLibrary' failed: AttributeError: * WARN
pattern=yes
Named Keyword Is Not Method
Check Test Case ${TESTNAME}
=======================================
--- /atest/testdata/keywords/return_values.txt Tue Sep 11 23:55:12 2012
+++ /atest/testdata/keywords/return_values.txt Thu Sep 13 12:42:10 2012
@@ -12,10 +12,9 @@
Should Be Equal ${setvar} ${EMPTY}
List To Scalar Variable
- ${setvar} = Create List a b c
+ ${setvar} = Create List a ${2}
Should Be Equal ${setvar[0]} a
- Should Be Equal ${setvar[1]} b
- Should Be Equal ${setvar[2]} c
+ Should Be Equal ${setvar[1]} ${2}
Multible Scalar Variables
${var1} ${var2} = Create List one two
@@ -89,10 +88,10 @@
Scalar Variables With More Values Than Variables
[Documentation] Extra string variables are added to last scalar
variable as list
- ${a} ${b} ${c} = List a b c d e f
+ ${a} ${b} ${c} = Create List a b c ${4}
Should Be Equal ${a} a
- Should Be True '${b}' == 'b'
- Should Be True ${c} == ['c', 'd', 'e', 'f']
+ Should Be Equal ${b} b
+ Should Be True ${c} == ['c', 4]
Multiple Scalars With Too Few Values
[Documentation] FAIL Cannot assign return values: Need more values
than 2.
=======================================
--- /atest/testdata/standard_libraries/builtin/set_variable_if.txt Tue Oct
26 08:34:23 2010
+++ /atest/testdata/standard_libraries/builtin/set_variable_if.txt Thu Sep
13 12:42:10 2012
@@ -82,14 +82,14 @@
Should Be Equal ${var} Here we go!
If / Else If / Else
- ${var} = Set Variable If
- ... ${False} this value is not used
+ ${var} = Set Variable If
+ ... ${False} this value is not used
... ${None} this value is not used
... ${0} this value is not used
... Final else!
Should Be Equal ${var} Final else!
- ${var} = Set Variable If
- ... ${False} this value is not used
+ ${var} = Set Variable If
+ ... ${False} this value is not used
... ${None} this value is not used
... ${0} this value is not used
Should Be Equal ${var} ${None}
@@ -120,7 +120,7 @@
${var} = Set Variable If False @{EMPTY LIST} @{2 ITEMS}
Should Be Equal ${var} 2
${var} = Set Variable If True @{2 ITEMS} as string
- Should Be Equal ${var} [u'1', u'2'] as string
+ Should Be Equal ${var} @{2 ITEMS} as string
With List Variables In Expressions And Values
${var} = Set Variable If @{1 ITEM} this is set
=======================================
--- /atest/testdata/variables/variable_table.txt Fri Aug 31 03:33:54 2012
+++ /atest/testdata/variables/variable_table.txt Thu Sep 13 12:42:10 2012
@@ -93,7 +93,7 @@
Scalar Variable Containing List Is Different Than List Variable
${ret} = Catenate ${LIST}
- Should Be Equal ${ret} [u'Hello', u'world', u'!']
+ Should Be True ${ret} == ['Hello', 'world', '!']
${ret} = Catenate @{LIST}
Should Be Equal ${ret} Hello again ?
=======================================
--- /atest/testdata/variables/variables_from_resource_files.txt Fri Aug 31
03:56:36 2012
+++ /atest/testdata/variables/variables_from_resource_files.txt Thu Sep 13
12:42:10 2012
@@ -73,7 +73,7 @@
Scalar Variable Containing List Is Different Than List Variable
${ret} = Catenate ${LIST}
- Should Be Equal ${ret} [u'Hello', u'world', u'!']
+ Should Be True ${ret} == ['Hello', 'world', '!']
${ret} = Catenate @{LIST}
Should Be Equal ${ret} Hello again ?
