[robotframework commit] r1677 - fixed tests broken by change how test and suite names are written in details by suite tab...

codesite-noreply Sun, 05 Apr 2009 13:15:42 -0700


Author: pekka.klarck
Date: Sun Apr  5 13:12:41 2009
New Revision: 1677


Modified:
   trunk/atest/robot/output/html_formatting.html
   trunk/atest/robot/output/links_in_report_and_log.html
   trunk/atest/robot/output/splitting/split_log.html
   trunk/atest/robot/output/splitting/split_with_rebot.html
   trunk/atest/robot/output/splitting/splitting_resource.html

Log:

fixed tests broken by change how test and suite names are written indetails by suite table in report


Modified: trunk/atest/robot/output/html_formatting.html
==============================================================================
--- trunk/atest/robot/output/html_formatting.html       (original)
+++ trunk/atest/robot/output/html_formatting.html       Sun Apr  5 13:12:41 2009
@@ -3142,7 +3142,7 @@

- <pre id="line344">h.${test}</<spanclass="end-tag">a</span>></<spanclass="end-tag">td</span>>\n<br><<span class="start-tag">td</span><span class="attribute-name">class</span>=<spanclass="attribute-value">"col_doc"</span>>${doc}</<spanclass="end-tag">td</span>><br></pre>+ <pre id="line344">>${test}</<spanclass="end-tag">a</span>></<spanclass="end-tag">td</span>>\n<br><<span class="start-tag">td</span><span class="attribute-name">class</span>=<spanclass="attribute-value">"col_doc"</span>>${doc}</<spanclass="end-tag">td</span>><br></pre>





Modified: trunk/atest/robot/output/links_in_report_and_log.html
==============================================================================
--- trunk/atest/robot/output/links_in_report_and_log.html       (original)

+++ trunk/atest/robot/output/links_in_report_and_log.html Sun Apr 513:12:41 2009

@@ -1,9 +1,7 @@
-
 <!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="RobotIDE" />
+<html><head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="generator" content="RobotIDE">
 <style type="text/css">
 html {
   font-family: Arial,Helvetica,sans-serif;
@@ -56,16 +54,15 @@
   font-style: normal;
 }
 </style>
-<title>Links In Report And Log</title>
-</head>
+<title>Links In Report And Log</title></head>
+
+
 <body>
 <h1>Links In Report And Log</h1>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="value" span="4"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="value"span="4"></colgroup>

+<tbody><tr>
 <th>Setting</th>
 <th>Value</th>
 <th>Value</th>
@@ -100,13 +97,11 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="value" span="4"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="value"span="4"></colgroup>

+<tbody><tr>
 <th>Variable</th>
 <th>Value</th>
 <th>Value</th>
@@ -141,14 +136,11 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="action">
-<col class="arg" span="3"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="action"><col class="arg"span="3"></colgroup>

+<tbody><tr>
 <th>Test Case</th>
 <th>Action</th>
 <th>Argument</th>
@@ -180,14 +172,19 @@

<td>Link From Report's "Statistics By Suite" Table To "Test Details BySuite" Table</td>

 <td>Should Contain</td>
 <td>${REPORT}</td>

-<td><div class="stat_name"><a href="#suite_Multiple Suites.Suite3" title="Multiple Suites.Suite 3">m.Suite 3</a></div></td>

+<td>&lt;div class="stat_name"&gt;&lt;a href="#suite_Multiple
+Suites.Suite 3" title="Multiple Suites.Suite 3"&gt;m.Suite
+3&lt;/a&gt;&lt;/div&gt;</td>
 <td></td>
 </tr>
 <tr>
 <td></td>
 <td>Should Contain</td>
 <td>${REPORT}</td>

-<td><td class="col_name"><ahref="links_in_report_and_log_log.html#suite_Multiple Suites.Suite 3"id="suite_Multiple Suites.Suite 3" title="Multiple Suites.Suite3">m.Suite 3</a></td></td>

+<td>&lt;td class="col_name"&gt;&lt;a
+href="links_in_report_and_log_log.html#suite_Multiple Suites.Suite 3"
+id="suite_Multiple Suites.Suite 3" title="Multiple Suites.Suite
+3"&gt;Multiple Suites.Suite 3&lt;/a&gt;&lt;/td&gt;</td>
 <td></td>
 </tr>
 <tr>
