[robotframework commit] r1080 - in trunk/atest: robot/variables testdata/variables

[codesite-noreply]

Author: laukpe
Date: Mon Nov 24 04:22:28 2008
New Revision: 1080
Added:
   trunk/atest/robot/variables/commandline_variable_files.html
      - copied, changed from r1077,  
/trunk/atest/robot/variables/commandline_variables.html
   trunk/atest/testdata/variables/commandline_variable_files.html
      - copied unchanged from r1077,  
/trunk/atest/testdata/variables/commandline_variables.html
Modified:
   trunk/atest/robot/variables/commandline_variables.html
   trunk/atest/testdata/variables/commandline_variables.html

Log:
moved cli varfile tests to their own suite

Copied: trunk/atest/robot/variables/commandline_variable_files.html (from  
r1077, /trunk/atest/robot/variables/commandline_variables.html)
==============================================================================
--- /trunk/atest/robot/variables/commandline_variables.html     (original)
+++ trunk/atest/robot/variables/commandline_variable_files.html	Mon Nov 24  
04:22:28 2008
@@ -120,7 +120,7 @@
 </tr>
 </thead>
 <tbody>
-<tr><td>Normal Text</td><td>Check Test Case</td><td>Normal  
Text</td><td></td><td></td><td></td><td></td></tr><tr><td>Escaped  
Text</td><td>Check Test Case</td><td>Escaped  
Text</td><td></td><td></td><td></td><td></td></tr><tr><td>No Colon In  
Variable</td><td>Check Test Case</td><td>No Colon In  
Variable</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr>
+<tr>
 <td>Variables From Variable File</td>
 <td>Check Test Case</td>
 <td>Variables From Variable File</td>
@@ -152,20 +152,14 @@
 </tr>
 </thead>
 <tbody>
-<tr>
-<td>Run Test Data</td>
-<td align="undefined" valign="undefined"></td><td align="undefined"  
valign="undefined"></td><td align="undefined" valign="undefined"></td><td  
align="undefined" valign="undefined"></td>
-

-
-</tr>
-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>${escaped}  
=</td><td>Set  
Variable</td><td>QUOTIAPOSll take spam AMP  
eggsEXCLAMEXCLAMQUOT</td><td></td></tr><tr><td></td><td>${escaped2}  
=</td><td>Set  
Variable</td><td>DOLLARCURLY1notvarCURLY2</td><td></td></tr><tr><td></td><td  
align="undefined" valign="undefined">${vardir} =</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">
+<tr><td>Run Test Data</td><td align="undefined"  
valign="undefined">${vardir} =</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">
 ${CURDIR}${/}..${/}..${/}testdata</td><td align="undefined"  
valign="undefined">
-variables${/}resvarfiles</td></tr><tr><td></td><td align="undefined"  
valign="undefined">${varfile} =&nbsp;</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">${vardir}</td><td align="undefined"  
valign="undefined">cli_vars.py</td></tr><tr><td></td><td align="undefined"  
valign="undefined">${varfile2} =&nbsp;</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">${vardir}</td><td align="undefined"  
valign="undefined">cli_vars_2.py</td></tr><tr><td></td><td>${options}  
=</td><td>Catenate</td><td>--variable NORMAL_TEXT:Hello</td><td>--variable  
no_colon</td></tr><tr><td></td><td>...</td><td>-v  
ESCAPED:${escaped<br>.replace(' ', 'SPACE')}</td><td>--variable  
eScApEd2:${escaped2}</td><td></td></tr><tr><td></td><td>...</td><td>--variablefile  
${varfile}</td><td>-V  
${varfile2}</td><td></td></tr><tr><td></td><td>...</td><td>-E  
quot:QUOT<br></td><td>-E apos:APOS</td><td>-E  
dollar:DOLLAR</td></tr><tr><td></td><td>...</td><td>-E amp:AMP</td><td>-E  
space:SPACE</td><td>-E  
exclam:EXCLAM</td></tr><tr><td></td><td>...</td><td>-E  
curly1:CURLY1</td><td>-E curly2:CURLY2</td><td></td></tr><tr>
+variables${/}resvarfiles</td></tr><tr><td></td><td align="undefined"  
valign="undefined">${varfile} =&nbsp;</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">${vardir}</td><td align="undefined"  
valign="undefined">cli_vars.py</td></tr><tr><td></td><td align="undefined"  
valign="undefined">${varfile2} =&nbsp;</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">${vardir}</td><td align="undefined"  
valign="undefined">cli_vars_2.py</td></tr><tr>
 <td></td>
 <td>Run Tests</td>
