Revision: 2076
Author: pekka.klarck
Date: Wed Jul 29 00:57:06 2009
Log: removed tests related to variable existence (will be added to their own suite) and some other cleanup
http://code.google.com/p/robotframework/source/detail?r=2076

Modified:
 /trunk/atest/robot/standard_libraries/builtin/setting_variables.html
/trunk/atest/testdata/standard_libraries/builtin/setting_variables/variables.html

=======================================
--- /trunk/atest/robot/standard_libraries/builtin/setting_variables.html Wed Jul 29 00:15:42 2009 +++ /trunk/atest/robot/standard_libraries/builtin/setting_variables.html Wed Jul 29 00:57:06 2009
@@ -114,7 +114,7 @@
 <td class="name"><a name="test_Set Variable">Set Variable</a></td>
 <td>${tc} =</td>
 <td>Check Test Case</td>
-<td>Set Variable</td>
+<td>${TESTNAME}</td>
 <td></td>
 </tr>
 <tr>
@@ -124,10 +124,10 @@
 <td>\${var} = Hello</td>
 <td></td>
 </tr>
-<tr>
+<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td class="name">Set Variable With More Or Less Than One Value is Deprecated in RF 2.1</td><td>${tc} =</td><td>Check Test Case</td><td>${TESTNAME}</td><td></td></tr><tr>
 <td class="name"></td>
 <td>Check Log Message</td>
-<td>${tc.kws[7].msgs[0]}</td>
+<td>${tc.kws[0].msgs[0]}</td>
 <td>Using 'Set Variable' keyword with more or less than one argument is
deprecated in Robot Framework 2.1 and that usage will be removed in 2.2.</td>
 <td>WARN</td>
@@ -135,7 +135,7 @@
 <tr>
 <td class="name"></td>
 <td>Check Log Message</td>
-<td>${tc.kws[13].msgs[0]}</td>
+<td>${tc.kws[6].msgs[0]}</td>
 <td>Using 'Set Variable' keyword with more or less than one argument is
deprecated in Robot Framework 2.1 and that usage will be removed in 2.2.</td>
 <td>WARN</td>
@@ -295,53 +295,47 @@


 <tr>
-<td class="name"><a name="test_Set Test Variable">Set Test Variable</a></td>
+<td class="name">Set Test Variable - Scalars</td>
 <td>Check Test Case</td>
-<td>Set Test Variable - Scalars</td>
+<td>${TESTNAME}</td>
 <td></td>
 <td></td>
 </tr>
 <tr>
-<td class="name"></td>
+<td class="name">Set Test Variable - Lists</td>
 <td>Check Test Case</td>
-<td>Set Test Variable - Lists</td>
+<td>${TESTNAME}</td>
 <td></td>
 <td></td>
 </tr>
 <tr>
-<td class="name"></td>
+<td class="name">Set Test Variable Needing Escaping</td>
 <td>Check Test Case</td>
-<td>Set Test Variable Needing Escaping</td>
+<td>${TESTNAME}</td>
 <td></td>
 <td></td>
 </tr>
 <tr>
-<td class="name"></td>
+<td class="name">Set Test Variable in User Keyword</td>
 <td>Check Test Case</td>
-<td>Set Test Variable in User Keyword</td>
+<td>${TESTNAME}</td>
 <td></td>
 <td></td>
 </tr>
 <tr>
-<td class="name"></td>
+<td class="name">Set Test Variable Not Affecting Other Tests</td>
 <td>Check Test Case</td>
-<td>Set Test Variable Not Affecting Other Tests</td>
+<td>${TESTNAME}</td>
 <td></td>
 <td></td>
 </tr>
+<tr><td>Check Test Vars Set In One Suite Are Not Available In Another</td><td>Check Test Case</td><td>${TESTNAME}</td><td></td></tr>
 <tr>
 <td class="name"></td>
-<td>Check Test Case</td>
-<td>Check Test Vars Set In One Suite Are Not Available In Another</td>
 <td></td>
 <td></td>
-</tr>
-<tr>
-<td class="name"></td>
 <td></td>
 <td></td>
-<td></td>
-<td></td>
 </tr>
 <tr>
