Author: pekka.klarck
Date: Tue Apr 7 12:39:56 2009
New Revision: 1730
Modified:
trunk/atest/robot/standard_libraries/collections/dictionary.html
trunk/atest/robot/standard_libraries/collections/list.html
trunk/atest/testdata/standard_libraries/collections/dictionary.html
trunk/atest/testdata/standard_libraries/collections/list.html
Log:
test fixes after cleanup in prev commit
Modified: trunk/atest/robot/standard_libraries/collections/dictionary.html
==============================================================================
--- trunk/atest/robot/standard_libraries/collections/dictionary.html
(original)
+++ trunk/atest/robot/standard_libraries/collections/dictionary.html Tue
Apr 7 12:39:56 2009
@@ -10089,7 +10089,7 @@
- <tr><td>Log Dictionary With Different Log Levels</td><td>${tc}
=</td><td>Check Test Case</td><td>Log Dictionary With Different Log
Levels</td><td></td></tr><tr><td></td><td>${expected} =</td><td>Set
Variable</td><td>Dictionary length is '3'\n<br>3: None\n<br>a: 1\n<br>b: 2
</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>${expected}</td><td>INFO</td></tr><tr><td></td><td>Variable
Should Not
Exist</td><td>\${tc.kws[1].msgs[0]}</td><td></td><td></td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[2].msgs[0]}</td><td>${expected}</td><td>WARN</td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[3].msgs[0]}</td><td>${expected}</td><td>DEBUG</td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[4].msgs[0]}</td><td>${expected}</td><td>INFO</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
Dictionary With Different Dictionaries</td><td>${tc} =</td><td>Check Test
Case</td><td>Log Dictionary With Different
Dictionaries</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>Dictionary is
empty<br></td><td>INFO</td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[1].msgs[0]}</td><td>Dictionary has one item 'a:
1'</td><td>INFO</td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[4].msgs[0]}</td><td>Dictionary length
is '2'\n<br>(1, 2, 3): 3.12\n<br>1:
2 </td><td>INFO</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
+ <tr><td>Log Dictionary With Different Log Levels</td><td>${tc}
=</td><td>Check Test Case</td><td>Log Dictionary With Different Log
Levels</td><td></td></tr><tr><td></td><td>${expected} =</td><td>Set
Variable</td><td>Dictionary size is 3 and it contains following
items:\n<br>3: None\n<br>a: 1\n<br>b: 2
</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>${expected}</td><td>INFO</td></tr><tr><td></td><td>Variable
Should Not
Exist</td><td>${tc.kws[1].msgs[0]}</td><td></td><td></td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[2].msgs[0]}</td><td>${expected}</td><td>WARN</td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[3].msgs[0]}</td><td>${expected}</td><td>DEBUG</td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[4].msgs[0]}</td><td>${expected}</td><td>INFO</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
Dictionary With Different Dictionaries</td><td>${tc} =</td><td>Check Test
Case</td><td>Log Dictionary With Different
Dictionaries</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>Dictionary is
empty<br></td><td>INFO</td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[1].msgs[0]}</td><td>Dictionary has one
item:\n<br>a: 1</td><td>INFO</td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[4].msgs[0]}</td><td>Dictionary size is 2 and
it contains following items:\n<br>(1, 2, 3): 3.12\n<br>1:
2 </td><td>INFO</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
Modified: trunk/atest/robot/standard_libraries/collections/list.html
==============================================================================
--- trunk/atest/robot/standard_libraries/collections/list.html (original)
+++ trunk/atest/robot/standard_libraries/collections/list.html Tue Apr 7
12:39:56 2009
@@ -10299,9 +10299,9 @@
- </tr><tr><td>Lists Should Be equal With Different
Lengths</td><td>Check testcase</td><td>Lists Should Be equal With
Different
Lengths</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Lengths And Own Error
Message</td><td>Check testcase</td><td>Lists Should Be equal With
Different Lengths And Own Error
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Lengths And Own And Default Error
Messages</td><td>Check testcase</td><td>Lists Should Be equal With
Different Lengths And Own And Default Error
Messages</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Values</td><td>Check
testcase</td><td>Lists Should Be equal With Different
Values</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Values And Own Error
Message</td><td>Check testcase</td><td>Lists Should Be equal With
Different Values And Own Error
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Values And Own And Default Error
Messages</td><td>Check testcase</td><td>Lists Should Be equal With
Different Values And Own And Default Error
Messages</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>List
Should Contain Sub List</td><td>Check testcase</td><td>List Should Contain
Sub
List</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>List
Should Contain Sub List With Missing Values</td><td>Check
testcase</td><td>List Should Contain Sub List With Missing
Values</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>List
Should Contain Sub List With Missing Values And Own Error
Message</td><td>Check testcase</td><td>List Should Contain Sub List With
Missing Values And Own Error
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>List
Should Contain Sub List With Missing Values And Own and Default Error
Messages</td><td>Check testcase</td><td>List Should Contain Sub List With
Missing Values And Own and Default Error
Messages</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
List With Different Log Levels</td><td>${tc} = </td><td>Check
testcase</td><td>Log List With Different Log
Levels</td><td></td></tr><tr><td></td><td>${expected} =</td><td>Set
Variable</td><td>List length is '3'\n<br>0: 11\n<br>
+ </tr><tr><td>Lists Should Be equal With Different
Lengths</td><td>Check testcase</td><td>Lists Should Be equal With
Different
Lengths</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Lengths And Own Error
Message</td><td>Check testcase</td><td>Lists Should Be equal With
Different Lengths And Own Error
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Lengths And Own And Default Error
Messages</td><td>Check testcase</td><td>Lists Should Be equal With
Different Lengths And Own And Default Error
Messages</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Values</td><td>Check
testcase</td><td>Lists Should Be equal With Different
Values</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Values And Own Error
Message</td><td>Check testcase</td><td>Lists Should Be equal With
Different Values And Own Error
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Lists
Should Be equal With Different Values And Own And Default Error
Messages</td><td>Check testcase</td><td>Lists Should Be equal With
Different Values And Own And Default Error
Messages</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>List
Should Contain Sub List</td><td>Check testcase</td><td>List Should Contain
Sub
List</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>List
Should Contain Sub List With Missing Values</td><td>Check
testcase</td><td>List Should Contain Sub List With Missing
Values</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>List
Should Contain Sub List With Missing Values And Own Error
Message</td><td>Check testcase</td><td>List Should Contain Sub List With
Missing Values And Own Error
Message</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>List
Should Contain Sub List With Missing Values And Own and Default Error
Messages</td><td>Check testcase</td><td>List Should Contain Sub List With
Missing Values And Own and Default Error
Messages</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
List With Different Log Levels</td><td>${tc} = </td><td>Check
testcase</td><td>Log List With Different Log
Levels</td><td></td></tr><tr><td></td><td>${expected} =</td><td>Set
Variable</td><td>List length is 3 and it contains following items:\n<br>0:
11\n<br>
1: 12\n<br>
-2: 13</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>${expected}</td><td>INFO</td></tr><tr><td></td><td>Variable
Should Not
Exist</td><td>\${tc.kws[1].msgs[0]}</td><td></td><td></td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[2].msgs[0]}</td><td>${expected}</td><td>WARN</td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[3].msgs[0]}</td><td>${expected}</td><td>DEBUG</td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[4].msgs[0]}</td><td>${expected}</td><td>INFO</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
List With Different Lists</td><td>${tc} = </td><td>Check
testcase</td><td>Log List With Different
Lists</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>List is
empty<br></td><td>INFO</td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[1].msgs[0]}</td><td>List has one
item '1'</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[4].msgs[0]}</td><td>List length is '2'\n<br>0: (1,
2, 3)\n<br>1:
3.12</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
+2: 13</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>${expected}</td><td>INFO</td></tr><tr><td></td><td>Variable
Should Not
Exist</td><td>${tc.kws[1].msgs[0]}</td><td></td><td></td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[2].msgs[0]}</td><td>${expected}</td><td>WARN</td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[3].msgs[0]}</td><td>${expected}</td><td>DEBUG</td></tr><tr><td></td><td>Check
Log
Message</td><td>${tc.kws[4].msgs[0]}</td><td>${expected}</td><td>INFO</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
List With Different Lists</td><td>${tc} = </td><td>Check
testcase</td><td>Log List With Different
Lists</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[0].msgs[0]}</td><td>List is
empty<br></td><td>INFO</td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[1].msgs[0]}</td><td>List has one
item:\n1</td><td></td></tr><tr><td></td><td>Check Log
Message</td><td>${tc.kws[4].msgs[0]}</td><td>List length is 2 and it
contains following items:\n<br>0: (1, 2, 3)\n<br>1:
3.12</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
Modified:
trunk/atest/testdata/standard_libraries/collections/dictionary.html
==============================================================================
--- trunk/atest/testdata/standard_libraries/collections/dictionary.html
(original)
+++ trunk/atest/testdata/standard_libraries/collections/dictionary.html Tue
Apr 7 12:39:56 2009
@@ -882,7 +882,7 @@
<td>My error message!</td>
<td></td>
<td></td>
-</tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Dictionary
Should
Contain Sub Dictionary With Different
Value</td><td>[Documentation]</td><td>FAIL</td><td>Following keys have
different values:\n<br>Key b: 2 !=
x<br></td><td></td><td></td><td></td></tr><tr><td></td><td>Dictionary
Should Contain Sub
Dictionary</td><td>${D3}</td><td>${D2B}</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>Dictionary
Should Contain Sub Dictionary With Different Value And Own Error
Message</td><td>[Documentation]</td><td>FAIL</td><td>My error
message!</td><td></td><td></td><td></td></tr><tr><td></td><td>Dictionary
Should Contain Sub Dictionary</td><td>${D3}</td><td>${D2B}</td><td>My error
message!</td><td>False</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Dictionary
Should Contain Sub Dictionary With Different Value And Own And Default
Error Message</td><td>[Documentation]</td><td>FAIL</td><td>My error
message!\n<br>Following keys have different values:\n<br>Key b: 2 !=
x<br></td><td></td><td></td><td></td></tr><tr><td></td><td>Dictionary
Should Contain Sub Dictionary</td><td>${D3}</td><td>${D2B}</td><td>My error
message!</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
Dictionary With Different Log Levels</td><td>[Documentation]</td><td>FAIL
Invalid log
level 'INVALID'</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>tRAce</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>warn</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>DEbug</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>INFO</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>INVALID</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>Log
Dictionary With Different Dictionaries</td><td>Log
Dictionary</td><td>${D0}</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D1}</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>${tuple}
=</td><td>Evaluate</td><td>(1, 2,
3)</td><td></td><td></td><td></td></tr><tr><td></td><td>${dict}
=</td><td>Create
Dictionary</td><td>${tuple}</td><td>${3.12}</td><td></td><td></td></tr><tr><td></td><td>...</td><td>1</td><td>2</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${dict}</td><td></td><td></td><td></td><td></td></tr>
+</tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Dictionary
Should
Contain Sub Dictionary With Different
Value</td><td>[Documentation]</td><td>FAIL</td><td>Following keys have
different values:\n<br>Key b: 2 !=
x<br></td><td></td><td></td><td></td></tr><tr><td></td><td>Dictionary
Should Contain Sub
Dictionary</td><td>${D3}</td><td>${D2B}</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>Dictionary
Should Contain Sub Dictionary With Different Value And Own Error
Message</td><td>[Documentation]</td><td>FAIL</td><td>My error
message!</td><td></td><td></td><td></td></tr><tr><td></td><td>Dictionary
Should Contain Sub Dictionary</td><td>${D3}</td><td>${D2B}</td><td>My error
message!</td><td>False</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Dictionary
Should Contain Sub Dictionary With Different Value And Own And Default
Error Message</td><td>[Documentation]</td><td>FAIL</td><td>My error
message!\n<br>Following keys have different values:\n<br>Key b: 2 !=
x<br></td><td></td><td></td><td></td></tr><tr><td></td><td>Dictionary
Should Contain Sub Dictionary</td><td>${D3}</td><td>${D2B}</td><td>My error
message!</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
Dictionary With Different Log Levels</td><td>Log
Dictionary</td><td>${D3}</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>tRAce</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>warn</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>DEbug</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D3}</td><td>INFO</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>Log
Dictionary With Different Dictionaries</td><td>Log
Dictionary</td><td>${D0}</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${D1}</td><td></td><td></td><td></td><td></td></tr><tr><td></td><td>${tuple}
=</td><td>Evaluate</td><td>(1, 2,
3)</td><td></td><td></td><td></td></tr><tr><td></td><td>${dict}
=</td><td>Create
Dictionary</td><td>${tuple}</td><td>${3.12}</td><td></td><td></td></tr><tr><td></td><td>...</td><td>1</td><td>2</td><td></td><td></td><td></td></tr><tr><td></td><td>Log
Dictionary</td><td>${dict}</td><td></td><td></td><td></td><td></td></tr>
</tbody>
</table>
Modified: trunk/atest/testdata/standard_libraries/collections/list.html
==============================================================================
--- trunk/atest/testdata/standard_libraries/collections/list.html
(original)
+++ trunk/atest/testdata/standard_libraries/collections/list.html Tue Apr
7 12:39:56 2009
@@ -108,7 +108,7 @@
</tr>
<tr>
<td>${LIST OUT OF RANGE}</td>
-<td>IndexError: Given index '10' out of range 0-2</td>
+<td>IndexError: Given index 10 is out of the range 0-2</td>
<td></td>
<td></td>
<td></td>
@@ -1608,7 +1608,7 @@
<td></td>
<td></td>
</tr>
-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log List
With Different Log Levels</td><td>[Documentation]</td><td>FAIL Invalid log
level 'INVALID'</td><td></td><td></td></tr><tr><td><br></td><td>Log
List</td><td>${L3}</td><td></td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>tRAce</td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>warn</td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>DEbug</td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>INFO</td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>INVALID</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
List With Different Lists</td><td>Log
List</td><td>${L0}</td><td></td><td></td></tr><tr><td></td><td>Log
List</td><td>${L1}</td><td></td><td></td></tr><tr><td></td><td>${tuple}
=</td><td>Evaluate</td><td>(1, 2,
3)</td><td></td></tr><tr><td></td><td>${list} =</td><td>Create
List</td><td>${tuple}</td><td>${3.12}</td></tr><tr>
+<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log List
With Different Log Levels</td><td>Log
List</td><td>${L3}</td><td></td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>tRAce</td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>warn</td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>DEbug</td><td></td></tr><tr><td></td><td>Log
List</td><td>${L3}</td><td>INFO</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Log
List With Different Lists</td><td>Log
List</td><td>${L0}</td><td></td><td></td></tr><tr><td></td><td>Log
List</td><td>${L1}</td><td></td><td></td></tr><tr><td></td><td>${tuple}
=</td><td>Evaluate</td><td>(1, 2,
3)</td><td></td></tr><tr><td></td><td>${list} =</td><td>Create
List</td><td>${tuple}</td><td>${3.12}</td></tr><tr>
<td></td>
<td>Log List</td>
<td>${list}</td>