-<td>${options}</td>
-<td>variables${/}commandline_variables.html</td>
+<td>--variablefile ${varfile}<br>-V ${varfile2}</td>
+<td>variables${/}commandline_variable_files.html</td>
 <td></td>
 </tr>
 </tbody>

Modified: trunk/atest/robot/variables/commandline_variables.html
==============================================================================
--- trunk/atest/robot/variables/commandline_variables.html      (original)
+++ trunk/atest/robot/variables/commandline_variables.html	Mon Nov 24  
04:22:28 2008
@@ -120,24 +120,8 @@
 </tr>
 </thead>
 <tbody>
-<tr><td>Normal Text</td><td>Check Test Case</td><td>Normal  
Text</td><td></td><td></td><td></td><td></td></tr><tr><td>Escaped  
Text</td><td>Check Test Case</td><td>Escaped  
Text</td><td></td><td></td><td></td><td></td></tr><tr><td>No Colon In  
Variable</td><td>Check Test Case</td><td>No Colon In  
Variable</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr>
-<td>Variables From Variable File</td>
-<td>Check Test Case</td>
-<td>Variables From Variable File</td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>Variables From Variable File Using 'get_variables'</td>
-<td>Check Test Case</td>
-<td>Variables From Variable File Using 'get_variables'</td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
+<tr><td>Normal Text</td><td>Check Test Case</td><td>Normal  
Text</td><td></td><td></td><td></td><td></td></tr><tr><td>Escaped  
Text</td><td>Check Test Case</td><td>Escaped  
Text</td><td></td><td></td><td></td><td></td></tr><tr><td>No Colon In  
Variable</td><td>Check Test Case</td><td>No Colon In  
Variable</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+
 </tbody>
 </table>
 <table border="1">
@@ -152,16 +136,8 @@
 </tr>
 </thead>
 <tbody>
-<tr>
-<td>Run Test Data</td>
-<td align="undefined" valign="undefined"></td><td align="undefined"  
valign="undefined"></td><td align="undefined" valign="undefined"></td><td  
align="undefined" valign="undefined"></td>
-

