Revision: 38a417572955
Branch: default
Author: Pekka Klärck
Date: Wed Sep 12 15:22:56 2012
Log: rebot_resource.html -> rebot_resource.txt
http://code.google.com/p/robotframework/source/detail?r=38a417572955
Added:
/atest/resources/rebot_resource.txt
Deleted:
/atest/resources/rebot_resource.html
Modified:
/atest/robot/cli/rebot/remove_keywords/remove_keywords_resource.txt
/atest/robot/rebot/combine.txt
/atest/robot/rebot/filter_by_names.txt
/atest/robot/rebot/start_and_endtime_from_cli.txt
/atest/robot/rebot/xunit.txt
/atest/robot/tags/include_and_exclude_with_rebot.txt
/atest/robot/tags/tag_stat_include_and_exclude_with_rebot.txt
=======================================
--- /dev/null
+++ /atest/resources/rebot_resource.txt Wed Sep 12 15:22:56 2012
@@ -0,0 +1,25 @@
+*** Setting ***
+Resource atest_resource.txt
+
+*** Variable ***
+${ORIG_START} Set in Create Output With Robot
+${ORIG_END} -- ;; --
+${ORIG_ELAPSED} -- ;; --
+
+*** Keyword ***
+Create Output With Robot
+ [Arguments] ${outputname} ${arguments} @{datasource}
+ Run Tests ${arguments} @{datasource}
+ Is Valid Timestamp ${SUITE.starttime}
+ Is Valid Timestamp ${SUITE.endtime}
+ Is Valid Elapsed Time ${SUITE.elapsedtime}
+ Set Suite Variable $ORIG_START ${SUITE.starttime}
+ Set Suite Variable $ORIG_END ${SUITE.endtime}
+ Set Suite Variable $ORIG_ELAPSED ${SUITE.elapsedtime}
+ Run Keyword If "${outputname}" Move File ${OUTFILE}
${outputname}
+
+Check times
+ [Arguments] ${item} ${start} ${end} ${elapsed}
+ Should Be Equal ${item.starttime} ${start}
+ Should Be Equal ${item.endtime} ${end}
+ Should Be Equal As Integers ${item.elapsedtime} ${elapsed}
=======================================
--- /atest/resources/rebot_resource.html Mon Apr 12 05:17:10 2010
+++ /dev/null
@@ -1,753 +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 Resources</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>Resource</td>
-
-
- <td>atest_resource.txt</td>
-
-
- <td></td>
-
-
- <td></td>
-
-
- <td></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td></td>
-
-
- <td></td>
-
-
- <td></td>
-
-
- <td></td>
-
-
- <td></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">${ORIG_START}</td>
-
-
- <td align="undefined" valign="undefined">Set in Create Output w/
Robot</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined">${ORIG_END}</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>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined">${ORIG_ELAPSED}</td>
-
-
- <td align="undefined" valign="undefined">-- ;; --</td>
-
-
- <td></td>
-
-
- <td></td>
-
-
- <td></td>
-
-
- </tr>
-
-
-
-
-
-
-
- <tr>
-
-
- <td></td>
-
-
- <td></td>
-
-
- <td></td>
-
-
- <td></td>
-
-
- <td></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>Create Output With Robot</td>
-
-
- <td>[ Arguments ]</td>
-
-
- <td>${outputname}<br></td>
-
-
- <td align="undefined" valign="undefined">${arguments}
- </td>
-
-
- <td align="undefined" valign="undefined">@{datasource}</td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td>Run Tests</td>
-
-
- <td>${arguments}</td>
-
-
- <td>@{datasource}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined">Is
-Valid Timestamp</td>
-
-
- <td align="undefined" valign="undefined">${SUITE.starttime}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined">Is
-Valid Timestamp</td>
-
-
- <td align="undefined" valign="undefined">${SUITE.endtime}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined">Is
-Valid Elapsed Time</td>
-
-
- <td align="undefined" valign="undefined">${SUITE.elapsedtime}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td>Set Suite Variable</td>
-
-
- <td>$ORIG_START</td>
-
-
- <td>${SUITE.starttime}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td>Set Suite Variable</td>
-
-
- <td>$ORIG_END</td>
-
-
- <td>${SUITE.endtime}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td>Set Suite Variable</td>
-
-
- <td>$ORIG_ELAPSED</td>
-
-
- <td>${SUITE.elapsedtime}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
-
-
-
-
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined">Run Keyword Unless</td>
-
-
- <td align="undefined" valign="undefined">"${outputname}"
== ""</td><td align="undefined" valign="undefined"></td><td
align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </tr>
-
-
-
- <tr><td></td><td>...</td><td align="undefined" valign="undefined">Move
-File</td><td align="undefined" valign="undefined">${OUTFILE}</td><td
align="undefined" valign="undefined">${outputname}</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>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined">Check
-times</td>
-
-
- <td align="undefined" valign="undefined">[
-Arguments ]</td>
-
-
- <td align="undefined" valign="undefined">${item}</td>
-
-
- <td align="undefined" valign="undefined">${start}</td>
-
-
- <td align="undefined" valign="undefined">${end}</td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr><td></td><td>...</td><td align="undefined"
valign="undefined">${elapsed}</td><td align="undefined"
valign="undefined"><br></td><td></td></tr><tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined">Equals</td>
-
-
- <td align="undefined" valign="undefined">${item.starttime}</td>
-
-
- <td align="undefined" valign="undefined">${start}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined">Equals</td>
-
-
- <td align="undefined" valign="undefined">${item.endtime}</td>
-
-
- <td align="undefined" valign="undefined">${end}</td>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
-
-
-
-
-
-
- </tr>
-
-
- <tr>
-
-
- <td align="undefined" valign="undefined"></td>
-
-
- <td align="undefined" valign="undefined">Ints
-Equal</td>
-
-
- <td align="undefined" valign="undefined">${item.elapsedtime}</td>
-
-
- <td align="undefined" valign="undefined">${elapsed}</td>
-
-
- <td align="undefined" valign="undefined"></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>
-
-
-</body></html>
=======================================
--- /atest/robot/cli/rebot/remove_keywords/remove_keywords_resource.txt Wed
Sep 12 15:17:39 2012
+++ /atest/robot/cli/rebot/remove_keywords/remove_keywords_resource.txt Wed
Sep 12 15:22:56 2012
@@ -1,5 +1,5 @@
*** Settings ***
-Resource rebot_resource.html
+Resource rebot_resource.txt
*** Variables ***
${INPUTFILE} %{TEMPDIR}${/}rebot-test-rmkw.xml
=======================================
--- /atest/robot/rebot/combine.txt Wed Sep 12 15:17:39 2012
+++ /atest/robot/rebot/combine.txt Wed Sep 12 15:22:56 2012
@@ -2,7 +2,7 @@
Suite Setup Create Inputs For Rebot
Suite Teardown Remove Temp Files
Force Tags regression pybot jybot
-Resource ../../resources/rebot_resource.html
+Resource rebot_resource.txt
*** Variables ***
${TEMP OUT 1} %{TEMPDIR}${/}rebot-test-1.xml
=======================================
--- /atest/robot/rebot/filter_by_names.txt Wed Sep 12 15:17:39 2012
+++ /atest/robot/rebot/filter_by_names.txt Wed Sep 12 15:22:56 2012
@@ -4,7 +4,7 @@
Suite Teardown Remove Temps
Test Setup Empty Directory ${MYOUTDIR}
Default Tags regression jybot pybot
-Resource rebot_resource.html
+Resource rebot_resource.txt
*** Variables ***
${TESTDATA_TEST} misc${/}many_tests.txt
=======================================
--- /atest/robot/rebot/start_and_endtime_from_cli.txt Wed Sep 12 15:17:39
2012
+++ /atest/robot/rebot/start_and_endtime_from_cli.txt Wed Sep 12 15:22:56
2012
@@ -2,7 +2,7 @@
Suite Setup Create Input Files
Suite Teardown Remove Files ${INPUT1} ${INPUT2}
Force Tags regression pybot jybot
-Resource rebot_resource.html
+Resource rebot_resource.txt
*** Variables ***
${INPUT1} %{TEMPDIR}${/}rebot-test-a.xml
=======================================
--- /atest/robot/rebot/xunit.txt Wed Sep 12 15:17:39 2012
+++ /atest/robot/rebot/xunit.txt Wed Sep 12 15:22:56 2012
@@ -3,7 +3,7 @@
Suite Setup Create Input File
Test Setup Empty Directory ${MYOUTDIR}
Suite Teardown Remove Temps
-Resource rebot_resource.html
+Resource rebot_resource.txt
Variables unicode_vars.py
*** Variables ***
=======================================
--- /atest/robot/tags/include_and_exclude_with_rebot.txt Wed Sep 12
15:17:39 2012
+++ /atest/robot/tags/include_and_exclude_with_rebot.txt Wed Sep 12
15:22:56 2012
@@ -3,7 +3,7 @@
Suite Setup Create Output With Robot ${INPUT FILE} ${EMPTY}
${TESTFILE}
Suite Teardown Remove File ${INPUT FILE}
Default Tags regression pybot jybot
-Resource rebot_resource.html
+Resource rebot_resource.txt
Test Template Run And Check Include And Exclude
*** Variables ***
=======================================
--- /atest/robot/tags/tag_stat_include_and_exclude_with_rebot.txt Wed Sep
12 15:17:39 2012
+++ /atest/robot/tags/tag_stat_include_and_exclude_with_rebot.txt Wed Sep
12 15:22:56 2012
@@ -2,7 +2,7 @@
Suite Setup Create Output With Robot ${INPUT FILE} ${EMPTY} ${DATA
SOURCE}
Suite Teardown Remove File ${INPUT FILE}
Default Tags regression pybot jybot
-Resource rebot_resource.html
+Resource rebot_resource.txt
Test Template Run And Check Include And Exclude
*** Variables ***