@@ -201,7 +198,10 @@
 <td>Link From Report's "Test Details By Suite" Table To Log's Details</td>
 <td>Should Contain</td>
 <td>${REPORT}</td>

-<td><td class="col_name"><ahref="links_in_report_and_log_log.html#test_Multiple Suites.Suite3.Test1"</td>

+<td>&lt;td class="col_name"&gt;&lt;a
+href="links_in_report_and_log_log.html#test_Multiple Suites.Suite
+3.Test1" id="test_Multiple Suites.Suite 3.Test1" title="Multiple
+Suites.Suite 3.Test1"&gt;Test1&lt;/a&gt;&lt;/td&gt;</td>
 <td></td>
 </tr>
 <tr>
@@ -218,19 +218,16 @@
 <td></td>
 <td></td>
 </tr>
+
 <tr>
 <td>Link From Report's "Test Details By Tags" Table To Log's Details</td>
-<td>${expected} =</td>
-<td>Set Variable</td>

-<td><td class="col_name"><ahref="links_in_report_and_log_log.html#test_Multiple Suites.Suite 6.Test12"id="test_Multiple Suites.Suite 6.Test12" title="Multiple Suites.Suite6.Test12">m.s.Test12</a></td></td>

-<td></td>
-</tr>
-<tr>
+<td>Should Contain</td><td>${REPORT}</td>
+
+<td>&lt;td class="col_name"&gt;&lt;a
+href="links_in_report_and_log_log.html#test_Multiple Suites.Suite
+6.Test12" id="test_Multiple Suites.Suite 6.Test12" title="Multiple
+Suites.Suite 6.Test12"&gt;m.s.Test12&lt;/a&gt;&lt;/td&gt;</td>
 <td></td>
-<td>Should Contain Item X Times</td>
-<td>${REPORT}</td>
-<td>${expected}</td>
-<td>2</td>
 </tr>
 <tr>
 <td></td>
@@ -250,14 +247,18 @@
 <td>Link From Log's "Statistics By Suite" Table To Log's Details</td>
 <td>Should Contain</td>
 <td>${LOG}</td>

-<td><div class="stat_name"><a href="#suite_MultipleSuites.Subsuite 1.Suite 4" onclick="set_element_visible('suite_MultipleSuites.Subsuite 1.Suite 4')" title="Multiple Suites.Subsuite 1.Suite4">m.s.Suite 4</a></div></td>

