Author: pekka.klarck
Date: Tue Apr  7 12:37:48 2009
New Revision: 1728

Modified:
   trunk/atest/robot/standard_libraries/builtin/variable_should_exist.html
trunk/atest/testdata/standard_libraries/builtin/variable_should_exist.html

Log:
Allow also Variable Should (Not) Exist to be used with normal variable name and not only with escaped name (issue 278)

Modified: trunk/atest/robot/standard_libraries/builtin/variable_should_exist.html
==============================================================================
--- trunk/atest/robot/standard_libraries/builtin/variable_should_exist.html (original) +++ trunk/atest/robot/standard_libraries/builtin/variable_should_exist.html Tue Apr 7 12:37:48 2009
@@ -379,7 +379,7 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+<tr>
 <td>Variable Should Exist With Given Error Message</td>
 <td align="undefined" valign="undefined">Check Test Case</td>
 <td align="undefined" valign="undefined">Variable Should Exist With
@@ -388,7 +388,7 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+<tr><td>Variable Should Exist With&nbsp;Error Message Containing Variables</td><td>Check Test Case</td><td>Variable Should Exist With&nbsp;Error Message Containing Variables</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
 <td>Variable Should Exist&nbsp;Using $name format</td>
 <td align="undefined" valign="undefined">Check Test Case</td>
 <td align="undefined" valign="undefined">Variable Should
@@ -397,7 +397,8 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+<tr><td>Variable Should Exist&nbsp;Using Escaped format</td><td align="undefined" valign="undefined">Check Test Case</td><td align="undefined" valign="undefined">Variable Should +Exist&nbsp;Using Escaped format</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
 <td>Variable Should Exist With Built In Variables</td>
 <td>Check Test Case</td>
 <td>Variable Should Exist With Built In Variables</td>
@@ -413,7 +414,7 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Variable Should Exist With Extended Variable Syntax And Missing
+<tr><td>Variable Should Exist With Extended Variable Syntax And Missing
Object</td><td>Check Test Case</td><td>Variable Should Exist With Extended Variable Syntax And Missing Object</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
 <td>Variable Should Exist With Invalid name</td>
@@ -424,22 +425,9 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
-<td>Variable Should Exist With&nbsp;Empty name</td>
-<td align="undefined" valign="undefined">Check Test Case</td>
-<td align="undefined" valign="undefined">Variable Should Exist
-With&nbsp;Empty name</td>
-<td></td>
-<td></td>
-</tr>
+<tr><td></td><td></td><td></td><td></td><td></td></tr>
+

-<tr>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>

 <tr>
 <td></td>
@@ -451,7 +439,7 @@

 <tr>
 <td align="undefined" valign="undefined">Variable Should Not Exist
-With&nbsp;Default error message</td>
+With Default error message</td>
 <td align="undefined" valign="undefined">Check Test Case</td>
 <td align="undefined" valign="undefined">Variable Should Not Exist
 With&nbsp;Default error message</td>
@@ -459,7 +447,7 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+<tr>
 <td>Variable Should Not Exist With Given Error Message</td>
 <td align="undefined" valign="undefined">Check Test Case</td>
 <td align="undefined" valign="undefined">Variable Should Not Exist
@@ -468,16 +456,17 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
-<td>Variable Should Not Exist&nbsp;Using the $name format</td>
+<tr><td>Variable Should Not Exist With Error Message Containing Variables</td><td>Check Test Case</td><td>Variable Should Not Exist With&nbsp;Error Message Containing Variables</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+<td>Variable Should Not Exist Using $name format</td>
 <td align="undefined" valign="undefined">Check Test Case</td>
 <td align="undefined" valign="undefined">Variable Should Not
-Exist&nbsp;Using the $name format</td>
+Exist&nbsp;Using&nbsp;$name format</td>
 <td></td>
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+<tr><td>Variable Should Not Exist&nbsp;Using Escaped format</td><td align="undefined" valign="undefined">Check Test Case</td><td align="undefined" valign="undefined">Variable Should Not +Exist&nbsp;Using Escaped Format</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
 <td>Variable Should Not Exist With Built In Variables</td>
 <td>Check Test Case</td>
 <td>Variable Should Not Exist With Built In Variables</td>
@@ -494,7 +483,7 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Variable Should Not Exist With Extended Variable Syntax And
+<tr><td>Variable Should Not Exist With Extended Variable Syntax And
Missing Object</td><td>Check Test Case</td><td>Variable Should Not Exist With Extended Variable Syntax And Missing Object</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
 <td>Variable Should Not Exist With&nbsp;Invalid name</td>
@@ -505,14 +494,7 @@
 <td></td>
 </tr>

-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
-<td>Variable Should Not Exist With Empty Name</td>
-<td align="undefined" valign="undefined">Check Test Case</td>
-<td align="undefined" valign="undefined">Variable Should Not Exist
-With Empty Name</td>
-<td></td>
-<td></td>
-</tr>
+<tr><td></td><td></td><td></td><td></td><td></td></tr>

 <tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
 <td></td>

