Revision: 3836
Author: pekka.klarck
Date: Tue Aug 17 07:07:12 2010
Log: format & cleanup
http://code.google.com/p/robotframework/source/detail?r=3836

Added:
 /trunk/atest/testdata/parsing/multirow.txt
Deleted:
 /trunk/atest/testdata/parsing/multirow.html
Modified:
 /trunk/atest/robot/parsing/multirow.txt

=======================================
--- /dev/null
+++ /trunk/atest/testdata/parsing/multirow.txt  Tue Aug 17 07:07:12 2010
@@ -0,0 +1,143 @@
+*** Settings ***
+...  # Invalid usage
+Documentation   NO RIDE!!
+...  This  doc  is  one  long  string
+...  !
+...  !
+...  !
+...  !
+Default Tags  t1  t2  t3  t4
+...           t4  t5  \   t6
+...
+...           \   t7  t8
+...           t9
+
+*** Variables ***
+...  # Invalid usage
+${scalarlist}  1  2  3  4
+...  5  6  7
+...  8
+...
+...  9  10
+${string}
+...  some text
+...
+...@{list}  Hello  my
+...  world
+...
+...  !
+
+*** Test Cases ***
+\   ...  # Invalid usage
+    [Documentation]  FAIL Test case name is required.
+
+Invalid Usage In Test And User Keyword
+    ...
+    [Documentation]  FAIL This is executed after all!
+    Invalid Usage In UK
+
+Multirow Variables
+    Should Be True  ${scalarlist} == [str(i) for i in range(1,11)]
+    Should Be Equal  ${string}  some text
+    Should Be Equal  @{list}[0]  Hello
+    Should Be Equal  @{list}[1]  my
+    Should Be Equal  @{list}[2]  world
+    Should Be Equal  @{list}[3]  !
+
+Multirow Args For Library Keyword
+    Log Many  one  two
+    ...  three
+    ...
+    ...  four  five
+
+Multirow Args For User Keyword
+    UK Log Many
+    ...  ${1}
+    ...
+    ...  ${2}  ${3}
+    ...  ${4}
+    ...  ${5}
+
+Multirow Return Values
+    ${x} =  Create List  0  1
+    ...  2  3  4  5
+    ...  6  7  8
+    ...
+    ...  9
+    Should Be True  ${x} == [str(i) for i in range(10)]
+    ${a}  ${b}  ${c}  ${d} =  Create List  1
+    ...     2     3     4
+    Should Be Equal  ${a}  1
+    Should Be Equal  ${b}  2
+    Should Be Equal  ${c}  3
+    Should Be Equal  ${d}  4
+
+Multirow In User Keyword
+    Multirow In User Keyword
+
+Multirow Test Settings
+    [Documentation]  This  test  doc
+    ...  is
+    ...  one
+    ...
+    ...  long  string
+    [Tags]
+    ...  my1  my2  my3
+    ...  my4
+    ...
+    ...  \  \  \  \  my5
+    No Operation
+
+Multirow User Keyword Settings
+    ${x} =  Multirow User Keyword Settings  1  2
+    Should Be True  ${x} == [str(i) for i in range(1,10)]
+    ${x} =  Multirow User Keyword Settings
+    ...  1  2  3  4  5  r1  r2  r3
+    Should Be True  ${x[:5]} == [str(i) for i in range(1,6)]
+    Should Be True  ${x[5:8]} == ['r1','r2','r3']
+    Should Be True  ${x[9:]} == [str(i) for i in range(7,10)]
+
+
+*** Keywords ***
+\    # Invalid usage
+
+Invalid Usage In UK
+    ...
+    Fail  This is executed after all!
+
+UK Log Many
+    [Arguments]  @{msgs}
+    Log Many  @{msgs}
+
+Multirow In User Keyword
+    Log Many
+    ...  1
+    ...  2
+    UK Log Many
+    ...  xxx
+    ${y} =  Create List  1  2
+    ...  3  4  5
+    Should Be True  ${y} == [str(i) for i in range(1,6)]
+    @{z} =  Create List
+    ...  aaa  bbb
+    Should Be True  ${z} == ['aaa', 'bbb']
+
+Multirow User Keyword Settings
+    [Arguments]  ${a1}  ${a2}  ${a3}=3
+    ...  ${a4}=4
+    ...
+    ...  ${a5}=5  @{rest}
+    ...
+    Should Be Equal  ${a1}  1
+    Should Be Equal  ${a2}  2
+    Should Be Equal  ${a3}  3
+    Should Be Equal  ${a4}  4
+    Should Be Equal  ${a5}  5
+    [Return]  ${a1}  ${a2}
+    ...  ${a3}  ${a4}  ${a5}
+    ...
+    ...  @{rest}
+    ...  6
+    ...  7
+    ...  8
+    ...  9
=======================================
--- /trunk/atest/testdata/parsing/multirow.html Wed May 26 02:04:38 2010
+++ /dev/null
@@ -1,1923 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-
-
-
-
-
-
-
-  <style type="text/css">
-html {
-  font-family: Arial,Helvetica,sans-serif;
-  background-color: white;
-  color: black;
-}
-p {
-  max-width: 60em;
-}
-table {
-  border-collapse: collapse;
-  empty-cells: show;
-  margin: 1em 0em;
-  border: 0.1em solid black;
-}
-th, td {
-  border-style: solid;
-  border-width: 0.05em 0.1em;
-  border-color: black;
-  padding: 0.1em 0.2em;
-  height: 1.5em;
-}
-th {
-  background-color: rgb(192, 192, 192);
-  color: black;
-  border-width: 0.1em;
-  font-weight: bold;
-  text-align: center;
-  text-transform: capitalize;
-  letter-spacing: 0.1em;
-}
-/* Widths of named columns */
-col.name {
-  width: 10em;
-}
-.action, .value, .arg {
-  width: 15em;
-}
-/* Properties for the name column
-- td:first-child should work in CSS 2.1 avare browsers (tested in Firefox)
-- col.name is against specs but works in IE
-*/
-td:first-child, col.name {
-  background-color: rgb(240, 240, 240);
-  text-transform: capitalize;
-  letter-spacing: 0.1em;
-}
-/* required for IE */
-th {
-  font-style: normal;
-}
-  </style><title>Robot Test Cases</title></head><body>
-
-
-
-<h1>Robot Test Cases</h1>
-
-
-
-
-<table border="1">
-
-
-
- <colgroup span="99"><col class="name"><col class="value" span="4"></colgroup>
-  <thead>
-  <tr>
-
-
-
-    <th>Setting</th>
-
-
-
-    <th>Value</th>
-
-
-
-    <th>Value</th>
-
-
-
-    <th>value</th>
-
-
-
-    <th>Value</th>
-
-
-
-  </tr>
-
-
-
-  </thead>
-  <tbody>
-
-
-
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"># Invalid usage</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-
-
-
-      <td>Default Tags</td>
-
-
-
-      <td>t1</td>
-
-
-
-      <td>t2</td>
-
-
-
-      <td>t3</td>
-
-
-
-      <td>t4</td>
-
-
-
-    </tr>
-
-
-
-    <tr>
-
-
-
-      <td>...</td>
-
-
-
-      <td>t4</td>
-
-
-
-      <td>t5</td>
-
-
-
-      <td><br>
-</td>
-
-
-
-      <td>t6</td>
-
-
-
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">t7</td>
-      <td align="undefined" valign="undefined">t8</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined">t9</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">Document</td>
-      <td align="undefined" valign="undefined">This</td>
-      <td align="undefined" valign="undefined">doc</td>
-      <td align="undefined" valign="undefined">is</td>
-      <td align="undefined" valign="undefined">one</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined">long</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">string</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</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>
-
-
-
-
-
-  </tbody>
-</table>
-
-
-
-
-<table border="1">
-
-
-
- <colgroup span="99"><col class="name"><col class="value" span="4"></colgroup>
-  <thead>
-  <tr>
-
-
-
-    <th>Variable</th>
-
-
-
-    <th>Value</th>
-
-
-
-    <th>Value</th>
-
-
-
-    <th>Value</th>
-
-
-
-    <th>Value</th>
-
-
-
-  </tr>
-
-
-
-  </thead>
-  <tbody>
-
-
-
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"># Invalid usage</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-
-
-
-      <td>${scalarlist}</td>
-
-
-
-      <td>1</td>
-
-
-
-      <td>2</td>
-
-
-
-      <td>3</td>
-
-
-
-      <td>4</td>
-
-
-
-    </tr>
-
-
-
-    <tr>
-
-
-
-      <td>...</td>
-
-
-
-      <td>5</td>
-
-
-
-      <td>6</td>
-
-
-
-      <td>7</td>
-
-
-
-      <td><br>
-</td>
-
-
-
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined">8</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined">9</td>
-      <td align="undefined" valign="undefined">10</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">${string}</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined">some text</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">@{list}</td>
-      <td align="undefined" valign="undefined">Hello</td>
-      <td align="undefined" valign="undefined">my</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined">world</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined">!</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-
-
-
-
-
-  </tbody>
-</table>
-
-
-
-
-<table border="1">
-
-
-
- <colgroup span="99"><col class="name"><col class="action"><col class="arg" span="3"></colgroup>
-  <thead>
-  <tr>
-
-
-
-    <th>Test Case</th>
-
-
-
-    <th>Action</th>
-
-
-
-    <th>Argument</th>
-
-
-
-    <th>Argument</th>
-
-
-
-    <th>Argument</th>
-
-
-
-
-
-  </tr>
-
-
-
-  </thead>
-  <tbody>
-
-
-
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"># Invalid usage</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">[ Documentation ]<br>
-      </td>
-      <td align="undefined" valign="undefined">FAIL<br>
-      </td>
- <td align="undefined" valign="undefined">Test case name is required.<br>
-      </td>
-
-
-
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td style="vertical-align: top;"><br>
-      </td>
-      <td style="vertical-align: top;"><br>
-      </td>
-      <td style="vertical-align: top;"><br>
-      </td>
-      <td style="vertical-align: top;"><br>
-      </td>
-      <td style="vertical-align: top;"><br>
-      </td>
-    </tr>
-<tr>
- <td align="undefined" valign="undefined">Invalid Usage In Test And User Keyword</td>
-      <td align="undefined" valign="undefined">...</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">[ Document ]</td>
-      <td align="undefined" valign="undefined">FAIL</td>
- <td align="undefined" valign="undefined">This is executed after all!</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">Invalid Usage In UK</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined">Multirow Variables</td>
-      <td align="undefined" valign="undefined">Fail Unless</td>
-      <td align="undefined" valign="undefined">${scalarlist} ==<br>
-&nbsp;[str(i) for i in&nbsp; range(1,11)]</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">Equals</td>
-      <td align="undefined" valign="undefined">${string}</td>
-      <td align="undefined" valign="undefined">some text</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">Equals</td>
-      <td align="undefined" valign="undefined">@{list}[0]</td>
-      <td align="undefined" valign="undefined">Hello</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">Equals</td>
-      <td align="undefined" valign="undefined">@{list}[1]</td>
-      <td align="undefined" valign="undefined">my</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">Equals</td>
-      <td align="undefined" valign="undefined">@{list}[2]</td>
-      <td align="undefined" valign="undefined">world</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined">Equals</td>
-      <td align="undefined" valign="undefined">@{list}[3]</td>
-      <td align="undefined" valign="undefined">!</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-
-
-
-      <td>Multirow Args For Base Keyword</td>
-
-
-
-      <td>Log Many</td>
-
-
-
-      <td>one</td>
-
-
-
-      <td>two</td>
-
-
-
-      <td>three</td>
-
-
-
-
-
-    </tr>
-
-
-
-    <tr>
-
-
-
-      <td><br>
-</td>
-
-
-
-      <td>...</td>
-
-
-
-      <td>four</td>
-
-
-
-      <td>five</td>
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-    </tr>
-
-
-    <tr>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-    </tr>
-
-
-    <tr>
-
-
- <td align="undefined" valign="undefined">Multirow Args For User Keyword</td>
-
-
-      <td align="undefined" valign="undefined">UK Log Many</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-    </tr>
-
-
-    <tr>
-
-
-      <td><br>
-</td>
-
-
-      <td align="undefined" valign="undefined">...</td>
-
-
-      <td align="undefined" valign="undefined">${1}</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-    </tr>
-
-
-    <tr>
-
-
-      <td><br>
-</td>
-
-
-      <td align="undefined" valign="undefined">...</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-    </tr>
-
-
-    <tr>
-
-
-      <td><br>
-</td>
-
-
-      <td align="undefined" valign="undefined">...</td>
-
-
-      <td align="undefined" valign="undefined">${2}</td>
-
-
-      <td align="undefined" valign="undefined">${3}</td>
-
-
-      <td><br>
-</td>
-
-
-    </tr>
-
-
-    <tr>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-    </tr>
-
-
-    <tr>
-
-
-      <td><br>
-</td>
-
-
-      <td align="undefined" valign="undefined">...</td>
-
-
-      <td align="undefined" valign="undefined">${4}</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-    </tr>
-
-
-    <tr>
-
-
-      <td><br>
-</td>
-
-
-      <td align="undefined" valign="undefined">...</td>
-
-
-      <td align="undefined" valign="undefined">${5}</td>
-
-
-      <td><br>
-</td>
-
-
-      <td><br>
-</td>
-
-
-    </tr>
-
-
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-      <td align="undefined" valign="undefined"><br>
-</td>
-    </tr>
-    <tr>
-
-      <td align="undefined" valign="undefined"><br>
-</td>
-
-      <td align="undefined" valign="undefined"><br>
-</td>
-
-      <td align="undefined" valign="undefined"><br>
-</td>
-
-      <td align="undefined" valign="undefined"><br>
-</td>
-
-      <td align="undefined" valign="undefined"><br>
-</td>
-
-    </tr>
-
-    <tr>
-
-
-      <td>Multirow Return Values</td>
-
-
-      <td>${x}</td>
-
-
-      <td>List</td>
-
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/atest/robot/parsing/multirow.txt     Wed May 26 02:04:38 2010
+++ /trunk/atest/robot/parsing/multirow.txt     Tue Aug 17 07:07:12 2010
@@ -1,57 +1,55 @@
 *** Settings ***