+<td>&lt;div class="stat_name"&gt;&lt;a href="#suite_Multiple
+Suites.Subsuite 1.Suite 4" onclick="set_element_visible('suite_Multiple
+Suites.Subsuite 1.Suite 4')" title="Multiple Suites.Subsuite 1.Suite
+4"&gt;m.s.Suite 4&lt;/a&gt;&lt;/div&gt;</td>
 <td></td>
 </tr>
 <tr>
 <td></td>
 <td>Should Contain</td>
 <td>${LOG}</td>

-<td><a class="name" name="suite_Multiple Suites.Subsuite 1.Suite 4"title="Multiple Suites.Subsuite 1.Suite 4">Suite 4</a></td>

+<td>&lt;a class="name" name="suite_Multiple Suites.Subsuite 1.Suite 4"
+title="Multiple Suites.Subsuite 1.Suite 4"&gt;Suite 4&lt;/a&gt;</td>
 <td></td>
 </tr>
 <tr>
@@ -274,14 +275,11 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="action">
-<col class="arg" span="3"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="action"><col class="arg"span="3"></colgroup>

+<tbody><tr>
 <th>Keyword</th>
 <th>Action</th>
 <th>Argument</th>
@@ -337,7 +335,6 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

-</body>
-</html>
+</body></html>
\ No newline at end of file

Modified: trunk/atest/robot/output/splitting/split_log.html
==============================================================================
--- trunk/atest/robot/output/splitting/split_log.html   (original)

+++ trunk/atest/robot/output/splitting/split_log.html Sun Apr 5 13:12:412009

@@ -1,9 +1,7 @@
-
 <!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="RobotIDE" />
+<html><head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="generator" content="RobotIDE">
 <style type="text/css">
 html {
   font-family: Arial,Helvetica,sans-serif;
@@ -56,16 +54,13 @@
   font-style: normal;
 }
 </style>
-<title>Split Log</title>
-</head>
+<title>Split Log</title></head>
 <body>
 <h1>Split Log</h1>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="value" span="4"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="value"span="4"></colgroup>

+<tbody><tr>
 <th>Setting</th>
 <th>Value</th>
 <th>Value</th>
@@ -74,30 +69,26 @@
 </tr>
 <tr>
 <td>Documentation</td>

-<td>Tests for making sure splitting logs into multiple html files workswhile running tests These tests assume that splitting outputs to multiplexmls works in the first place.</td>

-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>Default Tags</td>
-<td>regression</td>
+<td>Tests for making sure splitting logs into multiple html files works
+while running tests These tests assume that splitting outputs to
+multiple xmls works in the first place.</td>
 <td></td>
 <td></td>
 <td></td>
 </tr>
+
 <tr>
 <td>Force Tags</td>
 <td>pybot</td>
 <td>jybot</td>
-<td></td>
+<td>regression</td>
 <td></td>
 </tr>
 <tr>
 <td>Suite Setup</td>
 <td>My Run Tests</td>

<td>--splitoutputs 1 --log subsuites-log --report subsuites-report--variable SLEEP:1.1s</td>

-<td>misc${/}suites${/}subsuites</td>
+<td>misc/suites/subsuites</td>
 <td></td>
 </tr>
 <tr>
@@ -121,13 +112,11 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="value" span="4"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="value"span="4"></colgroup>

+<tbody><tr>
 <th>Variable</th>
 <th>Value</th>
 <th>Value</th>
@@ -141,14 +130,11 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="action">
-<col class="arg" span="3"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="action"><col class="arg"span="3"></colgroup>

+<tbody><tr>
 <th>Test Case</th>
 <th>Action</th>
 <th>Argument</th>
@@ -158,7 +144,7 @@
 <tr>
 <td>Correct Sub Logs Should Be Created</td>
 <td>@{files} =</td>
-<td>List Dir</td>
+<td>List Directory</td>
 <td>${OUTDIR}</td>
 <td>${LOGBASE}*.html</td>
 </tr>
@@ -201,21 +187,21 @@
 <td>Sub Logs Should Have Been Created Before Finishing Index</td>
 <td>${sub1} =</td>
 <td>Get Modified Time</td>
-<td>${OUTDIR}${/}${LOGBASE}-001.html</td>
+<td>${OUTDIR}/${LOGBASE}-001.html</td>
 <td>epoch</td>
 </tr>
 <tr>
 <td></td>
 <td>${sub2} =</td>
 <td>Get Modified Time</td>
-<td>${OUTDIR}${/}${LOGBASE}-002.html</td>
+<td>${OUTDIR}/${LOGBASE}-002.html</td>
 <td>epoch</td>
 </tr>
 <tr>
 <td></td>
 <td>${index} =</td>
 <td>Get Modified Time</td>
-<td>${OUTDIR}${/}${LOGBASE}.html</td>
+<td>${OUTDIR}/${LOGBASE}.html</td>
 <td>epoch</td>
 </tr>
 <tr>
@@ -236,7 +222,7 @@
 <td>Index Log Should Have Links To Sub Logs But No Sub Log Content</td>
 <td>${index} =</td>
 <td>Get File</td>
-<td>${OUTDIR}${/}${LOGBASE}.html</td>
+<td>${OUTDIR}/${LOGBASE}.html</td>
 <td></td>
 </tr>
 <tr>
@@ -278,7 +264,7 @@
 <td>Sub Logs Should Have Correct Content</td>
 <td>${sublog} =</td>
 <td>Get File</td>
-<td>${OUTDIR}${/}${LOGBASE}-002.html</td>
+<td>${OUTDIR}/${LOGBASE}-002.html</td>
 <td></td>
 </tr>
 <tr>
@@ -312,15 +298,15 @@
 <tr>
 <td>Report Should Have Correct Links</td>
 <td>${report} =</td>
-<td>Set</td>
-<td>${LOGBASE.replace('log','report')}.html</td>
-<td></td>
+<td>Set Variable</td>
+<td>${LOGBASE.replace('log','report')}</td>
+<td><br></td>
 </tr>
 <tr>
 <td></td>
 <td>${index} =</td>
 <td>Get File</td>
-<td>${OUTDIR}${/}${report}</td>
+<td>${OUTDIR}/${report}.html</td>
 <td></td>
 </tr>
 <tr>
@@ -332,7 +318,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Index Log Should Be Ok</td>
+<td>Link In Suite Details Table To Index Log Should Be Ok</td>
 <td>${details}</td>
 <td>Subsuites</td>
 <td>${LOGBASE}.html</td>
@@ -346,7 +332,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Sub Log Should Be Ok</td>
+<td>Link In Suite Details Table To Sub Log Should Be Ok</td>
 <td>${details}</td>
 <td>Subsuites.Sub 1</td>
 <td>${LOGBASE}-001.html</td>
@@ -360,7 +346,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Sub Log Should Be Ok</td>
+<td>Link In Suite Details Table To Sub Log Should Be Ok</td>
 <td>${details}</td>
 <td>Subsuites.Sub 1.SubSuite1 First</td>
 <td>${LOGBASE}-001.html</td>
@@ -374,32 +360,20 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Sub Log Should Be Ok</td>
+<td>Link In Tag&nbsp;Details Table To Sub Log Should Be Ok</td>
 <td>${tags}</td>
 <td>Subsuites.Sub 1.SubSuite1 First</td>
 <td>${LOGBASE}-001.html</td>
 </tr>
+
 <tr>
 <td></td>
-<td>...</td>
-<td>test</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>Link In Report To Sub Log Should Be Ok</td>
+<td>Link In Tag&nbsp;Details Table To Sub Log Should Be Ok</td>
 <td>${tags}</td>
 <td>Subsuites.Sub 2.SubSuite2 First</td>
 <td>${LOGBASE}-002.html</td>
 </tr>
-<tr>
-<td></td>
-<td>...</td>
-<td>test</td>
-<td></td>
-<td></td>
-</tr>
+
 <tr>
 <td></td>
 <td></td>
@@ -440,7 +414,7 @@
 <td>@{files} =</td>
 <td>My Run Tests</td>
 <td>--SplitOutputs 1 --log mylog.html</td>
-<td>misc${/}normal.html</td>
+<td>misc/normal.html</td>
 </tr>
 <tr>
 <td></td>
@@ -460,7 +434,7 @@
 <td></td>
 <td>${index} =</td>
 <td>Get File</td>
-<td>${OUTDIR}${/}mylog.html</td>
+<td>${OUTDIR}/mylog.html</td>
 <td></td>
 </tr>
 <tr>
@@ -509,7 +483,7 @@
 <td></td>
 <td>${index} =</td>
 <td>Log File</td>
-<td>${OUTDIR}${/}${LOGBASE}.html</td>
+<td>${OUTDIR}/${LOGBASE}.html</td>
 <td></td>
 </tr>
 <tr>
@@ -698,14 +672,16 @@
 <td></td>
 <td>${index} =</td>
 <td>Get File</td>
-<td>${OUTDIR}${/}nestedsuite2.html</td>
+<td>${OUTDIR}/nestedsuite2.html</td>
 <td></td>
 </tr>
 <tr>
 <td></td>
 <td>Should Contain</td>
 <td>${index}</td>

-<td><span class="fail">TEST&nbsp;CASE: </span>\n<aclass="name" name="test_Suites.Fourth.Suite4 First"title="Suites.Fourth.Suite4 First">Suite4 First</a></td>

+<td>&lt;span class="fail"&gt;TEST&amp;nbsp;CASE: &lt;/span&gt;\n&lt;a
+class="name" name="test_Suites.Fourth.Suite4 First"
+title="Suites.Fourth.Suite4 First"&gt;Suite4 First&lt;/a&gt;</td>
 <td></td>
 </tr>
 <tr>
@@ -775,7 +751,7 @@
 <td></td>
 <td>${index} =</td>
 <td>Get File</td>
-<td>${OUTDIR}${/}${LOGBASE}.html</td>
+<td>${OUTDIR}/${LOGBASE}.html</td>
 <td></td>
 </tr>
 <tr>
@@ -873,21 +849,16 @@
 <td></td>
 <td>${sub_outs} =</td>
 <td>Join Path</td>
-<td>${OUTPUTDIR}</td>
-<td>output${/}suites</td>
-</tr>
-<tr>
-<td></td>
-<td>...</td>
-<td>output-*.xml</td>
-<td></td>
-<td></td>
-</tr>
+<td>${OUTPUTDIR}/output/suites
+
+
+</td>
+<td>output-*.xml</td></tr>
 <tr>
 <td></td>
 <td>Run Tests Without Processing Output</td>

<td>--SplitOutputs 1 --log rm_sub_outs_1.html --variableSUITE_TEARDOWN_KW:Remove_File --variable SUITE_TEARDOWN_ARG:${sub_outs}</td>

-<td>misc${/}suites</td>
+<td>misc/suites</td>
 <td></td>
 </tr>
 <tr>
@@ -943,7 +914,7 @@
 <td></td>
 <td>Run Tests Without Processing Output</td>

<td>--SplitOutputs 2 --log rm_sub_outs_2.html --variableSUITE_TEARDOWN_KW:Remove_File --variable SUITE_TEARDOWN_ARG:${sub_outs}</td>

-<td>misc${/}suites</td>
+<td>misc/suites</td>
 <td></td>
 </tr>
 <tr>
@@ -984,7 +955,7 @@
 <tr>
 <td></td>
 <td></td>
-<td>Contains</td>
+<td>Should Contain</td>
 <td>${index}</td>
 <td>Removed file '&lt;a href="${path}"&gt;${path}&lt;/a&gt;'</td>
 </tr>
@@ -1002,14 +973,11 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="action">
-<col class="arg" span="3"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="action"><col class="arg"span="3"></colgroup>

+<tbody><tr>
 <th>Keyword</th>
 <th>Action</th>
 <th>Argument</th>
@@ -1028,7 +996,7 @@
 <td>@{files} =</td>
 <td>My Run Tests</td>
 <td>--SplitOutputs ${level} --log nestedsuite${level} --critical t1</td>
-<td>misc${/}suites</td>
+<td>misc/suites</td>
 </tr>
 <tr>
 <td></td>
@@ -1110,7 +1078,7 @@
 <tr>
 <td></td>
 <td>Remove File</td>
-<td>${OUTDIR}${/}${LOGBASE}*.html</td>
+<td>${OUTDIR}/${LOGBASE}*.html</td>
 <td></td>
 <td></td>
 </tr>
@@ -1496,7 +1464,7 @@
 <td></td>
 <td>${index} =</td>
 <td>Get File</td>
-<td>${logdir}${/}${logname}.html</td>
+<td>${logdir}/${logname}.html</td>
 <td></td>
 </tr>
 <tr>
@@ -1657,7 +1625,7 @@
 <td></td>
 <td>${index} =</td>
 <td>Get File</td>
-<td>${logdir}${/}${logname}.html</td>
+<td>${logdir}/${logname}.html</td>
 <td></td>
 </tr>
 <tr>
@@ -1737,7 +1705,6 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

-</body>
-</html>
+</body></html>
\ No newline at end of file

Modified: trunk/atest/robot/output/splitting/split_with_rebot.html
==============================================================================
--- trunk/atest/robot/output/splitting/split_with_rebot.html    (original)

+++ trunk/atest/robot/output/splitting/split_with_rebot.html Sun Apr 513:12:41 2009

@@ -288,7 +288,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Index Log Should Be Ok</td>
+<td>Link In Suite Details Table To Index Log Should Be Ok</td>
 <td>${details}</td>
 <td>Misc</td>
 <td>split2.html</td>
@@ -302,7 +302,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Index Log Should Be Ok</td>
+<td>Link In&nbsp;Suite Details Table To Index Log Should Be Ok</td>
 <td>${details}</td>
 <td>Misc.Dummy Lib Test.Dummy Test</td>
 <td>split2.html</td>
@@ -316,7 +316,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Sub Log Should Be Ok</td>
+<td>Link In&nbsp;Suite Details Table To Sub Log Should Be Ok</td>
 <td>${details}</td>
 <td>Misc.Suites.Fourth</td>
 <td>split2-011.html</td>
@@ -330,7 +330,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Sub Log Should Be Ok</td>
+<td>Link In&nbsp;Suite Details Table To Sub Log Should Be Ok</td>
 <td>${details}</td>
 <td>Misc.Suites.Fourth.Suite4 First</td>
 <td>split2-011.html</td>
@@ -344,21 +344,15 @@
 </tr>
 <tr>
 <td></td>
-<td>Link In Report To Index Log Should Be Ok</td>
+<td>Link In Tag Details Table To Index Log Should Be Ok</td>
 <td>${tags}</td>
 <td>Misc.Many Tests.First</td>
 <td>split2.html</td>
 </tr>
+
 <tr>
 <td></td>
-<td>...</td>
-<td>test</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>Link In Report To Sub Log Should Be Ok</td>
+<td>Link In Tag Details Table To Sub Log Should Be Ok</td>
 <td>${tags}</td>
 <td>Misc.Suites.Subsuites 2.Subsuite 3.SubSuite3 Second</td>
 <td>split2-013.html</td>
@@ -366,9 +360,9 @@
 <tr>
 <td></td>
 <td>...</td>
-<td>test</td>
 <td>2</td>
 <td></td>
+<td></td>
 </tr>
 <tr>
 <td></td>
@@ -462,20 +456,14 @@
 </tr>
 <tr>
 <td><a name="keyword_Run Some Tests">Run Some Tests</a></td>
-<td>[Timeout]</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td></td>
-<td>Run Tests</td>
-<td></td>
-<td>misc</td>
+<td>Run Tests</td><td></td><td>misc</td>
+
+
 <td></td>
 </tr>


+
 <tr>
 <td></td>
 <td>Move File</td>
@@ -496,13 +484,7 @@
 <td></td>
 <td></td>
 </tr>
-<tr>
-<td></td>
-<td>[Timeout]</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
+
 <tr>
 <td></td>
 <td>Run Rebot</td>
@@ -512,7 +494,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Equals</td>
+<td>Should Be Equal</td>
 <td>${SUITE.status}</td>
 <td>FAIL</td>
 <td></td>
@@ -531,13 +513,7 @@
 <td>${ext}</td>
 <td>${exp_count}</td>
 </tr>
-<tr>
-<td></td>
-<td>[Timeout]</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
+
 <tr>
 <td></td>
 <td>@{files} =</td>
@@ -547,7 +523,7 @@
 </tr>
 <tr>
 <td></td>
-<td>Fail Unless</td>
+<td>Should Be True</td>
 <td>len(@{files}) == ${exp_count}</td>
 <td></td>
 <td></td>
@@ -576,13 +552,13 @@
 <tr>
 <td></td>
 <td></td>
-<td>Equals</td>
+<td>Should Be Equal</td>
 <td>@{files}[${i}]</td>
 <td>${base}-${id}.${ext}</td>
 </tr>
 <tr>
 <td></td>
-<td>Equals</td>
+<td>Should Be Equal</td>
 <td>@{files}[${id}]</td>
 <td>${base}.${ext}</td>
 <td></td>

Modified: trunk/atest/robot/output/splitting/splitting_resource.html
==============================================================================
--- trunk/atest/robot/output/splitting/splitting_resource.html  (original)

+++ trunk/atest/robot/output/splitting/splitting_resource.html Sun Apr 513:12:41 2009

@@ -1,9 +1,7 @@
-
 <!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="RobotIDE" />
+<html><head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="generator" content="RobotIDE">
 <style type="text/css">
 html {
   font-family: Arial,Helvetica,sans-serif;
@@ -56,16 +54,15 @@
   font-style: normal;
 }
 </style>
-<title>Splitting Resource</title>
-</head>
+<title>Splitting Resource</title></head>
+
+
 <body>
 <h1>Splitting Resource</h1>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="value" span="4"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="value"span="4"></colgroup>

+<tbody><tr>
 <th>Setting</th>
 <th>Value</th>
 <th>Value</th>
@@ -79,13 +76,11 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="value" span="4"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="value"span="4"></colgroup>

+<tbody><tr>
 <th>Variable</th>
 <th>Value</th>
 <th>Value</th>
@@ -99,14 +94,11 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

 <table border="1">
-<colgroup span="99">
-<col class="name">
-<col class="action">
-<col class="arg" span="3"></colgroup>
-<tr>

+<colgroup span="99"><col class="name"><col class="action"><col class="arg"span="3"></colgroup>

+<tbody><tr>
 <th>Keyword</th>
 <th>Action</th>
 <th>Argument</th>
@@ -122,9 +114,12 @@
 </tr>
 <tr>
 <td></td>
-<td>Contains</td>
+<td>Should Contain</td>
 <td>${file}</td>

-<td><td class="col_stat_name">\n <div class="stat_name"><ahref="#suite_${name}" onclick="set_element_visible('suite_${name}')"title="${name}">${name}</a></div>\n </td></td>

+<td>&lt;td class="col_stat_name"&gt;\n &lt;div
+class="stat_name"&gt;&lt;a href="#suite_${name}"
+onclick="set_element_visible('suite_${name}')"
+title="${name}"&gt;${name}&lt;/a&gt;&lt;/div&gt;\n &lt;/td&gt;</td>
 <td></td>
 </tr>
 <tr>
@@ -157,9 +152,11 @@
 </tr>
 <tr>
 <td></td>
-<td>Contains</td>
+<td>Should Contain</td>
 <td>${file}</td>

-<td><td class="col_stat_name">\n <div class="stat_name"><ahref="${link}#suite_${normal}"title="${full}">${med}</a></div>\n </td></td>

+<td>&lt;td class="col_stat_name"&gt;\n &lt;div
+class="stat_name"&gt;&lt;a href="${link}#suite_${normal}"
+title="${full}"&gt;${med}&lt;/a&gt;&lt;/div&gt;\n &lt;/td&gt;</td>
 <td></td>
 </tr>
 <tr>
@@ -192,9 +189,11 @@
 </tr>
 <tr>
 <td></td>
-<td>Contains</td>
+<td>Should Contain</td>
 <td>${file}</td>

-<td><span class="fail">TEST&nbsp;SUITE: </span>\n <aclass="splitname" href="${link}#suite_${normal}" name="suite_${med}"title="${full}">${normal}</a></td>

+<td>&lt;span class="fail"&gt;TEST&amp;nbsp;SUITE: &lt;/span&gt;\n &lt;a
+class="splitname" href="${link}#suite_${normal}" name="suite_${med}"
+title="${full}"&gt;${normal}&lt;/a&gt;</td>
 <td></td>
 </tr>
 <tr>
@@ -213,9 +212,10 @@
 </tr>
 <tr>
 <td></td>
-<td>Contains</td>
+<td>Should Contain</td>
 <td>${file}</td>

-<td><span class="pass">TEST&nbsp;SUITE: </span>\n <aclass="name" name="suite_${name}" title="${name}">${name}</a></td>

+<td>&lt;span class="pass"&gt;TEST&amp;nbsp;SUITE: &lt;/span&gt;\n &lt;a
+class="name" name="suite_${name}" title="${name}"&gt;${name}&lt;/a&gt;</td>
 <td></td>
 </tr>
 <tr>
@@ -248,9 +248,10 @@
 </tr>
 <tr>
 <td></td>
-<td>Contains</td>
+<td>Should Contain</td>
 <td>${file}</td>

-<td><span class="pass">TEST&nbsp;CASE: </span>\n <aclass="name" name="test_${full}" title="${full}">${normal}</a></td>

+<td>&lt;span class="pass"&gt;TEST&amp;nbsp;CASE: &lt;/span&gt;\n &lt;a

+class="name" name="test_${full}"title="${full}">${normal}</a></td>

 <td></td>
 </tr>
 <tr>
@@ -261,7 +262,7 @@
 <td></td>
 </tr>
 <tr>
-<td>Link In Report To Index Log Should Be Ok</td>
+<td>Link In Suite Details Table To Index Log Should Be Ok</td>
 <td>[Arguments]</td>
 <td>${file}</td>
 <td>${name}</td>
@@ -279,23 +280,26 @@
 <td>${full}</td>
 <td>${med}</td>
 <td>${normal} =</td>
-<td>Get Names</td>
+<td><br></td>
 </tr>
 <tr>
 <td></td>
 <td>...</td>
-<td>${name}</td>
-<td></td>
+<td>Get Names</td><td>${name}</td>
+
 <td></td>
 </tr>
-<tr>

+<tr><td></td><td>${name} =</td><td>Set Variable If</td><td>"${type}"== "suite"</td><td>${full}</td></tr><tr><td></td><td>...</td><td>${normal}</td><td></td><td></td></tr><tr>

 <td></td>
-<td>Contains</td>
+<td>Should Contain</td>
 <td>${file}</td>

-<td><td class="col_name"><a href="${link}#${type}_${full}"id="${type}_${full}" title="${full}">${med}</a></td></td>

+<td>&lt;td class="col_name"&gt;&lt;a href="${link}#${type}_${full}"
+id="${type}_${full}" title="${full}"&gt;${name}&lt;/a&gt;&lt;/td&gt;</td>
 <td></td>
 </tr>
-<tr>

+<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Link In TagDetails Table To Index Log Should BeOk</td><td>[Arguments]</td><td>${file}</td><td>${name}</td><td>${link}</td></tr><tr><td></td><td>${full}</td><td>${med}</td><td>${normal}=</td><td><br></td></tr><tr><td></td><td>...</td><td>GetNames</td><td>${name}</td><td></td></tr><tr><td></td><td>ShouldContain</td><td>${file}</td><td><td

+class="col_name"&gt;&lt;a href="${link}#test_${full}"

+id="test_${full}"title="${full}">${med}</a></td></td><td></td></tr><tr>

 <td></td>
 <td></td>
 <td></td>
@@ -303,7 +307,7 @@
 <td></td>
 </tr>
 <tr>
-<td>Link In Report To Sub Log Should Be Ok</td>
+<td>Link In Suite Details Table To Sub Log Should Be Ok</td>
 <td>[Arguments]</td>
 <td>${file}</td>
 <td>${name}</td>
@@ -321,16 +325,16 @@
 <td>${full}</td>
 <td>${med}</td>
 <td>${normal} =</td>
-<td>Get Names</td>
+<td><br></td>
 </tr>
 <tr>
 <td></td>
 <td>...</td>
-<td>${name}</td>
-<td></td>
+<td>Get Names</td><td>${name}</td>
+
 <td></td>
 </tr>
-<tr>

+<tr><td></td><td>${name} =</td><td>Set Variable If</td><td>"${type}"== "suite"</td><td>${full}</td></tr><tr><td></td><td>...</td><td>${normal}</td><td></td><td></td></tr><tr>

 <td></td>
 <td>${subfull} =</td>
 <td>Get Splitted Full Name</td>
@@ -339,12 +343,15 @@
 </tr>
 <tr>
 <td></td>
-<td>Contains</td>
+<td>Should Contain</td>
 <td>${file}</td>

-<td><td class="col_name"><a href="${link}#${type}_${subfull}"id="${type}_${full}" title="${full}">${med}</a></td></td>

+<td>&lt;td class="col_name"&gt;&lt;a href="${link}#${type}_${subfull}"
+id="${type}_${full}" title="${full}"&gt;${name}&lt;/a&gt;&lt;/td&gt;</td>
 <td></td>
 </tr>
-<tr>

+<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Link In TagDetails Table To Sub Log Should BeOk</td><td>[Arguments]</td><td>${file}</td><td>${name}</td><td>${link}</td></tr><tr><td></td><td>...</td><td>${splitlevel}=1</td><td><br></td><td></td></tr><tr><td></td><td>${full}</td><td>${med}</td><td>${normal}=</td><td><br></td></tr><tr><td></td><td>...</td><td>GetNames</td><td>${name}</td><td></td></tr><tr><td></td><td>${subfull}=</td><td>Get Splitted FullName</td><td>${full}</td><td>${splitlevel}</td></tr><tr><td></td><td>ShouldContain</td><td>${file}</td><td><td

+class="col_name"&gt;&lt;a href="${link}#test_${subfull}"

+id="test_${full}"title="${full}">${med}</a></td></td><td></td></tr><tr>

 <td></td>
 <td></td>
 <td></td>
@@ -407,7 +414,6 @@
 <td></td>
 <td></td>
 </tr>
-</table>
+</tbody></table>

-</body>
-</html>
+</body></html>
\ No newline at end of file

[robotframework commit] r1677 - fixed tests broken by change how test and suite names are written in details by suite tab...

Reply via email to