Revision: 3449
Author: KariHusa
Date: Tue May 25 00:36:16 2010
Log: Format
http://code.google.com/p/robotframework/source/detail?r=3449

Added:
 /trunk/atest/robot/parsing/caching_libs_and_resources.txt
Deleted:
 /trunk/atest/robot/parsing/caching_libs_and_resources.html

=======================================
--- /dev/null
+++ /trunk/atest/robot/parsing/caching_libs_and_resources.txt Tue May 25 00:36:16 2010
@@ -0,0 +1,60 @@
+*** Settings ***
+Force Tags      regression  jybot  pybot
+Resource        atest_resource.txt
+
+*** Test Cases ***
+Import Libraries Only Once
+    [Setup]  Run Tests And Set $SYSLOG  parsing${/}library_caching
+    :FOR  ${name}  IN  Test 1.1  Test 1.2  Test 2.1  Test 2.2
+    \  Check Test Case  ${name}
+ Should Contain X Times ${SYSLOG} Imported library 'BuiltIn' with arguments [ ] 1 + Should Contain X Times ${SYSLOG} Found test library 'BuiltIn' with arguments [ ] from cache 2 + Should Contain X Times ${SYSLOG} Imported library 'OperatingSystem' with arguments [ ] 1 + Should Contain X Times ${SYSLOG} Found test library 'OperatingSystem' with arguments [ ] from cache 3 + Check Syslog Contains | INFO \ | Test library 'OperatingSystem' already imported by suite 'Library Caching.File 1' + Check Syslog Contains | INFO \ | Test library 'OperatingSystem' already imported by suite 'Library Caching.File 2'
+
+Process Resource Files Only Once
+    [Setup]  Run Tests And Set $SYSLOG  parsing${/}resource_parsing
+    Comment  Check that tests are run ok
+    ${tc} =  Check Test Case  Test 1.1
+ Check Log Message ${tc.kws[0].kws[0].msgs[0]} variable value from 02 resource + Check Log Message ${tc.kws[1].msgs[0]} variable value from 02 resource
+    ${tc} =  Check Test Case  Test 4.1
+ Check Log Message ${tc.kws[0].kws[0].msgs[0]} variable value from 02 resource + Check Log Message ${tc.kws[1].msgs[0]} variable value from 02 resource
+    ${tc} =  Check Test Case  Test 4.2
+ Check Log Message ${tc.kws[0].kws[0].msgs[0]} variable value from 03 resource + Check Log Message ${tc.kws[0].kws[1].msgs[0]} variable value from 02 resource + Check Log Message ${tc.kws[0].kws[2].kws[0].msgs[0]} variable value from 02 resource + Check Log Message ${tc.kws[1].msgs[0]} variable value from 03 resource
+    Comment  Check that resources were parsed only once
+    ${dir} =  Join Path  ${CURDIR}/../../testdata  parsing/resource_parsing
+ Syslog File Should Contain In Order Parsing test suite directory '${dir}' + Syslog File Should Contain In Order Parsing test case file '${dir}${/}01_tests.html' + Syslog File Should Contain In Order Parsing test case file '${dir}${/}02_resource.html' + Syslog File Should Contain In Order Parsing data source '${dir}${/}02_resource.html' failed: Test case file '${dir}${/}02_resource.html' contains no test cases + Syslog File Should Contain In Order Parsing test case file '${dir}${/}03_resource.html' + Syslog File Should Contain In Order Parsing data source '${dir}${/}03_resource.html' failed: Test case file '${dir}${/}03_resource.html' contains no test cases + Syslog File Should Contain In Order Parsing test case file '${dir}${/}04_tests.html' + Syslog File Should Contain In Order Started test suite 'Resource Parsing' + Syslog File Should Contain In Order Imported resource file '${dir}${/}02_resource.html' + Syslog File Should Contain In Order Imported resource file '${dir}${/}03_resource.html' + Syslog File Should Contain In Order Found resource file '${dir}${/}02_resource.html' from cache + Syslog File Should Contain In Order Resource file '${dir}${/}02_resource.html' already imported by suite 'Resource Parsing.04 Tests'
+    Syslog File Should Contain In Order  Tests execution ended.
+
+*** Keywords ***
+Syslog File Should Contain In Order
+    [Arguments]  @{parts}
+    ${text} =  Catenate  @{parts}
+    Should Contain X Times  ${SYSLOG}  ${text}  1
+ ${pre} ${post} = Set Variable ${SYSLOG.split("${text.replace('\\','\\\\')}")}
+    Set Suite Variable  ${SYSLOG}  ${post}
+
+Run Tests And Set $SYSLOG
+    [Arguments]  ${path}
+    Run Tests  ${EMPTY}  ${path}
+    ${SYSLOG} =  Get Syslog
+    Set Suite Variable  ${SYSLOG}
+
=======================================
--- /trunk/atest/robot/parsing/caching_libs_and_resources.html Mon Apr 12 05:17:10 2010
+++ /dev/null
@@ -1,462 +0,0 @@
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="RIDE" />
-<meta name="rf-template" content="False" />
-<style type="text/css">
-html {
-  font-family: Arial,Helvetica,sans-serif;
-  background-color: white;
-  color: black;
-}
-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;
-  width: 12em;
-}
-th {
-  background-color: rgb(192, 192, 192);
-  color: black;
-  border-width: 0.1em;
-  font-weight: bold;
-  text-align: center;
-  letter-spacing: 0.1em;
-}
-td.name {
-  background-color: rgb(240, 240, 240);
-  letter-spacing: 0.1em;
-}
-td.name, th.name {
-  width: 10em;
-}
-</style>
-<title>Caching Libs And Resources</title>
-</head>
-<body>
-<h1>Caching Libs And Resources</h1>
-<table id="settings" border="1">
-<tr>
-<th class="name">Setting</th>
-<th colspan="4">Value</th>
-</tr>
-<tr>
-<td class="name">Force Tags</td>
-<td>regression</td>
-<td>jybot</td>
-<td>pybot</td>
-<td></td>
-</tr>
-<tr>
-<td class="name">Resource</td>
-<td>atest_resource.txt</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-</table>
-<table id="variables" border="1"></table>
-<table id="testcases" border="1">
-<tr>
-<th class="name">Test Case</th>
-<th>Action</th>
-<th colspan="3">Arguments</th>
-</tr>
-<tr>
-<td class="name"><a name="test_Import Libraries Only Once">Import Libraries Only Once</a></td>
-<td>[Setup]</td>
-<td>Run Tests And Set $SYSLOG</td>
-<td>parsing${/}library_caching</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>:FOR</td>
-<td>${name}</td>
-<td>IN</td>
-<td>Test 1.1</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>...</td>
-<td>Test 1.2</td>
-<td>Test 2.1</td>
-<td>Test 2.2</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td>Check Test Case</td>
-<td>${name}</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Should Contain X Times</td>
-<td>${SYSLOG}</td>
-<td>Imported library 'BuiltIn' with arguments [ ]</td>
-<td>1</td>
-</tr>
-<tr>
-<td class="name"></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 class="name"></td>
-<td>Should Contain X Times</td>
-<td>${SYSLOG}</td>
-<td>Imported library 'OperatingSystem' with arguments [ ]</td>
-<td>1</td>
-</tr>
-<tr>
-<td class="name"></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>
-<td class="name"></td>
-<td>Check Syslog Contains</td>
-<td>| INFO \ |</td>
-<td>Test library 'OperatingSystem' already imported by suite 'Library Caching.File 1'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Syslog Contains</td>
-<td>| INFO \ |</td>
-<td>Test library 'OperatingSystem' already imported by suite 'Library Caching.File 2'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"><a name="test_Process Resource Files Only Once">Process Resource Files Only Once</a></td>
-<td>[Setup]</td>
-<td>Run Tests And Set $SYSLOG</td>
-<td>parsing${/}resource_parsing</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Comment</td>
-<td>Check that tests are run ok</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>${tc} =</td>
-<td>Check Test Case</td>
-<td>Test 1.1</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Log Message</td>
-<td>${tc.kws[0].kws[0].msgs[0]}</td>
-<td>variable value from 02 resource</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Log Message</td>
-<td>${tc.kws[1].msgs[0]}</td>
-<td>variable value from 02 resource</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>${tc} =</td>
-<td>Check Test Case</td>
-<td>Test 4.1</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Log Message</td>
-<td>${tc.kws[0].kws[0].msgs[0]}</td>
-<td>variable value from 02 resource</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Log Message</td>
-<td>${tc.kws[1].msgs[0]}</td>
-<td>variable value from 02 resource</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>${tc} =</td>
-<td>Check Test Case</td>
-<td>Test 4.2</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Log Message</td>
-<td>${tc.kws[0].kws[0].msgs[0]}</td>
-<td>variable value from 03 resource</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Log Message</td>
-<td>${tc.kws[0].kws[1].msgs[0]}</td>
-<td>variable value from 02 resource</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Log Message</td>
-<td>${tc.kws[0].kws[2].kws[0].msgs[0]}</td>
-<td>variable value from 02 resource</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Check Log Message</td>
-<td>${tc.kws[1].msgs[0]}</td>
-<td>variable value from 03 resource</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Comment</td>
-<td>Check that resources were parsed only once</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>${dir} =</td>
-<td>Join Path</td>
-<td>${CURDIR}/../../testdata</td>
-<td>parsing/resource_parsing</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Parsing test suite directory</td>
-<td>'${dir}'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Parsing test case file</td>
-<td>'${dir}${/}01_tests.html'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Parsing test case file</td>
-<td>'${dir}${/}02_resource.html'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Parsing data source</td>
-<td>'${dir}${/}02_resource.html'</td>
-<td>failed:</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>...</td>
-<td>Test case file</td>
-<td>'${dir}${/}02_resource.html'</td>
-<td>contains no test cases</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Parsing test case file</td>
-<td>'${dir}${/}03_resource.html'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Parsing data source</td>
-<td>'${dir}${/}03_resource.html'</td>
-<td>failed:</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>...</td>
-<td>Test case file</td>
-<td>'${dir}${/}03_resource.html'</td>
-<td>contains no test cases</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Parsing test case file</td>
-<td>'${dir}${/}04_tests.html'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Started test suite</td>
-<td>'Resource Parsing'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Imported resource file</td>
-<td>'${dir}${/}02_resource.html'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Imported resource file</td>
-<td>'${dir}${/}03_resource.html'</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Found resource file</td>
-<td>'${dir}${/}02_resource.html'</td>
-<td>from cache</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Resource file</td>
-<td>'${dir}${/}02_resource.html'</td>
-<td>already imported by suite 'Resource Parsing.04 Tests'</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Syslog File Should Contain In Order</td>
-<td>Tests execution ended.</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-</table>
-<table id="keywords" border="1">
-<tr>
-<th class="name">Keyword</th>
-<th>Action</th>
-<th colspan="3">Arguments</th>
-</tr>
-<tr>
-<td class="name"><a name="keyword_Syslog File Should Contain In Order">Syslog File Should Contain In Order</a></td>
-<td>[Arguments]</td>
-<td>@{parts}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>${text} =</td>
-<td>Catenate</td>
-<td>@{parts}</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Should Contain X Times</td>
-<td>${SYSLOG}</td>
-<td>${text}</td>
-<td>1</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>${pre}</td>
-<td>${post} =</td>
-<td>Set Variable</td>
-<td>${SYSLOG.split("${text.replace('\\','\\\\')}")}</td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Set Suite Variable</td>
-<td>${SYSLOG}</td>
-<td>${post}</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"><a name="keyword_Run Tests And Set $SYSLOG">Run Tests And Set $SYSLOG</a></td>
-<td>[Arguments]</td>
-<td>${path}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Run Tests</td>
-<td></td>
-<td>${path}</td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>${SYSLOG} =</td>
-<td>Get Syslog</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td>Set Suite Variable</td>
-<td>${SYSLOG}</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td class="name"></td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-</table>
-</body>
-</html>

Reply via email to