-Suite Setup     Run Tests  ${EMPTY}  parsing${/}multirow.html
+Suite Setup     Run Tests  ${EMPTY}  parsing/multirow.txt
 Force Tags      regression  jybot  pybot
 Resource        atest_resource.txt

 *** Test Cases ***
 Multirow Settings
-    Equals  ${SUITE.doc}  This doc is one long \ string ! ! ! !
- Fail Unless ${SUITE.tests[0].tags} == [ 't'+str(i) for i in range(1,10) ] + Should Be Equal ${SUITE.doc} NO RIDE!! This doc is one long string ! ! ! ! + Should Be True ${SUITE.tests[0].tags} == ['t'+str(i) for i in range(1,10)]

 Multirow Variables
-    Check Test Case  Multirow Variables
-
-Multirow Args For Base Keyword
-    ${test} =  Check Test Case  Multirow Args For Base Keyword
-    ${kw} =  Set  ${test.kws[0]}
-    Check Log Message  ${kw.messages[0]}  one
-    Check Log Message  ${kw.messages[1]}  two
-    Check Log Message  ${kw.messages[2]}  three
-    Check Log Message  ${kw.messages[3]}  four
-    Check Log Message  ${kw.messages[4]}  five
+    Check Test Case  ${TEST NAME}
+
+Multirow Args For Library Keyword
+    ${tc} =  Check Test Case  ${TEST NAME}
+    Check Log Message  ${tc.kws[0].msgs[0]}  one
+    Check Log Message  ${tc.kws[0].msgs[1]}  two
+    Check Log Message  ${tc.kws[0].msgs[2]}  three
+    Check Log Message  ${tc.kws[0].msgs[3]}  four
+    Check Log Message  ${tc.kws[0].msgs[4]}  five

 Multirow Args For User Keyword
