Author: pekka.klarck
Date: Tue Apr 7 08:52:46 2009
New Revision: 1723
Modified:
trunk/atest/robot/parsing/caching_libs_and_resources.html
trunk/atest/testdata/parsing/library_caching/file1.html
trunk/atest/testdata/parsing/library_caching/file2.html
trunk/atest/testdata/parsing/library_caching/resource.html
Log:
Test fix after refactoring how libs are imported and cached. Incidently
could replace complex user keyword with new Should Contain X Times. Also
removed some Windows-compatibility from tests -- at least looked like it
wasn't needed anymore.
Modified: trunk/atest/robot/parsing/caching_libs_and_resources.html
==============================================================================
--- trunk/atest/robot/parsing/caching_libs_and_resources.html (original)
+++ trunk/atest/robot/parsing/caching_libs_and_resources.html Tue Apr 7
08:52:46 2009
@@ -55,8 +55,6 @@
}
</style>
<title>Caching Libs And Resources</title></head>
-
-
<body>
<h1>Caching Libs And Resources</h1>
@@ -122,7 +120,7 @@
<tr>
<td><a name="test_Import Libraries Only Once">Import Libraries Only
Once</a></td>
<td>[Setup]</td>
-<td>My Run Tests</td>
+<td>Run Tests And Set $SYSLOG</td>
<td>parsing${/}library_caching</td>
<td></td>
</tr>
@@ -149,33 +147,33 @@
</tr>
<tr>
<td></td>
-<td>Syslog File Should Contain N Times</td>
-<td>Imported library 'BuiltIn' with arguments [ ]</td>
-<td>1</td>
-<td></td>
+<td>Should Contain X Times</td><td>${SYSLOG}</td>
+
+<td>Imported library 'BuiltIn' with arguments [ ]</td><td>1</td>
+
</tr>
<tr>
<td></td>
-<td>Syslog File Should Contain N Times</td>
-<td>Found test library 'BuiltIn' with arguments [ ] from cache</td>
-<td>2</td>
-<td></td>
+<td>Should Contain X Times</td><td>${SYSLOG}</td>
+
+<td>Found test library 'BuiltIn' with arguments [ ] from
cache</td><td>2</td>
+
</tr>
<tr>
<td></td>
-<td>Syslog File Should Contain N Times</td>
-<td>Imported library 'OperatingSystem' with arguments [ ]</td>
-<td>1</td>
-<td></td>
+<td>Should Contain X Times</td><td>${SYSLOG}</td>
+
+<td>Imported library 'OperatingSystem' with arguments [ ]</td><td>1</td>
+
</tr>
<tr>
<td></td>
-<td>Syslog File Should Contain N Times</td>
-<td>Found test library 'OperatingSystem' with arguments [ ] from cache</td>
-<td>1</td>
-<td></td>
+<td>Should Contain X Times</td><td>${SYSLOG}</td>
+
+<td>Found test library 'OperatingSystem' with arguments [ ] from
cache</td><td>3</td>
+
</tr>
-<tr>
+<tr><td></td><td>Check Log Message</td><td>${ERRORS.msgs[0]}</td><td>Test
library 'OperatingSystem' already imported by suite 'Library Caching.File
1'</td><td>WARN</td></tr><tr><td></td><td>Check Log
Message</td><td>${ERRORS.msgs[1]}</td><td>Test library 'OperatingSystem'
already imported by suite 'Library Caching.File
2'</td><td>WARN</td></tr><tr>
<td></td>
<td></td>
<td></td>
@@ -185,13 +183,13 @@
<tr>
<td><a name="test_Process Resource Files Only Once">Process Resource Files
Only Once</a></td>
<td>[Setup]</td>
-<td>My Run Tests</td>
+<td>Run Tests And Set $SYSLOG</td>
<td>parsing${/}resource_parsing</td>
<td></td>
</tr>
<tr>
<td></td>
-<td>Message</td>
+<td>Comment</td>
<td>Check that tests are run ok</td>
<td></td>
<td></td>
@@ -275,7 +273,7 @@
</tr>
<tr>
<td></td>
-<td>Message</td>
+<td>Comment</td>
<td>Check that resources were parsed only once</td>
<td></td>
<td></td>
@@ -284,16 +282,10 @@
<td></td>
<td>${dir} =</td>
<td>Join Path</td>
-<td>${CURDIR}${/}..${/}..</td>
-<td>testdata</td>
-</tr>
-<tr>
-<td></td>
-<td>...</td>
-<td>parsing</td>
-<td>resource_parsing</td>
-<td></td>
+<td>${CURDIR}/../../testdata</td>
+<td>parsing/resource_parsing</td>
</tr>
+
<tr>
<td></td>
<td>Syslog File Should Contain In Order</td>
@@ -424,55 +416,13 @@
<th>Argument</th>
<th>Argument</th>
</tr>
-<tr>
-<td><a name="keyword_Syslog File Should Contain N Times">Syslog File
Should Contain N Times</a></td>
-<td>[Arguments]</td>
-<td>${text}</td>
-<td>${exp_count}</td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>[Timeout]</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>${lines} =</td>
-<td>Grep</td>
-<td>${SYSLOGFILE}</td>
-<td>${text}</td>
-</tr>
-<tr>
-<td></td>
-<td>Log</td>
-<td>${SYSLOGFILE}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>${count} =</td>
-<td>Evaluate</td>
-<td>len("""${lines}""".splitlines())</td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>Ints Equal</td>
-<td>${count}</td>
-<td>${exp_count}</td>
-<td>${text}</td>
-</tr>
-<tr>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
+
+
+
+
+
+
+
<tr>
<td><a name="keyword_Syslog File Should Contain In Order">Syslog File
Should Contain In Order</a></td>
<td>[Arguments]</td>
@@ -480,13 +430,7 @@
<td></td>
<td></td>
</tr>
-<tr>
-<td></td>
-<td>[Timeout]</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
+
<tr>
<td></td>
<td>${text} =</td>
@@ -494,31 +438,25 @@
<td>@{parts}</td>
<td></td>
</tr>
+
<tr>
<td></td>
-<td>${text} =</td>
-<td>Set</td>
-<td>${text.replace("\\","/")}</td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>Syslog File Should Contain N Times</td>
-<td>${text}</td>
-<td>1</td>
-<td></td>
+<td>Should Contain X Times</td><td>${SYSLOG}</td>
+
+<td>${text}</td><td>1</td>
+
</tr>
<tr>
<td></td>
<td>${pre}</td>
<td>${post} =</td>
-<td>Set</td>
-<td>${SYSLOGFILE.split("${text}")}</td>
+<td>Set Variable</td>
+<td>${SYSLOG.split("${text}")}</td>
</tr>
<tr>
<td></td>
<td>Set Suite Variable</td>
-<td>$SYSLOGFILE</td>
+<td>${SYSLOG}</td>
<td>${post}</td>
<td></td>
</tr>
@@ -530,19 +468,13 @@
<td></td>
</tr>
<tr>
-<td><a name="keyword_My Run Tests">My Run Tests</a></td>
+<td><a name="keyword_My Run Tests">Run Tests And Set $SYSLOG</a></td>
<td>[Arguments]</td>
<td>${path}</td>
<td></td>
<td></td>
</tr>
-<tr>
-<td></td>
-<td>[Timeout]</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
+
<tr>
<td></td>
<td>Run Tests</td>
@@ -550,62 +482,23 @@
<td>${path}</td>
<td></td>
</tr>
+
<tr>
<td></td>
-<td>Set Suite Variable</td>
-<td>$SUITE</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>${SYSLOGFILE} =</td>
+<td>${SYSLOG} =</td>
<td>Get Syslog</td>
<td></td>
<td></td>
</tr>
-<tr>
-<td></td>
-<td>Log</td>
-<td>${SYSLOGFILE}</td>
-<td></td>
-<td></td>
-</tr>
+
<tr>
<td></td>
<td>Set Suite Variable</td>
-<td>$SYSLOGFILE</td>
-<td>${SYSLOGFILE.replace("\\","/")}</td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>Verify My Run Tests</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td><a name="keyword_Verify My Run Tests">Verify My Run Tests</a></td>
-<td>[Timeout]</td>
-<td></td>
-<td></td>
+<td>${SYSLOG}</td>
+<td><br></td>
<td></td>
</tr>
-<tr>
-<td></td>
-<td>Fail If Equal</td>
-<td>${SUITE}</td>
-<td>${None}</td>
-<td>Running tests failed</td>
-</tr>
+
<tr>
<td></td>
<td></td>
@@ -613,6 +506,9 @@
<td></td>
<td></td>
</tr>
+
+
+
<tr>
<td></td>
<td></td>
@@ -622,4 +518,4 @@
</tr>
</tbody></table>
-</body></html>
+</body></html>
\ No newline at end of file
Modified: trunk/atest/testdata/parsing/library_caching/file1.html
==============================================================================
--- trunk/atest/testdata/parsing/library_caching/file1.html (original)
+++ trunk/atest/testdata/parsing/library_caching/file1.html Tue Apr 7
08:52:46 2009
@@ -1,6 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
+<html><head>
@@ -81,9 +80,7 @@
- <title>Robot Test Cases</title>
-</head>
-
+ <title>Robot Test Cases</title></head>
<body>
@@ -790,7 +787,7 @@
- <td>Noop</td>
+ <td>No Operation</td>
@@ -869,7 +866,7 @@
- <td>Fail Unless Dir Exists</td>
+ <td>Directory Should Exist</td>
<td> ${CURDIR}</td>
@@ -1598,5 +1595,4 @@
-</body>
-</html>
+</body></html>
\ No newline at end of file
Modified: trunk/atest/testdata/parsing/library_caching/file2.html
==============================================================================
--- trunk/atest/testdata/parsing/library_caching/file2.html (original)
+++ trunk/atest/testdata/parsing/library_caching/file2.html Tue Apr 7
08:52:46 2009
@@ -1,6 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
+<html><head>
@@ -78,9 +77,7 @@
- <title>Robot Test Cases</title>
-</head>
-
+ <title>Robot Test Cases</title></head>
<body>
@@ -724,7 +721,7 @@
- <td>Noop</td>
+ <td>No Operation</td>
@@ -796,7 +793,7 @@
- <td>Fail Unless Dir Exists</td>
+ <td>Directory Should Exist</td>
<td> ${CURDIR}</td>
@@ -1450,5 +1447,4 @@
-</body>
-</html>
+</body></html>
\ No newline at end of file
Modified: trunk/atest/testdata/parsing/library_caching/resource.html
==============================================================================
--- trunk/atest/testdata/parsing/library_caching/resource.html (original)
+++ trunk/atest/testdata/parsing/library_caching/resource.html Tue Apr 7
08:52:46 2009
@@ -1,6 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
+<html><head>
@@ -75,9 +74,7 @@
- <title>Robot Test Cases</title>
-</head>
-
+ <title>Robot Test Cases</title></head>
<body>
@@ -648,7 +645,7 @@
- <td>Fail Unless Dir Exists</td>
+ <td>Directory Should Exist</td>
<td> ${CURDIR}</td>
@@ -774,5 +771,4 @@
-</body>
-</html>
+</body></html>
\ No newline at end of file