<td class="name"><a name="test_Set Suite Variable">Set Suite Variable</a></td>
@@ -357,26 +351,20 @@
 <td></td>
 <td></td>
 </tr>
-<tr>
-<td class="name"></td>
+<tr><td class="name"></td><td>Check Suite Teardown Passed</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr> +<td class="name">Check Suite Vars Set In One Suite Are Not Available In Another</td>
 <td>Check Test Case</td>
 <td>Check Suite Vars Set In One Suite Are Not Available In Another</td>
 <td></td>
 <td></td>
 </tr>
+
 <tr>
 <td class="name"></td>
-<td>Check Suite Teardown Passed</td>
 <td></td>
 <td></td>
 <td></td>
-</tr>
-<tr>
-<td class="name"></td>
 <td></td>
-<td></td>
-<td></td>
-<td></td>
 </tr>
 <tr>
<td class="name"><a name="test_Set Global Variables">Set Global Variables</a></td>
@@ -392,26 +380,20 @@
 <td></td>
 <td></td>
 </tr>
-<tr>
-<td class="name"></td>
+<tr><td class="name"></td><td>Check Suite Teardown Passed</td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr> +<td class="name">Check Global Vars Set In One Suite Are Available In Another</td>
 <td>Check Test Case</td>
 <td>Check Global Vars Set In One Suite Are Available In Another</td>
 <td></td>
 <td></td>
 </tr>
+
 <tr>
 <td class="name"></td>
-<td>Check Suite Teardown Passed</td>
 <td></td>
 <td></td>
 <td></td>
-</tr>
-<tr>
-<td class="name"></td>
 <td></td>
-<td></td>
-<td></td>
-<td></td>
 </tr>
 <tr>
<td class="name"><a name="test_Variable Scopes And Overriding">Variable Scopes And Overriding</a></td>
@@ -434,7 +416,7 @@
 <td></td>
 <td></td>
 </tr>
-<tr>
+<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Overiding&nbsp;variable when it has&nbsp;non-string value</td><td>Check Test Case</td><td>${TEST NAME}</td><td></td><td></td></tr><tr>
 <td class="name"></td>
 <td></td>
 <td></td>
@@ -531,29 +513,9 @@
 <td></td>
 <td></td>
 </tr>
-<tr>
-<td class="name"><a name="test_Checking Variable Existence In User Keyword When Variable Name Is Argument">Checking Variable Existence In User Keyword When Variable Name Is Argument</a></td>
-<td>Check Test Case</td>
-<td>${TEST NAME}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"><a name="keyword_Check Variable Does Not Exist In UK">Check -Variable Exists When Variable Exists And It Has Variable Like Value</a><a name="test_Checking Variable Existence In User Keyword When Variable Name Is Argument"></a></td><td>Check Test Case</td><td>${TEST NAME}</td>


-<td></td>
-<td></td>
-</tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td class="name"><a name="keyword_Check Variable Does Not Exist In UK">Variable Does Not Exist Fails When Variable Exists And It Has Variable Like -Value</a><a name="test_Checking Variable Existence In User Keyword When Variable Name Is Argument"></a></td><td>Check Test Case</td><td>${TEST NAME}</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Overiding variable when it has&nbsp;string value</td><td>Check Test Case</td><td>${TEST NAME}</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Overiding&nbsp;variable when it has&nbsp;non-string value</td><td>Check Test Case</td><td>${TEST NAME}</td><td></td><td></td></tr>
+
 </tbody></table>
 <table id="keywords" border="1">
 <tbody><tr>
=======================================
--- /trunk/atest/testdata/standard_libraries/builtin/setting_variables/variables.html Wed Jul 29 00:15:42 2009 +++ /trunk/atest/testdata/standard_libraries/builtin/setting_variables/variables.html Wed Jul 29 00:57:06 2009
@@ -171,15 +171,9 @@
 <td>${LIST}</td>
 <td></td>
 </tr>
-<tr>
-<td class="name"></td>
-<td>Comment</td>
-<td>Usage below deprecated in RF 2.1</td>
-<td>and should be removed in 2.2.</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
+
+<tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
+<td class="name">Set Variable With More Or Less Than One Value is Deprecated in RF 2.1</td>
 <td>${var1}</td>
 <td>${var2} =</td>
 <td>Set Variable</td>
