Author: laukpe
Date: Wed Nov 19 14:59:45 2008
New Revision: 1008
Modified:
trunk/atest/robot/variables/commandline_variables.html
trunk/atest/testdata/variables/commandline_variables.html
trunk/atest/testdata/variables/resvarfiles/cli_vars.py
trunk/atest/testdata/variables/resvarfiles/cli_vars_2.py
Log:
updated cli var tests to use new cli_vars*.py files under
variables/resvarfiles instead of using files from
core/resources_and_variables
Modified: trunk/atest/robot/variables/commandline_variables.html
==============================================================================
--- trunk/atest/robot/variables/commandline_variables.html (original)
+++ trunk/atest/robot/variables/commandline_variables.html Wed Nov 19
14:59:45 2008
@@ -68,7 +68,7 @@
</tr>
</thead>
<tbody>
-<tr><td>Documentation</td><td>These tests use variable files under
core/resources_and_variables.</td><td>Everythign there should be gone
through and moved under variables/ and possibly merged with files
there.</td><td></td><td></td></tr><tr>
+<tr><td>Documentation</td><td>How variables from CLI override other
variables is tested in
variable_priorities.html</td><td></td><td></td><td></td></tr><tr>
<td>Force Tags</td>
<td>pybot</td>
<td>jybot</td>
@@ -161,7 +161,7 @@
</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 Path</td><td align="undefined"
valign="undefined">
${CURDIR}${/}..${/}..${/}testdata</td><td align="undefined"
valign="undefined">
-core${/}resources_and_variables</td></tr><tr><td></td><td
align="undefined" valign="undefined">${varfile} = </td><td
align="undefined" valign="undefined">Join Path</td><td
align="undefined" valign="undefined">${vardir}</td><td align="undefined"
valign="undefined">vars_from_cli.py</td></tr><tr><td></td><td
align="undefined" valign="undefined">${varfile2} = </td><td
align="undefined" valign="undefined">Join Path</td><td
align="undefined" valign="undefined">${vardir}</td><td align="undefined"
valign="undefined">vars_from_cli2.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} = </td><td align="undefined"
valign="undefined">Join 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} = </td><td align="undefined"
valign="undefined">Join 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>
<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 Wed Nov 19
14:59:45 2008
@@ -97,10 +97,10 @@
</thead>
<tbody>
<tr>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
+<td>${EXPECTED LIST}</td>
+<td>List</td>
+<td>variable</td>
+<td>value</td>
<td></td>
</tr>
<tr>
@@ -143,7 +143,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 FROM CLI VAR
FILE}</td><td>Scalar from variable file from
cli</td><td></td></tr><tr><td></td><td>Should Be Equal</td><td>${SCALAR
FROM CLI VAR FILE WITH ESCAPES}</td><td>1 \\ 2\\\\
\${inv}</td><td></td></tr><tr><td></td><td>Should Be
True</td><td>${list_var_from_cli_varfile} ==<br>'Scalar list from variable
file from cli'.split()</td><td></td><td></td></tr><tr><td></td><td>Should
Be True</td><td>@{list_var_from_cli_varfile} ==<br>'List from variable file
from
cli'.split()</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>${SCALAR FROM CLI VAR FILE 2}</td><td>Variable from second
variable file from cli</td><td></td></tr>
+</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 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'] </td><td></td><td></td></tr>
</tbody>
</table>
<table border="1">
Modified: trunk/atest/testdata/variables/resvarfiles/cli_vars.py
==============================================================================
--- trunk/atest/testdata/variables/resvarfiles/cli_vars.py (original)
+++ trunk/atest/testdata/variables/resvarfiles/cli_vars.py Wed Nov 19
14:59:45 2008
@@ -1 +1,6 @@
+SCALAR = 'Scalar from variable file from CLI'
+SCALAR_WITH_ESCAPES = r'1 \ 2\\ ${inv}'
+SCALAR_LIST = 'List variable value'.split()
+LIST__LIST = SCALAR_LIST
+
PRIORITIES_1 = PRIORITIES_2 = 'Variable File from CLI'
Modified: trunk/atest/testdata/variables/resvarfiles/cli_vars_2.py
==============================================================================
--- trunk/atest/testdata/variables/resvarfiles/cli_vars_2.py (original)
+++ trunk/atest/testdata/variables/resvarfiles/cli_vars_2.py Wed Nov 19
14:59:45 2008
@@ -1 +1,7 @@
-PRIORITIES_1 = PRIORITIES_2 = PRIORITIES_2B = 'Second Variable File from
CLI'
+def get_variables():
+ varz = { 'ANOTHER_SCALAR': 'Variable from CLI var file with
get_variables',
+ 'LIST__ANOTHER_LIST': ['List variable from CLI var file',
+ 'with get_variables'] }
+ for name in 'PRIORITIES_1', 'PRIORITIES_2', 'PRIORITIES_2B':
+ varz[name] = 'Second Variable File from CLI'
+ return varz