-    ${test} =  Check Test Case  Multirow Args For User Keyword
-    ${kw} =  Set  ${test.kws[0].kws[0]}
-    Check Log Message  ${kw.messages[0]}  1
-    Check Log Message  ${kw.messages[1]}  2
-    Check Log Message  ${kw.messages[2]}  3
-    Check Log Message  ${kw.messages[3]}  4
-    Check Log Message  ${kw.messages[4]}  5
+    ${tc} =  Check Test Case  ${TEST NAME}
+    Check Log Message  ${tc.kws[0].kws[0].msgs[0]}  1
+    Check Log Message  ${tc.kws[0].kws[0].msgs[1]}  2
+    Check Log Message  ${tc.kws[0].kws[0].msgs[2]}  3
+    Check Log Message  ${tc.kws[0].kws[0].msgs[3]}  4
+    Check Log Message  ${tc.kws[0].kws[0].msgs[4]}  5

 Multirow In User Keyword
-    ${test} =  Check Test Case  Multirow In User Keyword
+    Check Test Case  ${TEST NAME}

 Multirow Return Values
-    Check Test Case  Multirow Return Values
-
-Multirow Test Metadata
-    ${test} =  Check Test Case  Multirow Test Metadata
-    Fail Unless  ${test.tags} == [ 'my'+str(i) for i in range(1,6) ]
-    Equals  ${test.doc}  This test doc is one long string
-
-Multirow User Keyword Metadata
-    ${test} =  Check Test Case  Multirow User Keyword Metadata
+    Check Test Case  ${TEST NAME}
+
+Multirow Test Settings
+    ${tc} =  Check Test Case  ${TEST NAME}
+    Should Be True   ${tc.tags} == ['my'+str(i) for i in range(1,6)]
+    Should Be Equal  ${tc.doc}  This test doc is one long string
+
+Multirow User Keyword Settings
+    Check Test Case  ${TEST NAME}

 Invalid Multirow Usage
-    Check Multirow Error From Stderr  Setting  Non-existing setting '...'.
- Check Multirow Error From Stderr Variable Setting variable '...' failed: Invalid variable name. + Check Multirow Error From Stderr Settings Non-existing setting '...'. + Check Multirow Error From Stderr Variables Setting variable '...' failed: Invalid variable name.
     Check Test Case  \
     Check Test Case  Invalid Usage In Test And User Keyword

 *** Keywords ***
 Check Multirow Error From Stderr
     [Arguments]  ${table}  ${err}
- ${path} = Join Path ${CURDIR}..${/}..${/}.. testdata parsing multirow.html + ${path} = Join Path ${CURDIR} .. .. testdata parsing multirow.txt Check Stderr Contains [ ERROR ] Invalid syntax in file '${path}' in table '${table}': ${err}

Reply via email to