Modified: trunk/atest/testdata/standard_libraries/builtin/variable_should_exist.html
==============================================================================
--- trunk/atest/testdata/standard_libraries/builtin/variable_should_exist.html (original) +++ trunk/atest/testdata/standard_libraries/builtin/variable_should_exist.html Tue Apr 7 12:37:48 2009
@@ -140,8 +140,8 @@
 <th>Action</th>
 <th>Argument</th>
 <th>Argument</th>
-<th>Argument</th>
-<th>Argument</th>
+
+
 </tr>
 </thead>

@@ -171,28 +171,28 @@
 <td>FAIL</td>
 <td>Variable \${non-existing}
 does not exist</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
 <td><br>
  </td>
 <td>Variable Should Exist</td>
-<td>\${scalar}</td>
+<td>${scalar}</td>
 <td><br>
 </td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
 <td></td>
 <td>Variable Should Exist</td>
-<td>\${non-existing}</td>
-<td></td>
-<td></td>
+<td>${non-existing}</td>
 <td></td>
+
+
 </tr>

 <tr>
@@ -200,8 +200,8 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -211,37 +211,37 @@
 <td>FAIL</td>
 <td>My non-default error
 message</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
 <td></td>
 <td>Variable Should Exist</td>
-<td>\${scalar}</td>
+<td>${scalar}</td>
 <td>This would be the error
 message</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
 <td></td>
 <td>Variable Should Exist</td>
-<td>\${non-existing}</td>
+<td>${non-existing}</td>
 <td>My non-default error
 message</td>
-<td></td>
-<td></td>
+
+
 </tr>

-<tr>
-<td></td>
-<td></td>
+<tr><td></td><td></td><td></td><td></td></tr><tr><td>Variable Should Exist With&nbsp;Error Message Containing Variables</td><td>[ Document ]</td><td>FAIL</td><td>Error with vars: ${scalar}</td></tr><tr><td></td><td>Variable Should Exist</td><td>${non-existing}</td><td>Error with vars: ${scalar}</td></tr><tr>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
+
+
 </tr>

 <tr>
@@ -251,8 +251,8 @@
 <td>FAIL</td>
 <td>Variable \${non-existing}
 does not exist</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -261,8 +261,8 @@
 <td>$scalar</td>
 <td>This would be the error
 message</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -270,17 +270,19 @@
 <td>Variable Should Exist</td>
 <td>$non-existing</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

-<tr>
-<td></td>
-<td></td>
+<tr><td></td><td></td><td></td><td></td></tr><tr><td>Variable Should
+Exist&nbsp;Using Escaped format</td><td>[ Document ]</td><td>FAIL</td><td>Variable \${non-existing} +does not exist</td></tr><tr><td></td><td>Variable Should Exist</td><td>\${scalar}</td><td></td></tr><tr><td></td><td>Variable Should Exist</td><td>\${non-existing}</td><td></td></tr><tr>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
+
+
 </tr>

 <tr>
@@ -288,8 +290,8 @@
 <td>Variable Should Exist</td>
 <td>\${TEMPDIR}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -297,8 +299,8 @@
 <td>Variable Should Exist</td>
 <td>\${/}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -306,8 +308,8 @@
 <td>Variable Should Exist</td>
 <td>\${10}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -315,8 +317,8 @@
 <td>Variable Should Exist</td>
 <td>\${TRUE}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -324,8 +326,8 @@
 <td>Variable Should Exist</td>
 <td>\${CURDIR}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -333,8 +335,8 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -342,8 +344,8 @@
 <td>[ Document ]</td>
 <td>FAIL</td>
 <td>Variable \${length attribute.missing} does not exist</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -352,8 +354,8 @@
 <td>\${length
 attribute.length}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -361,8 +363,8 @@
 <td>Variable Should Exist</td>
 <td>\${length attribute.missing}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -370,8 +372,8 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -380,8 +382,8 @@
 <td>[ Document ]</td>
 <td>FAIL</td>
 <td>Variable&nbsp;\${missing.missing} does not exist</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -389,8 +391,8 @@
 <td>Variable Should Exist</td>
 <td>\${missing.missing}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -398,8 +400,8 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -409,8 +411,8 @@
 <td>FAIL</td>
 <td>Invalid variable syntax
 'invalid'</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -418,48 +420,25 @@
 <td>Variable Should Exist</td>
 <td>invalid</td>
 <td></td>
-<td></td>
-<td></td>
-</tr>

-<tr>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>

-<tr>
-<td>Variable Should Exist
-With&nbsp;Empty name</td>
-<td>[ Document ]</td>
-<td>FAIL</td>
-<td>Invalid variable syntax
-''</td>
-<td></td>
-<td></td>
 </tr>

-<tr>
+<tr><td></td><td></td><td></td><td></td></tr><tr>
 <td></td>
