5 new revisions:
Revision: 2b2d05165823
Author: Pekka Klärck
Date: Wed Apr 20 03:27:45 2011
Log: test cleanup: <name of test> -> ${TESTNAME}
http://code.google.com/p/robotframework/source/detail?r=2b2d05165823
Revision: 7b063781d166
Author: Pekka Klärck
Date: Wed Apr 20 03:30:40 2011
Log: test cleanup: ${var} -> ${VAR}
http://code.google.com/p/robotframework/source/detail?r=7b063781d166
Revision: 8ee1d8e4d36e
Author: Pekka Klärck
Date: Wed Apr 20 03:57:25 2011
Log: tests for Should (Not) Be Equal enhancements
http://code.google.com/p/robotframework/source/detail?r=8ee1d8e4d36e
Revision: 71e7bb17b04d
Author: Pekka Klärck
Date: Wed Apr 20 03:57:39 2011
Log: merge heads
http://code.google.com/p/robotframework/source/detail?r=71e7bb17b04d
Revision: 094e0044483a
Author: Pekka Klärck
Date: Wed Apr 20 03:59:04 2011
Log: expected error fix
http://code.google.com/p/robotframework/source/detail?r=094e0044483a
==============================================================================
Revision: 2b2d05165823
Author: Pekka Klärck
Date: Wed Apr 20 03:27:45 2011
Log: test cleanup: <name of test> -> ${TESTNAME}
http://code.google.com/p/robotframework/source/detail?r=2b2d05165823
Modified:
/atest/robot/standard_libraries/builtin/verify.txt
=======================================
--- /atest/robot/standard_libraries/builtin/verify.txt Tue May 25 07:00:39
2010
+++ /atest/robot/standard_libraries/builtin/verify.txt Wed Apr 20 03:27:45
2011
@@ -6,91 +6,91 @@
*** Test Cases ***
Fail
- Check testcase Fail
+ Check test case ${TESTNAME}
Fail With Message
- Check testcase Fail With Message
+ Check test case ${TESTNAME}
Should Not Be True
- Check testcase Should Not Be True
+ Check test case ${TESTNAME}
Should Not Be True With Message
- Check testcase Should Not Be True With Message
+ Check test case ${TESTNAME}
Should Not Be True With Invalid Expression
- Check testcase Should Not Be True With Invalid Expression
+ Check test case ${TESTNAME}
Should Be True
- Check testcase Should Be True
+ Check test case ${TESTNAME}
Should Be True With Message
- Check testcase Should Be True With Message
+ Check test case ${TESTNAME}
Should Be True With Invalid Expression
- Check testcase Should Be True With Invalid Expression
+ Check test case ${TESTNAME}
Should Not Be Equal
- Check testcase Should Not Be Equal
+ Check test case ${TESTNAME}
Should Be Equal
- Check testcase Should Be Equal
+ Check test case ${TESTNAME}
Should Not Be Equal As Integers
- Check testcase Should Not Be Equal As Integers
+ Check test case ${TESTNAME}
Should Be Equal As Integers
- Check testcase Should Be Equal As Integers
+ Check test case ${TESTNAME}
Should Not Be Equal As Numbers
- Check testcase Should Not Be Equal As Numbers
+ Check test case ${TESTNAME}
Should Be Equal As Numbers
- Check testcase Should Be Equal As Numbers
+ Check test case ${TESTNAME}
Should Not Be Equal As Strings
- Check testcase Should Not Be Equal As Strings
+ Check test case ${TESTNAME}
Should Be Equal As Strings
- Check testcase Should Be Equal As Strings
+ Check test case ${TESTNAME}
Should Not Start With
- Check testcase Should Not Start With
+ Check test case ${TESTNAME}
Should Start With
- Check testcase Should Start With
+ Check test case ${TESTNAME}
Should Not End With
- Check testcase Should Not End With
+ Check test case ${TESTNAME}
Should End With
- Check testcase Should End With
+ Check test case ${TESTNAME}
Should Not Contain
- Check testcase Should Not Contain
+ Check test case ${TESTNAME}
Should Not Contain With Non-String Values
- Check testcase Should Not Contain With Non-String Values
+ Check test case ${TESTNAME}
Should Contain
- Check testcase Should Contain
+ Check test case ${TESTNAME}
Should Contain With Non-String Values
- Check testcase Should Contain With Non-String Values
+ Check test case ${TESTNAME}
Should Not Match
- Check testcase Should Not Match
+ Check test case ${TESTNAME}
Should Match
- Check testcase Should Match
+ Check test case ${TESTNAME}
Should Not Match Regexp
- Check testcase Should Not Match Regexp
+ Check test case ${TESTNAME}
Should Match Regexp
- Check testcase Should Match Regexp
+ Check test case ${TESTNAME}
Should Match Regexp Returns Match And Groups
- Check testcase Should Match Regexp Returns Match And Groups
+ Check test case ${TESTNAME}
Get Length
${tc} = Check Test Case Get Length
@@ -111,65 +111,65 @@
Check Test Case Length Should Be With Invalid Length
Should Be Empty
- Check testcase Should Be Empty
+ Check test case ${TESTNAME}
Should Be Empty With Non Default Message
- Check testcase Should Be Empty With Non Default Message
+ Check test case ${TESTNAME}
Should Not Be Empty
- Check testcase Should Not Be Empty
+ Check test case ${TESTNAME}
Should Not Be Empty With Non Default Message
- Check testcase Should Not Be Empty With Non Default Message
+ Check test case ${TESTNAME}
Length With Length Method
- Check testcase Length With Length Method
+ Check test case ${TESTNAME}
Length With Size Method
- Check testcase Length With Size Method
+ Check test case ${TESTNAME}
Length With Length Attribute
- Check testcase Length With Length Attribute
+ Check test case ${TESTNAME}
Length Of Java Types
[Documentation] Tests that it's possible to get the lenght of String,
Vector, Hashtable and array
[Tags] jybot
- Check testcase Length Of Java Types
+ Check test case ${TESTNAME}
Should Contain X Times With String
- ${tc} = Check testcase Should Contain X Times With String
+ ${tc} = Check test case ${TESTNAME}
Check Log Message ${tc.kws[0].msgs[0]} Item found from the first
item 2 times
Check Log Message ${tc.kws[1].msgs[0]} Item found from the first
item 1 time
Check Log Message ${tc.kws[3].msgs[0]} Item found from the first
item 0 times
Should Contain X Times With List
- ${tc} = Check testcase Should Contain X Times With List
+ ${tc} = Check test case ${TESTNAME}
Check Log Message ${tc.kws[0].msgs[0]} Item found from the first
item 1 time
Check Log Message ${tc.kws[1].msgs[0]} Item found from the first
item 2 times
Check Log Message ${tc.kws[3].msgs[0]} Item found from the first
item 0 times
Should Contain X Times With Tuple
- Check testcase Should Contain X Times With Tuple
+ Check test case ${TESTNAME}
Should Contain X With Java Array And Vector
[Tags] jybot
- Check testcase Should Contain X With Java Array and Vector
+ Check test case ${TESTNAME}
Should Contain X With Invalid Item
- Check testcase Should Contain X With Invalid Item
+ Check test case ${TESTNAME}
Should Contain X Times With Invalid Count
- Check testcase Should Contain X Times With Invalid count
+ Check test case ${TESTNAME}
Should Contain X Times Failing With Default Message
- Check testcase Should Contain X Times Failing With Default Message
+ Check test case ${TESTNAME}
Should Contain X Times Failing With Defined Message
- Check testcase Should Contain X Times Failing With Defined Message
+ Check test case ${TESTNAME}
Get Count
[Documentation] This keyword is also tested by Should (Not) Contain X
Times keywords that use this keyword internally
- ${tc} = Check testcase Get Count
+ ${tc} = Check test case ${TESTNAME}
Check Log Message ${tc.kws[0].kws[0].msgs[0]} Item found from the
first item 2 times
Check Log Message ${tc.kws[1].kws[0].msgs[0]} Item found from the
first item 1 time
Check Log Message ${tc.kws[2].kws[0].msgs[0]} Item found from the
first item 1 time
==============================================================================
Revision: 7b063781d166
Author: Pekka Klärck
Date: Wed Apr 20 03:30:40 2011
Log: test cleanup: ${var} -> ${VAR}
http://code.google.com/p/robotframework/source/detail?r=7b063781d166
Modified:
/atest/testdata/standard_libraries/builtin/verify.txt
=======================================
--- /atest/testdata/standard_libraries/builtin/verify.txt Tue May 25
07:25:33 2010
+++ /atest/testdata/standard_libraries/builtin/verify.txt Wed Apr 20
03:30:40 2011
@@ -2,10 +2,10 @@
Variables variables_to_verify.py
*** Variables ***
-${str0} 0
-${str1} 1
-${int0} ${0}
-${int1} ${1}
+${STR0} 0
+${STR1} 1
+${INT0} ${0}
+${INT1} ${1}
@{LIST} a b cee b ${42}
*** Test Cases ***
@@ -22,7 +22,7 @@
Should Not Be True 0 > 1
${empty list} = Create List
Should Not Be True ${empty list}
- Should Not Be True ${int0} < ${int1}
+ Should Not Be True ${INT0} < ${INT1}
Should Not Be True With Message
[Documentation] FAIL My message
@@ -34,8 +34,8 @@
Should Be True
[Documentation] FAIL '1 != 1 and True or False' should be true
- Should Be True -1 <= ${str1} <= 1
- Should Be True -${str1} < ${str0} < ${str1}
+ Should Be True -1 <= ${STR1} <= 1
+ Should Be True -${STR1} < ${STR0} < ${STR1}
${list} = Create List 0
Should Be True ${list}
Should Be True 1 != 1 and True or False
@@ -50,34 +50,34 @@
Should Not Be Equal
[Documentation] FAIL 1 == 1
- Should Not Be Equal ${str1} Not ${str1}
- Should Not Be Equal ${str1} 1
+ Should Not Be Equal ${STR1} Not ${STR1}
+ Should Not Be Equal ${STR1} 1
Should Be Equal
[Documentation] FAIL Error message: 1 != 1
- Should Be Equal ${str1} 1
- Should Be Equal ${str1} ${int1} Error message
+ Should Be Equal ${STR1} 1
+ Should Be Equal ${STR1} ${INT1} Error message
Should Not Be Equal As Integers
[Documentation] FAIL This message only
- Should Not Be Equal As Integers 1 ${str0}
- Should Not Be Equal As Integers 0 ${int1}
- Should Not Be Equal As Integers 1 ${int1} This message only No
values
+ Should Not Be Equal As Integers 1 ${STR0}
+ Should Not Be Equal As Integers 0 ${INT1}
+ Should Not Be Equal As Integers 1 ${INT1} This message only No
values
Should Be Equal As Integers
[Documentation] FAIL -1 != 1
- Should Be Equal As Integers ${str1}${str0}${str0}
${str1}${str0}${str0}
- Should Be Equal As Integers -${str1} ${str1}
+ Should Be Equal As Integers ${STR1}${STR0}${STR0}
${STR1}${STR0}${STR0}
+ Should Be Equal As Integers -${STR1} ${STR1}
Should Not Be Equal As Numbers
[Documentation] FAIL Fails again: 1.1 == 1.1
- Should Not Be Equal As Numbers ${str1}.${str1} 1.2
- Should Not Be Equal As Numbers ${str1}.${str1} 1.1 Fails again
+ Should Not Be Equal As Numbers ${STR1}.${STR1} 1.2
+ Should Not Be Equal As Numbers ${STR1}.${STR1} 1.1 Fails again
Should Be Equal As Numbers
[Documentation] FAIL Only this message again
- Should Be Equal As Numbers ${str1} ${str1}.${str0}${str0}
- Should Be Equal As Numbers ${str1}.000001
${str1}.${str0}${str0}${str1} Only this message again False
+ Should Be Equal As Numbers ${STR1} ${STR1}.${STR0}${STR0}
+ Should Be Equal As Numbers ${STR1}.000001
${STR1}.${STR0}${STR0}${STR1} Only this message again False
Should Not Be Equal As Strings
[Documentation] FAIL These strings most certainly should not be equal
@@ -98,7 +98,7 @@
Should Start With
[Documentation] FAIL My message: 'This is a big longer sentence and
it even has a friend here. This is the friend of the previous sentence --
also this is quite long, actually even longer than its friend.' does not
start with 'Whatever'
- Should Start With ${str0}${str0}7 00
+ Should Start With ${STR0}${STR0}7 00
Should Start With This is a big longer sentence and it even has a
friend here. This is the friend of the previous sentence -- also this is
quite long, actually even longer than its friend. Whatever My message
Should Not End With
@@ -108,8 +108,8 @@
Should End With
[Documentation] FAIL '007' does not end with '00'
- Should End With ${str0}${str0}7 007
- Should End With ${str0}${str0}7 00
+ Should End With ${STR0}${STR0}7 007
+ Should End With ${STR0}${STR0}7 00
Should Not Contain
[Documentation] FAIL 'Hello yet again' contains 'yet'
==============================================================================
Revision: 8ee1d8e4d36e
Author: Pekka Klärck
Date: Wed Apr 20 03:57:25 2011
Log: tests for Should (Not) Be Equal enhancements
http://code.google.com/p/robotframework/source/detail?r=8ee1d8e4d36e
Modified:
/atest/robot/standard_libraries/builtin/verify.txt
/atest/testdata/standard_libraries/builtin/verify.txt
=======================================
--- /atest/robot/standard_libraries/builtin/verify.txt Wed Apr 20 03:27:45
2011
+++ /atest/robot/standard_libraries/builtin/verify.txt Wed Apr 20 03:57:25
2011
@@ -30,10 +30,20 @@
Check test case ${TESTNAME}
Should Not Be Equal
- Check test case ${TESTNAME}
+ ${tc}= Check test case ${TESTNAME}
+ Verify argument type message ${tc.kws[0].msgs[0]} unicode unicode
+ Verify argument type message ${tc.kws[1].msgs[0]} unicode long
+ Verify argument type message ${tc.kws[2].msgs[0]} unicode unicode
Should Be Equal
- Check test case ${TESTNAME}
+ ${tc}= Check test case ${TESTNAME}
+ Verify argument type message ${tc.kws[0].msgs[0]} unicode unicode
+ Verify argument type message ${tc.kws[1].msgs[0]} long long
+ Verify argument type message ${tc.kws[2].msgs[0]} unicode unicode
+
+Should Be Equal When Types Differ But String Representations Are Same
+ ${tc}= Check test case ${TESTNAME}
+ Verify argument type message ${tc.kws[0].msgs[0]} unicode long
Should Not Be Equal As Integers
Check test case ${TESTNAME}
@@ -176,3 +186,9 @@
Check Log Message ${tc.kws[3].kws[0].msgs[0]} Item found from the
first item 50 times
Check Log Message ${tc.kws[4].kws[0].msgs[0]} Item found from the
first item 0 times
+
+*** Keywords ***
+
+Verify argument type message
+ [Arguments] ${msg} ${type1} ${type2}
+ Check log message ${msg} Argument types
are:\n<type '${type1}'>\n<type '${type2}'>
=======================================
--- /atest/testdata/standard_libraries/builtin/verify.txt Wed Apr 20
03:30:40 2011
+++ /atest/testdata/standard_libraries/builtin/verify.txt Wed Apr 20
03:57:25 2011
@@ -51,12 +51,18 @@
Should Not Be Equal
[Documentation] FAIL 1 == 1
Should Not Be Equal ${STR1} Not ${STR1}
+ Should Not Be Equal ${STR1} ${INT1}
Should Not Be Equal ${STR1} 1
Should Be Equal
- [Documentation] FAIL Error message: 1 != 1
+ [Documentation] FAIL Error message: A != B
Should Be Equal ${STR1} 1
- Should Be Equal ${STR1} ${INT1} Error message
+ Should Be Equal ${INT1} ${1}
+ Should Be Equal A B Error message
+
+Should Be Equal When Types Differ But String Representations Are Same
+ [Documentation] FAIL Error message: 1 (string) != 1 (number)
+ Should Be Equal ${STR1} ${INT1}
Should Not Be Equal As Integers
[Documentation] FAIL This message only
==============================================================================
Revision: 71e7bb17b04d
Author: Pekka Klärck
Date: Wed Apr 20 03:57:39 2011
Log: merge heads
http://code.google.com/p/robotframework/source/detail?r=71e7bb17b04d
==============================================================================
Revision: 094e0044483a
Author: Pekka Klärck
Date: Wed Apr 20 03:59:04 2011
Log: expected error fix
http://code.google.com/p/robotframework/source/detail?r=094e0044483a
Modified:
/atest/testdata/standard_libraries/builtin/verify.txt
=======================================
--- /atest/testdata/standard_libraries/builtin/verify.txt Wed Apr 20
03:57:25 2011
+++ /atest/testdata/standard_libraries/builtin/verify.txt Wed Apr 20
03:59:04 2011
@@ -61,7 +61,7 @@
Should Be Equal A B Error message
Should Be Equal When Types Differ But String Representations Are Same
- [Documentation] FAIL Error message: 1 (string) != 1 (number)
+ [Documentation] FAIL 1 (string) != 1 (number)
Should Be Equal ${STR1} ${INT1}
Should Not Be Equal As Integers
