Revision: 9ea3bcddd3a8
Author:   Janne Härkönen <[email protected]>
Date:     Wed Jan 18 20:35:32 2012
Log:      testdata: changed format of some init files
http://code.google.com/p/robotframework/source/detail?r=9ea3bcddd3a8

Added:
 /atest/testdata/core/test_suite_dir_with_init_file/__init__.txt
/atest/testdata/core/test_suite_dir_with_init_file/sub_suite_with_init_file/__init__.txt
Deleted:
 /atest/testdata/core/test_suite_dir_with_init_file/__init__.html
/atest/testdata/core/test_suite_dir_with_init_file/sub_suite_with_init_file/__init__.html

=======================================
--- /dev/null
+++ /atest/testdata/core/test_suite_dir_with_init_file/__init__.txt Wed Jan 18 20:35:32 2012
@@ -0,0 +1,30 @@
+*** Setting ***
+Documentation     Setting metadata for test suite directory
+Suite Setup       My Setup    Setup of test suite directory
+Suite Teardown    My Teardown    Teardown of    test suite directory
+Test Setup Log Default setup from suite file # Keywords and variables used here should exist in namespace +Test Teardown Log Default teardown from suite file # where setup/teardown are used
+Force Tags        suite force
+Library           OperatingSystem
+Invalid
+
+*** Variable ***
+${default}        default
+${default_tag_2}    suite${default}2
+
+*** Keyword ***
+My Setup
+    [Arguments]    ${msg}
+    Log    ${msg}
+
+My Teardown
+    [Arguments]    @{msg_parts}
+    ${msg} =    Create Message    @{msg_parts}
+    Log    ${msg}
+    Fail If Dir Empty    ${CURDIR}    Test that OS lib was imported
+
+Create Message
+    [Arguments]    @{msg_parts}
+    ${msg} =    Catenate    @{msg_parts}
+    [Return]    ${msg}
+
=======================================
--- /dev/null
+++ /atest/testdata/core/test_suite_dir_with_init_file/sub_suite_with_init_file/__init__.txt Wed Jan 18 20:35:32 2012
@@ -0,0 +1,22 @@
+*** Setting ***
+Suite Teardown    My Teardown    Teardown of    sub test suite directory
+Test Setup        Log    Default setup from sub suite file
+Force Tags        sub suite force
+Library           OperatingSystem
+Invalid In Sub
+
+*** Variable ***
+${default}        default
+
+*** Keyword ***
+My Teardown
+    [Arguments]    @{msg_parts}
+    ${msg}    Create Message    @{msg_parts}
+    Log    ${msg}
+    Fail If Dir Empty    ${CURDIR}    Test that OS lib was imported
+
+Create Message
+    [Arguments]    @{msg_parts}
+    ${msg}    Catenate    @{msg_parts}
+    [Return]    ${msg}
+
=======================================
--- /atest/testdata/core/test_suite_dir_with_init_file/__init__.html Mon Apr 26 02:51:42 2010
+++ /dev/null
@@ -1,1553 +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 Resources</title></head><body>
-
-
-
-
-
-
-
-<h1>Robot Test Suite File</h1>
-
-
-
-
-<br>
-
-
-
-
-Tests todo:<br>
-
-
-
-
-- Importing resource file<br>
-
-
-
-
-- Importing variable file<br>
-
-
-
-- Checking name and doc from subsuites<br>
-
-
-
-- Checking suite setup and teardown from subsuites
-
-
-
-<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>Document</td>
-
-
-
-
-
-
-
-      <td>Setting metadata for&nbsp;</td>
-
-
-
-
-
-
-
-      <td>test suite directory</td>
-
-
-
-
-
-
-
-      <td><br>
-</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">Force Tags</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">suite force</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><br>
-</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">Test Setup</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">Log</td>
-
-
-
-
-
- <td align="undefined" valign="undefined">Default setup from suite file</td>
-
-
-
-
-
- <td align="undefined" valign="undefined"># Keywords and variables used</td>
-
-
-
-
-
- <td align="undefined" valign="undefined">here should exist in namespace&nbsp;</td>
-
-
-
-
-
-    </tr>
-
-
-
-
-
-    <tr>
-
-
-
-
-
-      <td align="undefined" valign="undefined">Test Teardown</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">Log</td>
-
-
-
-
-
- <td align="undefined" valign="undefined">Default teardown from suite file</td>
-
-
-
-
-
- <td align="undefined" valign="undefined"># where setup/teardown are</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">used</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">Suite Setup</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">My Setup</td>
-
-
-
-
-
-
- <td align="undefined" valign="undefined">Setup of test suite directory&nbsp;</td>
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-    </tr>
-
-
-
-
-
-
-    <tr>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">Suite Teardown</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">My Teardown</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">Teardown of&nbsp;</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">test suite directory</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">Library</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">OperatingSystem</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><br>
-</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">Invalid</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">Non-existing setting</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><br>
-</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">${default}</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">default</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-    </tr>
-
-
-
-
-
-
-
-    <tr>
-
-
-
-
-
-      <td align="undefined" valign="undefined">${default_tag_2}</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">suite${default}2</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
***The diff for this file has been truncated for email.***
=======================================
--- /atest/testdata/core/test_suite_dir_with_init_file/sub_suite_with_init_file/__init__.html Mon Apr 26 02:51:42 2010
+++ /dev/null
@@ -1,1214 +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 Resources</title></head><body>
-
-
-
-
-
-
-
-<h1>Robot Test Suite File</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">Force Tags</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">sub suite force</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><br>
-</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">Test Setup</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">Log</td>
-
- <td align="undefined" valign="undefined">Default setup from sub suite file</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">Suite Teardown</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">My Teardown</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">Teardown of&nbsp;</td>
-
-
-
-
-
-
- <td align="undefined" valign="undefined">sub test suite directory</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">Library</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">OperatingSystem</td>
-
-
-
-
-
-      <td><br>
-</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">Invalid In Sub</td>
-
-
- <td align="undefined" valign="undefined">Invalid setting in sub suite</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="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">${default}</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">default</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td><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>Keyword</th>
-
-
-
-
-
-
-
-    <th>Action</th>
-
-
-
-
-
-
-
-    <th>Argument</th>
-
-
-
-
-
-
-
-    <th>Argument</th>
-
-
-
-
-
-
-
-    <th>Argument</th>
-
-
-
-
-
-
-
-  </tr>
-
-
-
-
-
-
-
-  </thead>
-  <tbody>
-
-
-
-
-
-
-
-
-
-    <tr>
-
-
-
-
-
-
-
-      <td>My Teardown</td>
-
-
-
-
-
-
-
-      <td>[ Arguments ]</td>
-
-
-
-
-
-
-
-      <td>@{msg_parts}</td>
-
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-
-    </tr>
-
-
-
-
-
-
-
-    <tr>
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">${msg}</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">Create Message</td>
-
-
-
-
-
-
-      <td align="undefined" valign="undefined">@{msg_parts}</td>
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-    </tr>
-
-
-
-
-
-
-    <tr>
-
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-
-      <td>Log</td>
-
-
-
-
-
-
-
-      <td>${msg}</td>
-
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-
-
-    </tr>
-
-
-
-
-
-    <tr>
-
-
-
-
-
-      <td><br>
-</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">Fail If Dir Empty</td>
-
-
-
-
-
-      <td align="undefined" valign="undefined">${CURDIR}</td>
-
-
-
-
-
- <td align="undefined" valign="undefined">Test that OS lib was imported</td>
-
-
***The diff for this file has been truncated for email.***

Reply via email to