-<td>Variable Should Exist</td>
-<td>\</td>
 <td></td>
 <td></td>
 <td></td>
-</tr>

-<tr>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
+
 </tr>

+
+
+
+
+
+
 <tr>
 <td>Variable Should Not Exist
 With&nbsp;Default error message</td>
@@ -467,8 +446,8 @@
 <td>FAIL</td>
 <td>Variable&nbsp;\${scalar}
 exists</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -476,20 +455,20 @@
  </td>
 <td>Variable Should Not
 Exist&nbsp;</td>
-<td>\${non-existing}</td>
-<td></td>
-<td></td>
+<td>${non-existing}</td>
 <td></td>
+
+
 </tr>

 <tr>
 <td></td>
 <td>Variable Should Not
 Exist&nbsp;</td>
-<td>\${scalar}</td>
-<td></td>
-<td></td>
+<td>${scalar}</td>
 <td></td>
+
+
 </tr>

 <tr>
@@ -497,8 +476,8 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -508,38 +487,39 @@
 <td>FAIL</td>
 <td>This is the error
 message</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
 <td></td>
 <td>Variable Should Not
 Exist&nbsp;</td>
-<td>\${non-existing}</td>
+<td>${non-existing}</td>
 <td>This should not fail</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
 <td></td>
 <td>Variable Should Not
 Exist&nbsp;</td>
-<td>\${scalar}</td>
+<td>${scalar}</td>
 <td>This is the error
 message</td>
-<td></td>
-<td></td>
+
+
 </tr>

-<tr>
-<td></td>
-<td></td>
+<tr><td></td><td></td><td></td><td></td></tr><tr><td>Variable Should Not Exist With Error Message Containing Variables</td><td>[ Document ]</td><td>FAIL</td><td>Error with vars: ${scalar} &amp; ${42}</td></tr><tr><td></td><td>Variable Should Not +Exist&nbsp;</td><td>${scalar}</td><td>Error with vars: ${scalar} &amp; ${42}</td></tr><tr>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
+
+
 </tr>

 <tr>
@@ -547,8 +527,8 @@
 <td>[ Document ]</td>
 <td>FAIL</td>
 <td>Variable \${10} exists</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -556,8 +536,8 @@
 <td>Variable Should Not Exist&nbsp;</td>
 <td>\${10}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -565,8 +545,8 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -574,8 +554,8 @@
 <td>[ Document ]</td>
 <td>FAIL</td>
 <td>Variable \${length attribute.length} exists</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -583,8 +563,8 @@
 <td>Variable Should Not Exist&nbsp;</td>
 <td>\${length attribute.missing}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -592,8 +572,8 @@
 <td>Variable Should Not Exist&nbsp;</td>
 <td>\${length attribute.length}</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -601,8 +581,8 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -612,8 +592,8 @@
 <td>\${missing.missing}</td>
 <td><br>
 </td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -621,19 +601,18 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
-<td>Variable Should Not
-Exist&nbsp;Using the $name format</td>
+<td>Variable Should Not Exist Using $name format</td>
 <td>[ Document ]</td>
 <td>FAIL</td>
 <td>Variable&nbsp;\${scalar}
 exists</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -642,8 +621,8 @@
 Exist&nbsp;</td>
 <td>$non-existing</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -652,17 +631,21 @@
 Exist&nbsp;</td>
 <td>$scalar</td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>

-<tr>
-<td></td>
-<td></td>
+<tr><td></td><td></td><td></td><td></td></tr><tr><td>Variable Should Not
+Exist&nbsp;Using Escaped format</td><td>[ Document ]</td><td>FAIL</td><td>Variable&nbsp;\${scalar}
+exists</td></tr><tr><td></td><td>Variable Should Not
+Exist&nbsp;</td><td>\${non-existing}</td><td></td></tr><tr><td></td><td>Variable Should Not
+Exist&nbsp;</td><td>\${scalar}</td><td></td></tr><tr>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
+
+
 </tr>

 <tr>
@@ -672,8 +655,8 @@
 <td>FAIL</td>
 <td>Invalid variable syntax
 'invalid'</td>
-<td></td>
-<td></td>
+
+
 </tr>

 <tr>
@@ -682,47 +665,30 @@
 Exist&nbsp;</td>
 <td>invalid</td>
 <td></td>
-<td></td>
-<td></td>
-</tr>

-<tr>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>

-<tr>
-<td>Variable Should Not Exist
-With Empty Name</td>
-<td>[ Document ]</td>
-<td>FAIL</td>
-<td>Invalid variable syntax
-''</td>
-<td></td>
-<td></td>
 </tr>

 <tr>
 <td></td>
-<td>Variable Should Not
-Exist&nbsp;</td>
-<td>\</td>
 <td></td>
 <td></td>
 <td></td>
+
+
 </tr>

+
+
+
+
 <tr>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>


@@ -1018,8 +984,8 @@
 <td></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
+
+
 </tr>
 </tbody>
 </table>

Reply via email to