-
-</tr>
-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>${escaped}  
=</td><td>Set  
Variable</td><td>QUOTIAPOSll take spam AMP  
eggsEXCLAMEXCLAMQUOT</td><td></td></tr><tr><td></td><td>${escaped2}  
=</td><td>Set  
Variable</td><td>DOLLARCURLY1notvarCURLY2</td><td></td></tr><tr><td></td><td  
align="undefined" valign="undefined">${vardir} =</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">
-${CURDIR}${/}..${/}..${/}testdata</td><td align="undefined"  
valign="undefined">
-variables${/}resvarfiles</td></tr><tr><td></td><td align="undefined"  
valign="undefined">${varfile} =&nbsp;</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">${vardir}</td><td align="undefined"  
valign="undefined">cli_vars.py</td></tr><tr><td></td><td align="undefined"  
valign="undefined">${varfile2} =&nbsp;</td><td align="undefined"  
valign="undefined">Join&nbsp;Path</td><td align="undefined"  
valign="undefined">${vardir}</td><td align="undefined"  
valign="undefined">cli_vars_2.py</td></tr><tr><td></td><td>${options}  
=</td><td>Catenate</td><td>--variable NORMAL_TEXT:Hello</td><td>--variable  
no_colon</td></tr><tr><td></td><td>...</td><td>-v  
ESCAPED:${escaped<br>.replace(' ', 'SPACE')}</td><td>--variable  
eScApEd2:${escaped2}</td><td></td></tr><tr><td></td><td>...</td><td>--variablefile  
${varfile}</td><td>-V  
${varfile2}</td><td></td></tr><tr><td></td><td>...</td><td>-E  
quot:QUOT<br></td><td>-E apos:APOS</td><td>-E  
dollar:DOLLAR</td></tr><tr><td></td><td>...</td><td>-E amp:AMP</td><td>-E  
space:SPACE</td><td>-E  
exclam:EXCLAM</td></tr><tr><td></td><td>...</td><td>-E  
curly1:CURLY1</td><td>-E curly2:CURLY2</td><td></td></tr><tr>
+<tr><td>Run Test Data</td><td>${escaped} =</td><td>Set  
Variable</td><td>QUOTIAPOSll take spam AMP  
eggsEXCLAMEXCLAMQUOT</td><td># "I'll take&nbsp;spam  
&amp;&nbsp;eggs!!"</td></tr><tr><td></td><td>${escaped2} =</td><td>Set  
Variable</td><td>DOLLARCURLY1notvarCURLY2</td><td>#  
\${notvar}</td></tr><tr><td></td><td>${options}  
=</td><td>Catenate</td><td>--variable NORMAL_TEXT:Hello</td><td>--variable  
no_colon</td></tr><tr><td></td><td>...</td><td>-v  
ESCAPED:${escaped<br>.replace(' ', 'SPACE')}</td><td>--variable  
eScApEd2:${escaped2}</td><td></td></tr><tr><td></td><td>...</td><td>-E  
quot:QUOT<br></td><td>-E apos:APOS</td><td>-E  
dollar:DOLLAR</td></tr><tr><td></td><td>...</td><td>-E amp:AMP</td><td>-E  
space:SPACE</td><td>-E  
exclam:EXCLAM</td></tr><tr><td></td><td>...</td><td>-E  
curly1:CURLY1</td><td>-E curly2:CURLY2</td><td></td></tr><tr>
 <td></td>
 <td>Run Tests</td>
 <td>${options}</td>

Modified: trunk/atest/testdata/variables/commandline_variables.html
==============================================================================
--- trunk/atest/testdata/variables/commandline_variables.html   (original)
+++ trunk/atest/testdata/variables/commandline_variables.html	Mon Nov 24  
04:22:28 2008
@@ -96,13 +96,7 @@
 </tr>
 </thead>
 <tbody>
-<tr>
-<td>${EXPECTED LIST}</td>
-<td>List</td>
-<td>variable</td>
-<td>value</td>
-<td></td>
-</tr>
+
 <tr>
 <td></td>
 <td></td>
@@ -143,7 +137,7 @@
 <td></td>


-</tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Variables  
From  
Variable File</td><td>Should Be Equal</td><td>${SCALAR}</td><td>Scalar  
from variable file from CLI</td><td></td></tr><tr><td></td><td>Should Be  
Equal</td><td>${SCALAR&nbsp;WITH ESCAPES}</td><td>1 \\ 2\\\\  
\${inv}</td><td></td></tr><tr><td></td><td>Should Be Equal</td><td>${SCALAR  
LIST}</td><td>${EXPECTED LIST}</td><td></td></tr><tr><td></td><td>Should Be  
True</td><td>@{LIST} == ${EXPECTED  
LIST}</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Variables  
From Variable File Using 'get_variables'</td><td>Should Be  
Equal</td><td>${ANOTHER SCALAR}</td><td>Variable from CLI var file with  
get_variables</td><td></td></tr><tr><td></td><td>Should Be  
True</td><td>@{ANOTHER LIST} == ['List variable from CLI var file', 'with  
get_variables']&nbsp;</td><td></td><td></td></tr>
+</tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
 </tbody>
 </table>
 <table border="1">