Author: jprantan
Date: Mon Apr 6 22:00:21 2009
New Revision: 1709
Modified:
trunk/atest/robot/output/splitting/split_log.html
trunk/atest/robot/output/splitting/splitting_resource.html
Log:
Added test for statistics table links in index log and fixed tests.
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 Mon Apr 6 22:00:21
2009
@@ -1,7 +1,9 @@
+
<!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;
@@ -54,13 +56,16 @@
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>
-<tbody><tr>
+<colgroup span="99">
+<col class="name">
+<col class="value" span="4"></colgroup>
+<tr>
<th>Setting</th>
<th>Value</th>
<th>Value</th>
@@ -69,14 +74,11 @@
</tr>
<tr>
<td>Documentation</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>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>
@@ -112,11 +114,13 @@
<td></td>
<td></td>
</tr>
-</tbody></table>
+</table>
<table border="1">
-<colgroup span="99"><col class="name"><col class="value"
span="4"></colgroup>
-<tbody><tr>
+<colgroup span="99">
+<col class="name">
+<col class="value" span="4"></colgroup>
+<tr>
<th>Variable</th>
<th>Value</th>
<th>Value</th>
@@ -130,11 +134,14 @@
<td></td>
<td></td>
</tr>
-</tbody></table>
+</table>
<table border="1">
-<colgroup span="99"><col class="name"><col class="action"><col class="arg"
span="3"></colgroup>
-<tbody><tr>
+<colgroup span="99">
+<col class="name">
+<col class="action">
+<col class="arg" span="3"></colgroup>
+<tr>
<th>Test Case</th>
<th>Action</th>
<th>Argument</th>
@@ -300,7 +307,7 @@
<td>${report} =</td>
<td>Set Variable</td>
<td>${LOGBASE.replace('log','report')}</td>
-<td><br></td>
+<td></td>
</tr>
<tr>
<td></td>
@@ -360,20 +367,18 @@
</tr>
<tr>
<td></td>
-<td>Link In Tag Details Table To Sub Log Should Be Ok</td>
+<td>Link In Tag 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>Link In Tag Details Table To Sub Log Should Be Ok</td>
+<td>Link In Tag 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>
@@ -679,9 +684,7 @@
<td></td>
<td>Should Contain</td>
<td>${index}</td>
-<td><span class="fail">TEST&nbsp;CASE: </span>\n<a
-class="name" name="test_Suites.Fourth.Suite4 First"
-title="Suites.Fourth.Suite4 First">Suite4 First</a></td>
+<td><span class="fail">TEST&nbsp;CASE: </span>\n<a
class="name" name="test_Suites.Fourth.Suite4 First"
title="Suites.Fourth.Suite4 First">Suite4 First</a></td>
<td></td>
</tr>
<tr>
@@ -849,11 +852,9 @@
<td></td>
<td>${sub_outs} =</td>
<td>Join Path</td>
-<td>${OUTPUTDIR}/output/suites
-
-
-</td>
-<td>output-*.xml</td></tr>
+<td>${OUTPUTDIR}/output/suites</td>
+<td>output-*.xml</td>
+</tr>
<tr>
<td></td>
<td>Run Tests Without Processing Output</td>
@@ -908,7 +909,7 @@
<td></td>
<td>Should Contain</td>
<td>${index}</td>
-<td>Removed file '<a href="${path}">${path}</a>'</td>
+<td>Removed file '<a href="file://${path}">${path}</a>'</td>
</tr>
<tr>
<td></td>
@@ -957,7 +958,7 @@
<td></td>
<td>Should Contain</td>
<td>${index}</td>
-<td>Removed file '<a href="${path}">${path}</a>'</td>
+<td>Removed file '<a href="file://${path}"></td>
</tr>
<tr>
<td></td>
@@ -967,17 +968,125 @@
<td></td>
</tr>
<tr>
+<td>Statistcs By Suite Table Should Contain Correct Links In Index Log</td>
+<td>${name} =</td>
+<td>Set Variable</td>
+<td>statistics_by_suite_links_log</td>
<td></td>
+</tr>
+<tr>
<td></td>
+<td>Run Tests</td>
+<td>--log ${name} --splitoutput 2</td>
+<td>misc</td>
<td></td>
+</tr>
+<tr>
<td></td>
+<td>Statistics Table Should Contain Link</td>
+<td>${name}.html</td>
<td></td>
+<td>Misc</td>
</tr>
-</tbody></table>
+<tr>
+<td></td>
+<td>...</td>
+<td>Misc</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>Statistics Table Should Contain Link</td>
+<td>${name}.html</td>
+<td>${name}-002.html</td>
+<td>Subsuite 1.Suite 2</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td>Misc.Multiple Suites.Subsuite 1.Suite 2</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>Statistics Table Should Contain Link</td>
+<td>${name}.html</td>
+<td>${name}-010.html</td>
+<td>Suite 9</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td>Misc.Multiple Suites.Suite 9</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>Statistics Table Should Contain Link</td>
+<td>${name}.html</td>
+<td></td>
+<td>Misc.Normal</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td>Misc.Normal</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>Statistics Table Should Contain Link</td>
+<td>${name}.html</td>
+<td>${name}-012.html</td>
+<td>Subsuites.Sub 1</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td>Misc.Suites.Subsuites.Sub 1</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>Statistics Table Should Contain Link</td>
+<td>${name}.html</td>
+<td></td>
+<td>Misc.Unicode</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td>Misc.Unicode</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+</table>
<table border="1">
-<colgroup span="99"><col class="name"><col class="action"><col class="arg"
span="3"></colgroup>
-<tbody><tr>
+<colgroup span="99">
+<col class="name">
+<col class="action">
+<col class="arg" span="3"></colgroup>
+<tr>
<th>Keyword</th>
<th>Action</th>
<th>Argument</th>
@@ -1166,7 +1275,6 @@
<td>${test}</td>
<td>${status}=pass</td>
</tr>
-
<tr>
<td></td>
<td>${expected} =</td>
@@ -1209,10 +1317,6 @@
<td></td>
<td></td>
</tr>
-
-
-
-
<tr>
<td>Log Should Contain Sub Log Content</td>
<td>[Arguments]</td>
@@ -1669,12 +1773,69 @@
<td></td>
</tr>
<tr>
+<td>Statistics Table Should Contain Link</td>
+<td>[Arguments]</td>
+<td>${file}</td>
+<td>${path}</td>
+<td>${link}</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td>${name}</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>${content} =</td>
+<td>Get File</td>
+<td>${OUTDIR}${/}${file}</td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>${on click} =</td>
+<td>Set Variable If</td>
+<td>"${link}" == "${name}"</td>
+<td>onclick="set_element_visible('suite_${name}')"${SPACE}</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td>${EMPTY}</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>${name span} =</td>
+<td>Get Name Span In Statistics Table</td>
+<td>${name}</td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>Should Contain</td>
+<td>${content}</td>
+<td><div class="stat_name"><a href="${path}#suite_${link}" ${on
click}title="${name}">${name span}</a></div></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
-</tbody></table>
+</table>
-</body></html>
\ No newline at end of file
+</body>
+</html>
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 Mon Apr 6
22:00:21 2009
@@ -1,7 +1,9 @@
+
<!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;
@@ -54,13 +56,16 @@
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>
-<tbody><tr>
+<colgroup span="99">
+<col class="name">
+<col class="value" span="4"></colgroup>
+<tr>
<th>Setting</th>
<th>Value</th>
<th>Value</th>
@@ -74,11 +79,13 @@
<td></td>
<td></td>
</tr>
-</tbody></table>
+</table>
<table border="1">
-<colgroup span="99"><col class="name"><col class="value"
span="4"></colgroup>
-<tbody><tr>
+<colgroup span="99">
+<col class="name">
+<col class="value" span="4"></colgroup>
+<tr>
<th>Variable</th>
<th>Value</th>
<th>Value</th>
@@ -92,11 +99,14 @@
<td></td>
<td></td>
</tr>
-</tbody></table>
+</table>
<table border="1">
-<colgroup span="99"><col class="name"><col class="action"><col class="arg"
span="3"></colgroup>
-<tbody><tr>
+<colgroup span="99">
+<col class="name">
+<col class="action">
+<col class="arg" span="3"></colgroup>
+<tr>
<th>Keyword</th>
<th>Action</th>
<th>Argument</th>
@@ -114,10 +124,7 @@
<td></td>
<td>Should Contain</td>
<td>${file}</td>
-<td><td class="col_stat_name">\n <div
-class="stat_name"><a href="#suite_${name}"
-onclick="set_element_visible('suite_${name}')"
-title="${name}">${name}</a></div>\n </td></td>
+<td><td class="col_stat_name">\n <div class="stat_name"><a
href="#suite_${name}" onclick="set_element_visible('suite_${name}')"
title="${name}">${name}</a></div>\n </td></td>
<td></td>
</tr>
<tr>
@@ -137,24 +144,22 @@
<tr>
<td></td>
<td>${full}</td>
-<td>${med}</td>
<td>${normal} =</td>
<td>Get Names</td>
+<td>${name}</td>
</tr>
<tr>
<td></td>
-<td>...</td>
-<td>${name}</td>
-<td></td>
+<td>${name span} =</td>
+<td>Get Name Span In Statistics Table</td>
+<td>${full}</td>
<td></td>
</tr>
<tr>
<td></td>
<td>Should Contain</td>
<td>${file}</td>
-<td><td class="col_stat_name">\n <div
-class="stat_name"><a href="${link}#suite_${normal}"
-title="${full}">${med}</a></div>\n </td></td>
+<td><td class="col_stat_name">\n <div class="stat_name"><a
href="${link}#suite_${normal}" title="${full}">${name
span}</a></div>\n </td></td>
<td></td>
</tr>
<tr>
@@ -174,24 +179,15 @@
<tr>
<td></td>
<td>${full}</td>
-<td>${med}</td>
<td>${normal} =</td>
<td>Get Names</td>
-</tr>
-<tr>
-<td></td>
-<td>...</td>
<td>${name}</td>
-<td></td>
-<td></td>
</tr>
<tr>
<td></td>
<td>Should Contain</td>
<td>${file}</td>
-<td><span class="fail">TEST&nbsp;SUITE: </span>\n <a
-class="splitname" href="${link}#suite_${normal}" name="suite_${full}"
-title="${full}">${normal}</a></td>
+<td><span class="fail">TEST&nbsp;SUITE: </span>\n <a
class="splitname" href="${link}#suite_${normal}" name="suite_${full}"
title="${full}">${normal}</a></td>
<td></td>
</tr>
<tr>
@@ -212,8 +208,7 @@
<td></td>
<td>Should Contain</td>
<td>${file}</td>
-<td><span class="pass">TEST&nbsp;SUITE: </span>\n <a
-class="name" name="suite_${name}" title="${name}">${name}</a></td>
+<td><span class="pass">TEST&nbsp;SUITE: </span>\n <a
class="name" name="suite_${name}" title="${name}">${name}</a></td>
<td></td>
</tr>
<tr>
@@ -233,23 +228,15 @@
<tr>
<td></td>
<td>${full}</td>
-<td>${med}</td>
<td>${normal} =</td>
<td>Get Names</td>
-</tr>
-<tr>
-<td></td>
-<td>...</td>
<td>${name}</td>
-<td></td>
-<td></td>
</tr>
<tr>
<td></td>
<td>Should Contain</td>
<td>${file}</td>
-<td><span class="pass">TEST&nbsp;CASE: </span>\n <a
-class="name" name="test_${full}"
title="${full}">${normal}</a></td>
+<td><span class="pass">TEST&nbsp;CASE: </span>\n <a
class="name" name="test_${full}" title="${full}">${normal}</a></td>
<td></td>
</tr>
<tr>
@@ -276,28 +263,67 @@
<tr>
<td></td>
<td>${full}</td>
-<td>${med}</td>
<td>${normal} =</td>
-<td><br></td>
+<td>Get Names</td>
+<td>${name}</td>
+</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>Get Names</td><td>${name}</td>
-
+<td>${normal}</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>Should Contain</td>
+<td>${file}</td>
+<td><td class="col_name"><a href="${link}#${type}_${full}"
id="${type}_${full}" title="${full}">${name}</a></td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>Link In Tag Details Table To Index Log Should Be Ok</td>
+<td>[Arguments]</td>
+<td>${file}</td>
+<td>${name}</td>
+<td>${link}</td>
+</tr>
+<tr>
+<td></td>
+<td>${full}</td>
+<td>${normal} =</td>
+<td>Get Names</td>
+<td>${name}</td>
+</tr>
+<tr>
+<td></td>
+<td>${name span} =</td>
+<td>Get Name Span In Statistics Table</td>
+<td>${full}</td>
<td></td>
</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>
+<tr>
<td></td>
<td>Should Contain</td>
<td>${file}</td>
-<td><td class="col_name"><a href="${link}#${type}_${full}"
-id="${type}_${full}" title="${full}">${name}</a></td></td>
+<td><td class="col_name"><a href="${link}#test_${full}"
id="test_${full}" title="${full}">${name span}</a></td></td>
<td></td>
</tr>
-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Link In Tag
Details Table To Index Log Should Be
Ok</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>Get
Names</td><td>${name}</td><td></td></tr><tr><td></td><td>Should
Contain</td><td>${file}</td><td><td
-class="col_name"><a href="${link}#test_${full}"
-id="test_${full}"
title="${full}">${med}</a></td></td><td></td></tr><tr>
+<tr>
<td></td>
<td></td>
<td></td>
@@ -321,18 +347,67 @@
<tr>
<td></td>
<td>${full}</td>
-<td>${med}</td>
<td>${normal} =</td>
-<td><br></td>
+<td>Get Names</td>
+<td>${name}</td>
+</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>Get Names</td><td>${name}</td>
-
+<td>${normal}</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>${subfull} =</td>
+<td>Get Splitted Full Name</td>
+<td>${full}</td>
+<td>${splitlevel}</td>
+</tr>
+<tr>
+<td></td>
+<td>Should Contain</td>
+<td>${file}</td>
+<td><td class="col_name"><a href="${link}#${type}_${subfull}"
id="${type}_${full}" title="${full}">${name}</a></td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>Link In Tag Details Table To Sub Log Should Be Ok</td>
+<td>[Arguments]</td>
+<td>${file}</td>
+<td>${name}</td>
+<td>${link}</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td>${splitlevel}=1</td>
+<td></td>
<td></td>
</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>
+<tr>
+<td></td>
+<td>${full}</td>
+<td>${normal} =</td>
+<td>Get Names</td>
+<td>${name}</td>
+</tr>
+<tr>
<td></td>
<td>${subfull} =</td>
<td>Get Splitted Full Name</td>
@@ -341,15 +416,19 @@
</tr>
<tr>
<td></td>
+<td>${name span} =</td>
+<td>Get Name Span In Statistics Table</td>
+<td>${full}</td>
+<td></td>
+</tr>
+<tr>
+<td></td>
<td>Should Contain</td>
<td>${file}</td>
-<td><td class="col_name"><a href="${link}#${type}_${subfull}"
-id="${type}_${full}" title="${full}">${name}</a></td></td>
+<td><td class="col_name"><a href="${link}#test_${subfull}"
id="test_${full}" title="${full}">${name span}</a></td></td>
<td></td>
</tr>
-<tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Link In Tag
Details Table To Sub Log Should Be
Ok</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>Get
Names</td><td>${name}</td><td></td></tr><tr><td></td><td>${subfull}
=</td><td>Get Splitted Full
Name</td><td>${full}</td><td>${splitlevel}</td></tr><tr><td></td><td>Should
Contain</td><td>${file}</td><td><td
-class="col_name"><a href="${link}#test_${subfull}"
-id="test_${full}"
title="${full}">${med}</a></td></td><td></td></tr><tr>
+<tr>
<td></td>
<td></td>
<td></td>
@@ -379,24 +458,59 @@
</tr>
<tr>
<td></td>
-<td>${medpre} =</td>
+<td>[Return]</td>
+<td>${fullname}</td>
+<td>${normal}</td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>Get Name Span In Statistics Table</td>
+<td>[Arguments]</td>
+<td>${full name}</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>${tokens} =</td>
<td>Evaluate</td>
-<td>'.'.join([ t[0].lower() for t in ${tokens}[:-1] ])</td>
+<td>'${full name}'.split('.')</td>
<td></td>
</tr>
<tr>
<td></td>
-<td>${medjoin} =</td>
+<td>${parent} =</td>
<td>Evaluate</td>
-<td>len("${medpre}") > 0 and '.' or ''</td>
+<td>' . '.join(${tokens[:-1]})</td>
+<td></td>
+</tr>
+<tr>
+<td></td>
+<td>${name span} =</td>
+<td>Set Variable If</td>
+<td>len(${tokens}) == 1</td>
+<td>${full name}</td>
+</tr>
+<tr>
+<td></td>
+<td>...</td>
+<td><span class="parent_name">${parent} .
</span>${tokens[-1]}</td>
+<td></td>
<td></td>
</tr>
<tr>
<td></td>
<td>[Return]</td>
-<td>${fullname}</td>
-<td>${medpre}${medjoin}${normal}</td>
-<td>${normal}</td>
+<td>${name span}</td>
+<td></td>
+<td></td>
</tr>
<tr>
<td></td>
@@ -412,6 +526,7 @@
<td></td>
<td></td>
</tr>
-</tbody></table>
+</table>
-</body></html>
\ No newline at end of file
+</body>
+</html>