Revision: 4270
Author: pekka.klarck
Date: Tue Oct 26 08:34:23 2010
Log: Updated expected errors when using non-existing variables looking like
extended vars (e.g. ${non.ex} or ${non-ex}) or avoided this syntax
altogether. Ought to fix the tests that were broken after the change.
http://code.google.com/p/robotframework/source/detail?r=4270
Modified:
/trunk/atest/robot/core/invalid_syntax.txt
/trunk/atest/testdata/core/invalid_syntax.html
/trunk/atest/testdata/standard_libraries/builtin/repeat_keyword.txt
/trunk/atest/testdata/standard_libraries/builtin/run_keywords.txt
/trunk/atest/testdata/standard_libraries/builtin/set_variable_if.txt
=======================================
--- /trunk/atest/robot/core/invalid_syntax.txt Fri Sep 17 00:59:49 2010
+++ /trunk/atest/robot/core/invalid_syntax.txt Tue Oct 26 08:34:23 2010
@@ -14,7 +14,7 @@
Verify Error Library setting requires a name Setting
Verify Error Importing test library 'NonExistingLibrary' failed:
ImportError: Setting
Check Test Case Check Valid Library Import
- Verify Error Replacing variables from setting 'Library' failed:
Non-existing variable '\${unicode���}' Setting
+ Verify Error Replacing variables from setting 'Library' failed:
Resolving variable '\${unicode���}' failed: Non-existing
variable '\${unicode}'. Setting
Resource Imports
Verify Error Resource file 'non-existing-resource.html' does not
exist Setting
=======================================
--- /trunk/atest/testdata/core/invalid_syntax.html Wed May 26 07:30:39 2010
+++ /trunk/atest/testdata/core/invalid_syntax.html Tue Oct 26 08:34:23 2010
@@ -5409,7 +5409,7 @@
- <td align="undefined" valign="undefined">Non-existing
variable '\${non-existing}'.</td>
+ <td align="undefined" valign="undefined">Non-existing
variable '\${nonex}'.</td>
@@ -5476,7 +5476,7 @@
- <td align="undefined" valign="undefined">${non-existing}</td>
+ <td align="undefined" valign="undefined">${nonex}</td>
=======================================
--- /trunk/atest/testdata/standard_libraries/builtin/repeat_keyword.txt Fri
May 28 16:05:30 2010
+++ /trunk/atest/testdata/standard_libraries/builtin/repeat_keyword.txt Tue
Oct 26 08:34:23 2010
@@ -42,8 +42,8 @@
Repeat Keyword 1x @{items}
Repeated Keyword As Non-existing Variable
- [Documentation] FAIL Non-existing variable '\${non-existing}'.
- Repeat Keyword 1 x ${non-existing}
+ [Documentation] FAIL Non-existing variable '\${non existing}'.
+ Repeat Keyword 1 x ${non existing}
Argument To Repeated Keyword As Non-existing Variable
[Documentation] FAIL Non-existing variable '\${nonex}'.
=======================================
--- /trunk/atest/testdata/standard_libraries/builtin/run_keywords.txt Wed
Aug 18 04:58:46 2010
+++ /trunk/atest/testdata/standard_libraries/builtin/run_keywords.txt Tue
Oct 26 08:34:23 2010
@@ -36,8 +36,8 @@
Run keywords ${NOOP} ${PASSING} @{KEYWORDS} ${FAILING}
Non-existing variable as keyword name
- [Documentation] FAIL Non-existing variable '${NON-EXISTING}'.${ATD
ERR}
- Run keywords Not Executed ${NON-EXISTING} Not Executed
+ [Documentation] FAIL Non-existing variable '${NONEX}'.${ATD ERR}
+ Run keywords Not Executed ${NONEX} Not Executed
Non-existing keyword
[Documentation] FAIL No keyword with name 'Non-Existing' found.${ATD
ERR}
=======================================
--- /trunk/atest/testdata/standard_libraries/builtin/set_variable_if.txt
Tue Oct 26 08:25:18 2010
+++ /trunk/atest/testdata/standard_libraries/builtin/set_variable_if.txt
Tue Oct 26 08:34:23 2010
@@ -54,8 +54,8 @@
${var} = Set Variable If ${existing} ${now this breaks} Not used
Non-Existing Variables In Values 2
- [Documentation] FAIL Non-existing variable '\${nonex.variable}'.
- ${var} = Set Variable If False is True ${not used}
${nonex.variable}
+ [Documentation] FAIL Resolving variable '${nonex.extended}' failed:
Non-existing variable '${nonex}'.
+ ${var} = Set Variable If False is True ${not used}
${nonex.extended}
Non-Existing Variables In Values 3
[Documentation] FAIL Non-existing variable '\${ooooops}'.