@@ -1444,7 +1438,7 @@
 <td>New value 3</td>
 <td></td>
 </tr>
-<tr>
+<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Overiding&nbsp;variable when it has&nbsp;non-string value</td><td>${v1} =</td><td>Set Variable</td><td>${1}</td><td></td></tr><tr><td></td><td>${v2} =</td><td>Create List</td><td>a</td><td>b</td></tr><tr><td></td><td>Set Test Variable</td><td>${v1}</td><td>a string</td><td></td></tr><tr><td></td><td>Set Global Variable</td><td>${v2}</td><td>${42}</td><td></td></tr><tr><td></td><td>Should&nbsp;Be Equal</td><td>${v1} - ${v2}</td><td>a string - 42</td><td></td></tr><tr>
 <td class="name"></td>
 <td></td>
 <td></td>
@@ -1636,58 +1630,13 @@
 <td></td>
 <td></td>
 </tr>
-<tr>
-<td class="name"><a name="test_Checking Variable Existence In User Keyword When Variable Name Is Argument">Checking
-Variable Existence In User Keyword When Variable Name Is Argument</a></td>
-<td>Check Variable Does Not Exist In UK</td>
-<td>\${foo}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Variable Should Not Exist</td>
-<td>${foo}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Set Test Variable</td>
-<td>${foo}</td>
-<td>\${bar}</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Variable Exists In UK</td>
-<td>\${foo}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Variable Should Exist</td>
-<td>\${foo}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr><td class="name"><a name="keyword_Check Variable Does Not Exist In UK">Check -Variable Exists When Variable Exists And It Has Variable Like Value</a></td><td>${variable} =</td><td>Set Variable</td><td>\${value}</td><td></td></tr><tr><td></td><td>Variable Should Exist</td><td>\${variable}</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td class="name"><a name="keyword_Check Variable Does Not Exist In UK">Variable Does Not Exist Fails When Variable Exists And It Has Variable Like -Value</a></td><td>[Documentation]</td><td>FAIL</td><td>Variable \${variable} exists<br></td><td></td></tr><tr><td></td><td>${variable} =</td><td>Set Variable</td><td>\${value}</td><td></td></tr><tr>
-<td class="name"></td>
-<td>Variable Should Not Exist</td><td>\${variable}</td>
-
-<td></td>
-<td></td>
-</tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Overiding variable when it has&nbsp;string value</td><td>${x} =</td><td>Set Variable</td><td>Hello world!</td><td></td></tr><tr><td></td><td>Set Test Variable</td><td>${x}</td><td>Hei maailma!</td><td></td></tr><tr><td></td><td>Should Be Equal</td><td>${x}</td><td>Hei maailma!</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Overiding&nbsp;variable when it has&nbsp;non-string value</td><td>${int} =</td><td>Set Variable</td><td>${1}</td><td></td></tr><tr><td></td><td>${list} =</td><td>Create List</td><td>a</td><td>b</td></tr><tr><td></td><td>Set Test Variable</td><td>${int}</td><td>string 1</td><td></td></tr><tr><td></td><td>Set Global Variable</td><td>${list}</td><td>string 2</td><td></td></tr><tr><td></td><td>Should Be Equal</td><td>${int} - ${list}</td><td>string 1 - string 2</td><td></td></tr>
+
+
+
+
+
+
+
 </tbody>
 </table>
 <table id="keywords" border="1">
@@ -2479,51 +2428,13 @@
 <td></td>
 <td></td>
 </tr>
-<tr>
-<td class="name"><a name="keyword_Check Variable Exists In UK">Check Variable
-Exists In UK</a></td>
-<td>[Arguments]</td>
-<td>${variable name}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Variable Should Exist</td>
-<td>${variable name}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"><a name="keyword_Check Variable Does Not Exist In UK">Check
-Variable Does Not Exist In UK</a></td>
-<td>[Arguments]</td>
-<td>${variable name}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Variable Should Not Exist</td>
-<td>${variable name}</td>
-<td></td>
-<td></td>
-</tr>
-
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
+
+
+
+
+
+
+



Reply via email to