Revision: cb254f35e493
Author: Janne Härkönen <[email protected]>
Date: Mon Nov 28 01:52:15 2011
Log: fixed tests after domwrapper removal
http://code.google.com/p/robotframework/source/detail?r=cb254f35e493
Added:
/atest/robot/output/statistics_with_rebot.txt
Deleted:
/atest/robot/output/statistics_with_rebot.html
Modified:
/atest/resources/TestCheckerLibrary.py
/atest/resources/atest_resource.txt
/atest/robot/output/statistics.txt
/atest/robot/output/test_criticality.txt
/atest/robot/rebot/combine.txt
/atest/robot/tags/critical_tags_with_rebot.txt
/atest/robot/tags/tag_doc.txt
/atest/robot/tags/tag_doc_with_rebot.txt
/atest/robot/tags/tag_stat_link.txt
/atest/robot/tags/tag_stat_link_with_rebot.txt
=======================================
--- /dev/null
+++ /atest/robot/output/statistics_with_rebot.txt Mon Nov 28 01:52:15 2011
@@ -0,0 +1,55 @@
+*** Settings ***
+Suite Setup My Setup
+Force Tags regression
+Default Tags pybot jybot
+Resource atest_resource.txt
+
+*** Test Cases ***
+Statistics Should Be Written to XML
+ ${output} = Get File ${OUTFILE}
+ ${exp} = Catenate SEPARATOR=\n (?s) <statistics> <total> .*
</total>
+ ... <tag> .* </tag> <suite> .* </suite> </statistics>
+ Matches Regexp ${output} ${exp}
+
+Total statistics should be Correct
+ ${stats} = Get Node ${OUTFILE} statistics/total
+ ${crit} ${total} = Call Method ${stats} findall stat
+ Node Information Should Be Correct ${crit} Critical Tests 5 1
+ Node Information Should Be Correct ${total} All Tests 9 1
+
+Tag statistics should be Correct
+ ${stats} = Get Node ${OUTFILE} statistics/tag
+ Tag Node Information Should Be Correct ${stats.getchildren()[0]} t1
5 1 critical
+ Tag Node Information Should Be Correct ${stats.getchildren()[1]} d1
& d2 1 0 combined
+ Tag Node Information Should Be Correct ${stats.getchildren()[2]} d1
1 0
+ Tag Node Information Should Be Correct ${stats.getchildren()[3]} d2
1 0
+ Tag Node Information Should Be Correct ${stats.getchildren()[4]} f1
9 1
+ Tag Node Information Should Be Correct ${stats.getchildren()[5]}
sub3 2 0
+
+Suite statistics should be Correct
+ ${stats} = Get Node ${OUTFILE} statistics/suite
+ Node Information Should Be Correct ${stats.getchildren()[0]} Suites
9 1
+ Node Information Should Be Correct ${stats.getchildren()[1]}
Suites.Fourth 0 1
+ Node Information Should Be Correct ${stats.getchildren()[2]}
Suites.Subsuites 2 0
+ Node Information Should Be Correct ${stats.getchildren()[3]}
Suites.Subsuites2 2 0
+ Node Information Should Be Correct ${stats.getchildren()[4]}
Suites.Tsuite1 3 0
+ Node Information Should Be Correct ${stats.getchildren()[5]}
Suites.Tsuite2 1 0
+ Node Information Should Be Correct ${stats.getchildren()[6]}
Suites.Tsuite3 1 0
+
+*** Keywords ***
+My Setup
+ Run Tests ${EMPTY} misc${/}suites
+ Move File ${OUTFILE} ${OUTDIR}${/}statistics.xml
+ Run Rebot --critical t1 --tagstatcombine d1ANDd2 --suitestatlevel 2
--tagstatexclude t2 ${OUTDIR}${/}statistics.xml
+
+Node Information Should Be Correct
+ [Arguments] ${node} ${name} ${pass} ${fail}
+ Should be Equal ${node.text} ${name}
+ Should be Equal ${node.attrib['pass']} ${pass}
+ Should be Equal ${node.attrib['fail']} ${fail}
+
+Tag Node Information Should Be Correct
+ [Arguments] ${node} ${name} ${pass} ${fail} ${info}=
+ Node Information Should Be Correct ${node} ${name} ${pass} ${fail}
+ Should be Equal ${node.attrib['info']} ${info}
+
=======================================
--- /atest/robot/output/statistics_with_rebot.html Mon May 24 23:59:40 2010
+++ /dev/null
@@ -1,3197 +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 Cases</title></head><body>
-
-
-
-
-
-
-
-
-
-
-
-<h1>Robot Test Cases</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>Force Tags</td>
-
-
-
-
-
-
-
-
-
-
- <td>regression</td>
-
-
-
-
-
-
-
-
-
-
- <td><br>
-</td>
-
-
-
-
-
-
-
-
-
-
- <td><br>
-</td>
-
-
-
-
-
-
-
-
-
-
- <td><br>
-</td>
-
-
-
-
-
-
-
-
-
-
- </tr>
-
-
-
-
-
-
-
-
-
-
- <tr>
-
-
-
-
-
-
-
-
-
-
- <td align="undefined" valign="undefined">Default Tags</td>
-
-
-
-
-
-
-
-
-
-
- <td align="undefined" valign="undefined">pybot</td>
-
-
-
-
-
-
-
-
-
-
- <td align="undefined" valign="undefined">jybot</td>
-
-
-
-
-
-
-
-
-
-
- <td><br>
-</td>
-
-
-
-
-
-
-
-
-
-
- <td><br>
-</td>
-
-
-
-
-
-
-
-
-
-
- </tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <tr>
-
-
-
-
-
-
-
-
-
-
-
- <td>Resource</td>
-
-
-
-
-
-
-
-
-
-
- <td>atest_resource.txt</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"><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"><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>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </tbody>
-</table>
-
-
-
-
-
-
-
-
-
-
-
-
-<table border="1">
-
-
-
-
-
-
-
-
-
-
-
- <colgroup span="99"><col class="name"><col class="action"><col
class="arg" span="3"></colgroup>
- <thead>
- <tr>
-
-
-
-
-
-
-
-
-
-
-
- <th>Test Case</th>
-
-
-
-
-
-
-
-
-
-
-
- <th>Action</th>
-
-
-
-
-
-
-
-
-
-
-
- <th>Argument</th>
-
-
-
-
-
-
-
-
-
-
-
- <th>Argument</th>
-
-
-
-
-
-
-
-
-
-
-
- <th>Argument</th>
-
-
-
-
-
-
-
-
-
-
-
- <th>Argument</th>
-
-
-
-
-
-
-
-
-
-
-
- <th>Argument</th>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </tr>
-
-
-
-
-
-
-
-
-
-
-
- </thead>
- <tbody>
-
-
-
-
-
-
-
-
-
-
-
- <tr>
-
-
-
-
-
-
-
-
-
-
- <td align="undefined" valign="undefined">Statistics Should Be
Written to XML</td>
-
-
-
-
-
-
-
-
-
-
- <td align="undefined" valign="undefined">${output} =</td>
-
-
-
-
-
-
-
-
-
-
- <td align="undefined" valign="undefined">Get File</td>
-
-
-
-
-
-
-
-
-
-
- <td>${OUTFILE}</td>
-
-
-
-
-
-
-
-
-
-
- <td><br>
-</td>
-
-
-
-
-
-
-
-
-
-
- <td><br>
-</td>
-
-
-
-
-
-
-
-
-
-
- <td><br>
-</td>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- </tr>
-
-
-
-
-
-
-
-
-
-
- <tr>
-
- <td><br>
-</td>
-
- <td>${exp} =</td>
-
- <td>Catenate</td>
-
- <td>SEPARATOR=\n</td>
-
- <td>(?s)</td>
-
- <td><statistics></td>
-
- <td><total></td>
-
- </tr>
-
- <tr>
-
- <td><br>
-</td>
***The diff for this file has been truncated for email.***
=======================================
--- /atest/resources/TestCheckerLibrary.py Thu Nov 10 14:25:17 2011
+++ /atest/resources/TestCheckerLibrary.py Mon Nov 28 01:52:15 2011
@@ -1,7 +1,6 @@
import os
import re
-import robot
from robot import utils
from robot.result.builders import ResultFromXML
from robot.result import testsuite, TestSuite, TestCase, Keyword
@@ -161,11 +160,11 @@
utils.eq(act, exp)
def get_node(self, file_path, node_path=None):
- dom = utils.DomWrapper(file_path)
- return dom.get_node(node_path) if node_path else dom
+ dom = utils.ET.parse(file_path)
+ return dom.find(node_path) if node_path else dom
def get_nodes(self, file_path, node_path):
- return utils.DomWrapper(file_path).get_nodes(node_path)
+ return utils.ET.parse(file_path).findall(node_path)
def process_suite(suite):
=======================================
--- /atest/resources/atest_resource.txt Tue Nov 1 01:45:39 2011
+++ /atest/resources/atest_resource.txt Mon Nov 28 01:52:15 2011
@@ -294,5 +294,5 @@
Tag Statistics Should Be
[Arguments] ${tag} ${pass} ${fail}
- Should Be Equal As Integers ${tag.attrs['pass']} ${pass}
- Should Be Equal As Integers ${tag.attrs['fail']} ${fail}
+ Should Be Equal As Integers ${tag.attrib['pass']} ${pass}
+ Should Be Equal As Integers ${tag.attrib['fail']} ${fail}
=======================================
--- /atest/robot/output/statistics.txt Thu Sep 29 05:43:49 2011
+++ /atest/robot/output/statistics.txt Mon Nov 28 01:52:15 2011
@@ -13,47 +13,47 @@
Total statistics should be Correct
${stats} = Get Node ${OUTFILE} statistics/total
- ${crit} ${total} = Call Method ${stats} get_nodes stat
+ ${crit} ${total} = Call Method ${stats} findall stat
Node Information Should Be Correct ${crit} Critical Tests 5 1
Node Information Should Be Correct ${total} All Tests 9 1
Tag statistics should be Correct
${stats} = Get Node ${OUTFILE} statistics/tag
- Tag Node Information Should Be Correct ${stats.children[0]} t1 5
1 info=critical links=my title:http://url.to:::title:url
- Tag Node Information Should Be Correct ${stats.children[2]} d1 & d2
1 0 info=combined
- Tag Node Information Should Be Correct ${stats.children[3]} f1 NOT
t1 4 0 info=combined
- Tag Node Information Should Be Correct ${stats.children[4]} d1 1
0 links=title:url
- Tag Node Information Should Be Correct ${stats.children[5]} d2 1 0
- Tag Node Information Should Be Correct ${stats.children[6]} f1 9
1 doc=this is tagdoc links=title:url
- Tag Node Information Should Be Correct ${stats.children[7]} sub3 2
0
+ Tag Node Information Should Be Correct ${stats.getchildren()[0]} t1
5 1 info=critical links=my title:http://url.to:::title:url
+ Tag Node Information Should Be Correct ${stats.getchildren()[2]} d1
& d2 1 0 info=combined
+ Tag Node Information Should Be Correct ${stats.getchildren()[3]} f1
NOT t1 4 0 info=combined
+ Tag Node Information Should Be Correct ${stats.getchildren()[4]} d1
1 0 links=title:url
+ Tag Node Information Should Be Correct ${stats.getchildren()[5]} d2
1 0
+ Tag Node Information Should Be Correct ${stats.getchildren()[6]} f1
9 1 doc=this is tagdoc links=title:url
+ Tag Node Information Should Be Correct ${stats.getchildren()[7]}
sub3 2 0
Combined Tag Statistics Name Can Be Given
${stats} = Get Node ${OUTFILE} statistics/tag
- Tag Node Information Should Be Correct ${stats.children[1]} combined
tag with new name 1 0 combined
+ Tag Node Information Should Be Correct ${stats.getchildren()[1]}
combined tag with new name 1 0 combined
Suite statistics should be Correct
${stats} = Get Node ${OUTFILE} statistics/suite
- Suite Node Information Should Be Correct ${stats.children[0]}
Suites 9 1
- Suite Node Information Should Be Correct ${stats.children[1]}
Suites.Fourth 0 1
- Suite Node Information Should Be Correct ${stats.children[2]}
Suites.Subsuites 2 0
- Suite Node Information Should Be Correct ${stats.children[3]}
Suites.Subsuites2 2 0
- Suite Node Information Should Be Correct ${stats.children[4]}
Suites.Tsuite1 3 0
- Suite Node Information Should Be Correct ${stats.children[5]}
Suites.Tsuite2 1 0
- Suite Node Information Should Be Correct ${stats.children[6]}
Suites.Tsuite3 1 0
+ Suite Node Information Should Be Correct ${stats.getchildren()[0]}
Suites 9 1
+ Suite Node Information Should Be Correct ${stats.getchildren()[1]}
Suites.Fourth 0 1
+ Suite Node Information Should Be Correct ${stats.getchildren()[2]}
Suites.Subsuites 2 0
+ Suite Node Information Should Be Correct ${stats.getchildren()[3]}
Suites.Subsuites2 2 0
+ Suite Node Information Should Be Correct ${stats.getchildren()[4]}
Suites.Tsuite1 3 0
+ Suite Node Information Should Be Correct ${stats.getchildren()[5]}
Suites.Tsuite2 1 0
+ Suite Node Information Should Be Correct ${stats.getchildren()[6]}
Suites.Tsuite3 1 0
*** Keywords ***
Node Information Should Be Correct
[Arguments] ${node} ${name} ${pass} ${fail}
Should be equal ${node.text} ${name}
- Should be equal ${node.attrs['pass']} ${pass}
- Should be equal ${node.attrs['fail']} ${fail}
+ Should be equal ${node.attrib['pass']} ${pass}
+ Should be equal ${node.attrib['fail']} ${fail}
Tag Node Information Should Be Correct
[Arguments] ${node} ${name} ${pass} ${fail} ${info}= ${doc}=
${links}=
Node Information Should Be Correct ${node} ${name} ${pass} ${fail}
- Should be equal ${node.attrs['info']} ${info}
- Should be equal ${node.attrs['doc']} ${doc}
- Should be equal ${node.attrs['links']} ${links}
+ Should be equal ${node.attrib['info']} ${info}
+ Should be equal ${node.attrib['doc']} ${doc}
+ Should be equal ${node.attrib['links']} ${links}
Suite Node Information Should Be Correct
[Arguments] ${node} ${name} ${pass} ${fail}
=======================================
--- /atest/robot/output/test_criticality.txt Wed Apr 20 22:13:12 2011
+++ /atest/robot/output/test_criticality.txt Mon Nov 28 01:52:15 2011
@@ -16,8 +16,8 @@
Check Test Criticality in Output
[Arguments] ${testindex} ${expected criticality}
- ${test}= Set Variable ${suite.get_nodes('test')[${testindex}]}
- Should Be Equal ${test.get_node('status').get_attr('critical')}
+ ${test}= Set Variable ${suite.findall('test')[${testindex}]}
+ Should Be Equal ${test.find('status').get('critical')}
... ${expected criticality}
=======================================
--- /atest/robot/rebot/combine.txt Tue Nov 1 06:06:21 2011
+++ /atest/robot/rebot/combine.txt Mon Nov 28 01:52:15 2011
@@ -134,13 +134,13 @@
Elapsed Time Should Be Written To Output When Start And End Time Are Not
Known
${combined} = Get Node ${COMB OUT 1} suite/status
- Should Be Equal ${combined.attrs['starttime']} N/A
- Should Be Equal ${combined.attrs['endtime']} N/A
- Should Be True ${combined.attrs['elapsedtime']} >= 0
+ Should Be Equal ${combined.attrib['starttime']} N/A
+ Should Be Equal ${combined.attrib['endtime']} N/A
+ Should Be True ${combined.attrib['elapsedtime']} >= 0
${originals} = Get Nodes ${COMB OUT 1} suite/suite/status
- Should Not Be Equal ${originals[0].attrs['starttime']} N/A
- Should Not Be Equal ${originals[0].attrs['endtime']} N/A
- Should Not Be True ${originals[0].attrs.has_key('elapsedtime')}
+ Should Not Be Equal ${originals[0].attrib['starttime']} N/A
+ Should Not Be Equal ${originals[0].attrib['endtime']} N/A
+ Should Not Be True ${originals[0].attrib.has_key('elapsedtime')}
Combined Suite Names Are Correct In Statistics
${suites} = Get Suite Stat Nodes ${COMB OUT 1}
=======================================
--- /atest/robot/tags/critical_tags_with_rebot.txt Thu Jun 30 05:00:25 2011
+++ /atest/robot/tags/critical_tags_with_rebot.txt Mon Nov 28 01:52:15 2011
@@ -54,5 +54,5 @@
Test Status And Criticality Should Be
[Arguments] ${test} ${status} ${criticality}
[Documentation] Must check status and criticality directly from XML
because re-processed model would not have same criticality
- Should Be Equal ${test.children[-1].attrs['status']} ${status}
- Should Be Equal ${test.children[-1].attrs['critical']} ${criticality}
+ Should Be Equal ${test.getchildren()[-1].attrib['status']} ${status}
+ Should Be Equal ${test.getchildren()[-1].attrib['critical']}
${criticality}
=======================================
--- /atest/robot/tags/tag_doc.txt Mon Jun 20 17:04:41 2011
+++ /atest/robot/tags/tag_doc.txt Mon Nov 28 01:52:15 2011
@@ -38,4 +38,4 @@
[Arguments] ${index} ${tag} ${doc}
${stats} = Get Tag Stat Nodes
Should Be Equal ${stats[${index}].text} ${tag}
- Should Be Equal ${stats[${index}].attrs['doc']} ${doc}
+ Should Be Equal ${stats[${index}].attrib['doc']} ${doc}
=======================================
--- /atest/robot/tags/tag_doc_with_rebot.txt Mon Jun 20 17:04:41 2011
+++ /atest/robot/tags/tag_doc_with_rebot.txt Mon Nov 28 01:52:15 2011
@@ -39,5 +39,5 @@
[Arguments] ${index} ${tag} ${doc}
${stats} = Get Tag Stat Nodes
Should Be Equal ${stats[${index}].text} ${tag}
- Should Be Equal ${stats[${index}].attrs['doc']} ${doc}
-
+ Should Be Equal ${stats[${index}].attrib['doc']} ${doc}
+
=======================================
--- /atest/robot/tags/tag_stat_link.txt Mon Jun 20 16:43:41 2011
+++ /atest/robot/tags/tag_stat_link.txt Mon Nov 28 01:52:15 2011
@@ -40,4 +40,4 @@
[Arguments] ${index} ${tag} ${links}
${stats} = Get Tag Stat Nodes
Should Be Equal ${stats[${index}].text} ${tag}
- Should Be Equal ${stats[${index}].attrs['links']} ${links}
+ Should Be Equal ${stats[${index}].attrib['links']} ${links}
=======================================
--- /atest/robot/tags/tag_stat_link_with_rebot.txt Mon Jun 20 16:43:41 2011
+++ /atest/robot/tags/tag_stat_link_with_rebot.txt Mon Nov 28 01:52:15 2011
@@ -41,4 +41,4 @@
[Arguments] ${index} ${tag} ${links}
${stats} = Get Tag Stat Nodes
Should Be Equal ${stats[${index}].text} ${tag}
- Should Be Equal ${stats[${index}].attrs['links']} ${links}
+ Should Be Equal ${stats[${index}].attrib['links']} ${links}
