5 new revisions:
Revision: 034c500366d9
Author: Pekka Klärck
Date: Mon Jun 20 16:42:49 2011
Log: removed tests that only tested functionality in log and report
http://code.google.com/p/robotframework/source/detail?r=034c500366d9
Revision: 67276d6a8104
Author: Pekka Klärck
Date: Mon Jun 20 16:43:41 2011
Log: fixed tests by changing them to verify tag stat links in output
instea...
http://code.google.com/p/robotframework/source/detail?r=67276d6a8104
Revision: 5242adc4bb63
Author: Pekka Klärck
Date: Mon Jun 20 16:43:53 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=5242adc4bb63
Revision: 0c1928459ed0
Author: Pekka Klärck
Date: Mon Jun 20 16:55:21 2011
Log: fixed tests by removing static html checks. ought to be enough to
test...
http://code.google.com/p/robotframework/source/detail?r=0c1928459ed0
Revision: e9d129595bfe
Author: Pekka Klärck
Date: Mon Jun 20 17:04:41 2011
Log: better to have tag doc as normal string in xml and do html
conversion ...
http://code.google.com/p/robotframework/source/detail?r=e9d129595bfe
==============================================================================
Revision: 034c500366d9
Author: Pekka Klärck
Date: Mon Jun 20 16:42:49 2011
Log: removed tests that only tested functionality in log and report
http://code.google.com/p/robotframework/source/detail?r=034c500366d9
Deleted:
/atest/robot/output/links_in_report_and_log.txt
=======================================
--- /atest/robot/output/links_in_report_and_log.txt Mon Jun 13 23:52:45 2011
+++ /dev/null
@@ -1,46 +0,0 @@
-*** Settings ***
-Suite Setup Create Report And Log And Read Those Content
-Force Tags pybot jybot regression static_html_checks
-Resource atest_resource.txt
-
-*** Variables ***
-${PREFIX} links_in_report_and_log
-${REPORT FILE NAME} ${PREFIX}_report.html
-${LOG FILE NAME} ${PREFIX}_log.html
-
-*** Test Cases ***
-Link From Report's "Statistics By Tag" Table To "Test Details By Tag" Table
- Should Contain ${REPORT} <div class="stat_name"><a
href="#tag_some">some</a></div>
- Should Contain ${REPORT} <td class="col_name"><a
name="tag_some"></a>some</td>
-
-Link From Report's "Statistics By Suite" Table To "Test Details By Suite"
Table
- Should Contain ${REPORT} <div class="stat_name"><a
href="#suite_Multiple Suites.Suite3" title="Multiple Suites.Suite3"><span
class="parent_name">Multiple Suites . </span>Suite3</a></div>
- Should Contain ${REPORT} <td class="col_name"><a
href="links_in_report_and_log_log.html#suite_Multiple Suites.Suite3"
id="suite_Multiple Suites.Suite3" title="Multiple Suites.Suite3">Multiple
Suites.Suite3</a></td>
-
-Link From Report's "Test Details By Suite" Table To Log's Details
- Should Contain ${REPORT} <td class="col_name"><a
href="links_in_report_and_log_log.html#test_Multiple Suites.Suite3.test1"
id="test_Multiple Suites.Suite3.test1" title="Multiple
Suites.Suite3.test1">test1</a></td>
- Should Contain ${LOG} <a class="name" name="test_Multiple
Suites.Suite3.test1" title="Multiple Suites.Suite3.test1">test1</a>
-
-Link From Report's "Test Details By Tags" Table To Log's Details
- Should Contain ${REPORT} <td class="col_name"><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"><span class="parent_name">Multiple Suites . Suite 6 .
</span>test12</a></td>
- Should Contain ${LOG} <a class="name" name="test_Multiple
Suites.Suite 6.test12" title="Multiple Suites.Suite 6.test12">test12</a>
-
-Link From Log's "Statistics By Suite" Table To Log's Details
- Should Contain ${LOG} <div class="stat_name"><a
href="#suite_Multiple Suites.Subsuite1.Suite4"
onclick="set_element_visible('suite_Multiple Suites.Subsuite1.Suite4')"
title="Multiple Suites.Subsuite1.Suite4"><span class="parent_name">Multiple
Suites . Subsuite1 . </span>Suite4</a></div>
- Should Contain ${LOG} <a class="name" name="suite_Multiple
Suites.Subsuite1.Suite4" title="Multiple Suites.Subsuite1.Suite4">Suite4</a>
-
-Link From Log's "Test Execution Errors" Table To Log's Details
- ${match} ${group1} ${group2} = Should Match Regexp ${LOG} <td
class="time"><a href="#msg_(\\d{8})_(\\d{2}:\\d{2}:\\d{2}.\\d{3})"
onclick="set_element_visible\\('msg_\\d{8}_\\d{2}:\\d{2}:\\d{2}\\.\\d{3}'\\)"
title="Link to
details\\.">\\d{8} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}</a></td>\n<td
class="warn level">WARN</td>\n<td class="msg">warning</td>
- Should Contain ${LOG} <td class="time"
id="msg_${group1}_${group2}">${group2}</td>
-
-No Link From Log's "Test Execution Errors" Table To Log's Details When
There Is No Link Target
- Should Match Regexp ${LOG} <td
class="time">\\d{8} \\d{2}:\\d{2}:\\d{2}.\\d{3}</td>\n<td class="error
level">ERROR</td>\n<td class="msg">Invalid syntax in file '.*SUite7.html'
in table 'Setting': Importing test library 'NonExisting' failed:
-
-*** Keywords ***
-Create Report And Log And Read Those Content
- Run Tests --report ${REPORT FILE NAME} --log ${LOG FILE NAME}
misc${/}multiple_suites
- ${log} = Get File ${OUTDIR}${/}${LOG FILE NAME}
- Set Suite Variable $LOG
- ${report} = Get File ${OUTDIR}${/}${REPORT FILE NAME}
- Set Suite Variable $REPORT
-
==============================================================================
Revision: 67276d6a8104
Author: Pekka Klärck
Date: Mon Jun 20 16:43:41 2011
Log: fixed tests by changing them to verify tag stat links in output
instead of report
http://code.google.com/p/robotframework/source/detail?r=67276d6a8104
Modified:
/atest/robot/tags/tag_stat_link.txt
/atest/robot/tags/tag_stat_link_with_rebot.txt
=======================================
--- /atest/robot/tags/tag_stat_link.txt Mon Jun 20 06:55:41 2011
+++ /atest/robot/tags/tag_stat_link.txt Mon Jun 20 16:43:41 2011
@@ -1,61 +1,43 @@
*** Settings ***
-Suite Setup Create Dir ${OUTPUT DIRECTORY}
-Suite Teardown Remove Dir ${OUTPUT DIRECTORY}
-Test Teardown Empty Dir ${OUTPUT DIRECTORY}
-Force Tags regression pybot jybot static_html_checks
+Suite Setup Run Tests With Tag Stat Links
+Force Tags regression pybot jybot
Resource atest_resource.txt
-
-*** Variables ***
-${OUTPUT DIRECTORY} ${TEMPDIR}${/}robot-test-999666
+Test Template Tag link should be correct in output
+
*** Test Cases ***
+
Tag Links Without Patterns
- Run Tests --tagstatlink SUB3:http://example.com:title --outputdir
${OUTPUT DIRECTORY} --report report.html misc/suites
- Report Should Contain Taglink sub3 http://example.com title
+ 6 t2 title:http://example.com
Tag Links With Pattern
- Run Tests --tagstatlink ?1:http://example.com/%1:Title --outputdir
${OUTPUT DIRECTORY} --report report.html misc/suites
- Report Should Contain Taglink d1 http://example.com/d Title
- Report Should Contain Taglink f1 http://example.com/f Title
- Report Should Contain Taglink t1 http://example.com/t Title
+ 3 f1 Title:http://example.com/f
+ 5 t1 Title:http://example.com/t
Tag Links With Many Patterns
- Run Tests --tagstatlink *?u?*:%2-%3-%2-%1-%4:Title --outputdir
${OUTPUT DIRECTORY} --report report.html misc/suites
- Report Should Contain Taglink sub3 s-b-s--3 Title
-
-Tag Link Used Multiple Times
- ${mail_to} = Catenate SEPARATOR= mailto: %[email protected]
# ?subject=%1AMPbody=%1 #This does not work on Jython in Windows
- Run Tests --tagstatlink ?2:ftp://%1:My_Title --tagstatlink
s???:${mail_to}:mail_to --outputdir ${OUTPUT DIRECTORY} --report
report.html --escape amp:AMP misc/suites
- Report Should Contain Taglink d2 ftp://d My Title
- Report Should Contain Taglink t2 ftp://t My Title
- Report Should Contain Taglink sub3 ${mail_to.replace('%1', 'ub3').
replace('AMP', '&')} mail to
+ 4 sub3 sub title:s-b-s--3
Same Tag Matches Multiple Links
- Run Tests --tagstatlink sub3:one:First_Link --tagstatlink
*3:%1:Second_Link --tagstatlink ??b?:%1-%2:Third --outputdir ${OUTPUT
DIRECTORY} --critical none --report report.html misc/suites
- ${report} = Get File ${OUTPUT DIRECTORY}${/}report.html
- ${expected} = Catenate SEPARATOR=\n <td class="col_stat_name">
<div class="stat_name"><a href="#tag_sub3">sub3</a></div> <div
class="tag_links">
- : FOR ${link} ${title} IN one First Link sub Second Link
- ... su-3 Third
- \ ${exp_link} = Get Expected Link ${link} ${title}
- \ ${expected} = Set ${expected}\n${exp_link}
- ${expected} = Set ${expected}\n</div>\n</td>
- Contains ${report} ${expected}
+ 1 d1 Title:http://example.com/d:::Title
1:http://1:::title:1:more:link
Link For Combined Tag
- Run Tests --tagstatcombine d*:DX --tagstatlink d?:http://%1:Title_%1
misc/suites
- ${stats} = Get Tag Stat Nodes
- Should Be Equal ${stats[0].attrs['links']} Title X:http://X
+ 0 DX Title X:http://X
+
*** Keywords ***
-Report Should Contain Taglink
- [Arguments] ${tag} ${link} ${title}
- List Directory ${OUTPUT DIRECTORY}
- ${report} = Get File ${OUTPUT DIRECTORY}${/}report.html
- ${expected} = Catenate SEPARATOR=\n <td class="col_stat_name">
<div class="stat_name"><a href="#tag_${tag}">${tag}</a></div> <div
class="tag_links"> <span>[<a href="${link}">${title}</a>]</span> </div>
- ... </td>
- Contains ${report} ${expected}
-
-Get Expected Link
- [Arguments] ${link} ${title}
- [Return] <span>[<a href="${link}">${title}</a>]</span>
-
+
+Run Tests With Tag Stat Links
+ ${opts} = Catenate
+ ... --tagstatlink T2:http://example.com:title
+ ... --tagstatlink ?1:http://example.com/%1:Title
+ ... --TagStatL *?u?*:%2-%3-%2-%1-%4:%2u%3_title
+ ... --tagstatcombine d*:DX
+ ... --tagstatlink d?:http://%1:Title_%1
+ ... --TAGSTATLINK D1:1:more:link:title
+ Run Tests ${opts} misc/suites
+
+Tag link should be correct in output
+ [Arguments] ${index} ${tag} ${links}
+ ${stats} = Get Tag Stat Nodes
+ Should Be Equal ${stats[${index}].text} ${tag}
+ Should Be Equal ${stats[${index}].attrs['links']} ${links}
=======================================
--- /atest/robot/tags/tag_stat_link_with_rebot.txt Mon Jun 13 23:52:45 2011
+++ /atest/robot/tags/tag_stat_link_with_rebot.txt Mon Jun 20 16:43:41 2011
@@ -1,64 +1,44 @@
*** Settings ***
-Suite Setup My Setup
-Suite Teardown Remove Temps
-Test Teardown Empty Dir ${MYOUTDIR}
-Force Tags regression pybot jybot static_html_checks
+Suite Setup Run Tests And Rebot With Tag Stat Links
+Force Tags regression pybot jybot
Resource atest_resource.txt
-
-*** Variables ***
-${MYOUTDIR} ${TEMPDIR}${/}robot-test-978675
-${MYINPUT} ${TEMPDIR}${/}robot-test-978675.xml
+Test Template Tag link should be correct in output
+
*** Test Cases ***
+
Tag Links Without Patterns
- Run Rebot Without Processing Output --tagstatlink
SUB3:http://example.com:title --outputdir ${MYOUTDIR} --report report.html
${MYINPUT}
- Report Should Contain Taglink sub3 http://example.com title
+ 6 t2 rebot title:http://example.com
Tag Links With Pattern
- Run Rebot Without Processing Output
--tagstatlink ?1:http://example.com/%1:Title --outputdir ${MYOUTDIR}
--report report.html ${MYINPUT}
- Report Should Contain Taglink d1 http://example.com/d Title
- Report Should Contain Taglink f1 http://example.com/f Title
- Report Should Contain Taglink t1 http://example.com/t Title
+ 3 f1 Rebot:http://example.com/f
+ 5 t1 Rebot:http://example.com/t
Tag Links With Many Patterns
- Run Rebot Without Processing Output --tagstatlink
*?u?*:%2-%3-%2-%1-%4:Title --outputdir ${MYOUTDIR} --report report.html
${MYINPUT}
- Report Should Contain Taglink sub3 s-b-s--3 Title
-
-Tag Link Used Multiple Times
- ${mail_to} = Catenate SEPARATOR= mailto: %[email protected]
# ?subject=%1AMPbody=%1 #This does not work on Jython in Windows
- Run Rebot Without Processing Output
--tagstatlink ?2:ftp://%1:My_Title --tagstatlink s???:${mail_to}:mail_to
--outputdir ${MYOUTDIR} --report report.html --escape amp:AMP ${MYINPUT}
- Report Should Contain Taglink d2 ftp://d My Title
- Report Should Contain Taglink t2 ftp://t My Title
- Report Should Contain Taglink sub3 ${mail_to.replace('%1', 'ub3').
replace('AMP', '&')} mail to
+ 4 sub3 sub title:s-b-s--3
Same Tag Matches Multiple Links
- Run Rebot Without Processing Output --tagstatlink sub3:one:First_Link
--tagstatlink *3:%1:Second_Link --tagstatlink ??b?:%1-%2:Third --outputdir
${MYOUTDIR} --critical none --report report.html ${MYINPUT}
- ${report} = Get File ${MYOUTDIR}${/}report.html
- ${expected} = Catenate SEPARATOR=\n <td class="col_stat_name">
<div class="stat_name"><a href="#tag_sub3">sub3</a></div> <div
class="tag_links">
- : FOR ${link} ${title} IN one First Link sub Second Link
- ... su-3 Third
- \ ${exp_link} = Get Expected Link ${link} ${title}
- \ ${expected} = Set Variable ${expected}\n${exp_link}
- Should Contain ${report} ${expected}\n</div>\n</td>
-
-*** Keywords ***
-My Setup
- Run Tests Without Processing Output ${EMPTY} misc${/}suites
- Move File ${OUTFILE} ${MYINPUT}
- Create Directory ${MYOUTDIR}
-
-Remove Temps
- Remove Directory ${MYOUTDIR} recursive
- Remove File ${MYINPUT}
-
-Report Should Contain Taglink
- [Arguments] ${tag} ${link} ${title}
- ${report} = Get File ${MYOUTDIR}${/}report.html
- ${expected} = Catenate SEPARATOR=\n <td class="col_stat_name">
<div class="stat_name"><a href="#tag_${tag}">${tag}</a></div> <div
class="tag_links"> <span>[<a href="${link}">${title}</a>]</span> </div>
- ... </td>
- Should Contain ${report} ${expected}
-
-Get Expected Link
- [Arguments] ${link} ${title}
- [Return] <span>[<a href="${link}">${title}</a>]</span>
-
+ 1 d1 Rebot:http://example.com/d:::Rebot
1:http://1:::title:1:more:link
+
+Link For Combined Tag
+ 0 DX Rebot X:http://X
+
+
+*** Keywords ***
+
+Run Tests And Rebot With Tag Stat Links
+ Run Tests Without Processing Output ${EMPTY} misc/suites
+ ${opts} = Catenate
+ ... --tagstatlink T2:http://example.com:rebot_title
+ ... --tagstatlink ?1:http://example.com/%1:Rebot
+ ... --TagStatL *?u?*:%2-%3-%2-%1-%4:%2u%3_title
+ ... --tagstatcombine d*:DX
+ ... --tagstatlink d?:http://%1:Rebot_%1
+ ... --TAGSTATLINK D1:1:more:link:title
+ Run Rebot ${opts} ${OUTFILE}
+
+Tag link should be correct in output
+ [Arguments] ${index} ${tag} ${links}
+ ${stats} = Get Tag Stat Nodes
+ Should Be Equal ${stats[${index}].text} ${tag}
+ Should Be Equal ${stats[${index}].attrs['links']} ${links}
==============================================================================
Revision: 5242adc4bb63
Author: Pekka Klärck
Date: Mon Jun 20 16:43:53 2011
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=5242adc4bb63
Modified:
/atest/robot/tags/tag_doc.txt
/atest/robot/tags/tag_doc_with_rebot.txt
=======================================
--- /atest/robot/tags/tag_doc.txt Mon Jun 20 14:44:40 2011
+++ /atest/robot/tags/tag_doc.txt Mon Jun 20 16:43:53 2011
@@ -1,5 +1,5 @@
*** Settings ***
-Suite Setup Run Tests --tagdoc f1:Some_documentation --tagdoc
t1:http://some.url_*bold* --tagdoc d?:Doc_for_many_tags --tagdoc
D2:More_doc --tagstatcombine d*:DX misc/normal.html
+Suite Setup Run Tests With Tag Docs
Force Tags pybot jybot regression
Resource atest_resource.txt
Test Template Tag doc should be correct in output
@@ -25,6 +25,15 @@
*** Keywords ***
+Run Tests With Tag Docs
+ ${opts} = Catenate
+ ... --tagdoc f1:Some_documentation
+ ... --tagdoc t1:http://some.url_*bold*
+ ... --tagdoc d?:Doc_for_many_tags
+ ... --tagdoc D2:More_doc
+ ... --tagstatcombine d*:DX
+ Run Tests ${opts} misc/normal.html
+
Tag doc should be correct in output
[Arguments] ${index} ${tag} ${doc}
${stats} = Get Tag Stat Nodes
=======================================
--- /atest/robot/tags/tag_doc_with_rebot.txt Mon Jun 20 14:44:40 2011
+++ /atest/robot/tags/tag_doc_with_rebot.txt Mon Jun 20 16:43:53 2011
@@ -1,5 +1,5 @@
*** Settings ***
-Suite Setup Run Tests And Rebot
+Suite Setup Run Tests And Rebot With Tag Doc
Force Tags pybot jybot regression
Resource atest_resource.txt
Test Template Tag doc should be correct in output
@@ -24,9 +24,16 @@
*** Keywords ***
-Run Tests And Rebot
+
+Run Tests And Rebot With Tag Doc
Run Tests Without Processing Output ${EMPTY} misc/normal.html
- Run Rebot --tagdoc f1:Some_documentation_for_rebot --tagdoc
t1:http://some.url_*bold* --tagdoc d?:Doc_for_many_rebot_tags --tagdoc
D2:More_doc --tagstatcombine d*:DX ${OUT_FILE}
+ ${opts} = Catenate
+ ... --tagdoc f1:Some_documentation_for_rebot
+ ... --tagdoc t1:http://some.url_*bold*
+ ... --tagdoc d?:Doc_for_many_rebot_tags
+ ... --tagdoc D2:More_doc
+ ... --tagstatcombine d*:DX
+ Run Rebot ${opts} ${OUTFILE}
Tag doc should be correct in output
[Arguments] ${index} ${tag} ${doc}
==============================================================================
Revision: 0c1928459ed0
Author: Pekka Klärck
Date: Mon Jun 20 16:55:21 2011
Log: fixed tests by removing static html checks. ought to be enough to
test from the output
http://code.google.com/p/robotframework/source/detail?r=0c1928459ed0
Modified:
/atest/robot/output/names_needing_escaping.txt
=======================================
--- /atest/robot/output/names_needing_escaping.txt Mon Jun 13 23:52:45 2011
+++ /atest/robot/output/names_needing_escaping.txt Mon Jun 20 16:55:21 2011
@@ -1,39 +1,32 @@
*** Settings ***
Documentation Test case and user keyword names needing escaping because
they contain 1) special characters in HTML (", <, ...) 2) special
characters in Robot test data. In latter case special chars actually aren't
that special because they aren't escaped.
-Suite Setup Run Tests And Store Log
-Force Tags regression pybot jybot static_html_checks
+Suite Setup Run Tests ${EMPTY} output/names_needing_escaping.tsv
+Force Tags regression pybot jybot
Resource atest_resource.txt
+Test Template Check TC And UK Name
*** Test Cases ***
+
Quotes
- Check TC And UK Name "Quotes"
- Check Name In Log "Quotes" "Quotes"
+ "Quotes"
Tag
- Check TC And UK Name Tag <pre>
- Check Name In Log Tag <pre>
+ Tag <pre>
And
- Check TC And UK Name And &
- Check Name In Log And &
+ And &
Backslashes
- Check TC And UK Name Backslashes \\ \\\\ \\\\\\ \\\\\\\\
- Check Name In Log Backslashes \\ \\\\ \\\\\\ \\\\\\\\
+ Backslashes \\ \\\\ \\\\\\ \\\\\\\\
Variable
- Check TC And UK Name Variable \${var}
- Check Name In Log Variable \${var}
+ Variable \${var}
Newline And Tab
- Check TC And UK Name Newline \\n and Tab \\t
- Check Name In Log Newline \\n and Tab \\t
+ Newline \\n and Tab \\t
+
*** Keywords ***
-Run tests And Store Log
- Run Tests --log mylogfile.html output${/}names_needing_escaping.tsv
- ${LOG} = Get File ${OUTDIR}${/}mylogfile.html
- Set Suite Variable $LOG
Check TC And UK Name
[Arguments] ${name}
@@ -41,10 +34,3 @@
Should Be Equal ${tc.name} ${name}
Should Be Equal ${tc.kws[0].name} ${name}
-Check Name In Log
- [Arguments] ${name_in_attrs} ${name_in_text}=${None}
- ${name_in_text} = Set Variable If ${name_in_text} ${name_in_text}
${name_in_attrs}
- ${attrs} = Catenate class="name" name="test_Names Needing
Escaping.${name_in_attrs}" title="Names Needing Escaping.${name_in_attrs}"
- ${exp} = Set Variable <a ${attrs}>${name_in_text}</a>
- Should Contain ${LOG} ${exp}
-
==============================================================================
Revision: e9d129595bfe
Author: Pekka Klärck
Date: Mon Jun 20 17:04:41 2011
Log: better to have tag doc as normal string in xml and do html
conversion during jsparsing
http://code.google.com/p/robotframework/source/detail?r=e9d129595bfe
Modified:
/atest/robot/tags/tag_doc.txt
/atest/robot/tags/tag_doc_with_rebot.txt
/src/robot/output/xmllogger.py
/src/robot/result/elementhandlers.py
/utest/result/test_js_serializer.py
=======================================
--- /atest/robot/tags/tag_doc.txt Mon Jun 20 16:43:53 2011
+++ /atest/robot/tags/tag_doc.txt Mon Jun 20 17:04:41 2011
@@ -14,10 +14,10 @@
1 d1 Doc for many tags
Tag Doc With Multiple Matches
- 2 d2 Doc for many tags & More doc
+ 2 d2 Doc for many tags & More doc
Tag Doc With Formatting
- 4 t1 <a href="http://some.url";>http://some.url</a> <b>bold</b>
+ 4 t1 http://some.url *bold*
Tag Doc For Combined Statistics
0 DX Doc for many tags
=======================================
--- /atest/robot/tags/tag_doc_with_rebot.txt Mon Jun 20 16:43:53 2011
+++ /atest/robot/tags/tag_doc_with_rebot.txt Mon Jun 20 17:04:41 2011
@@ -14,10 +14,10 @@
1 d1 Doc for many rebot tags
Tag Doc With Multiple Matches
- 2 d2 Doc for many rebot tags & More doc
+ 2 d2 Doc for many rebot tags & More doc
Tag Doc With Formatting
- 4 t1 <a href="http://some.url";>http://some.url</a> <b>bold</b>
+ 4 t1 http://some.url *bold*
Tag Doc For Combined Statistics
0 DX Doc for many rebot tags
=======================================
--- /src/robot/output/xmllogger.py Mon Jun 20 13:20:52 2011
+++ /src/robot/output/xmllogger.py Mon Jun 20 17:04:41 2011
@@ -145,8 +145,7 @@
def tag_stat(self, stat):
self._stat(stat, attrs={'info': self._get_tag_stat_info(stat),
'links': self._get_tag_links(stat),
- 'doc': utils.html_escape(stat.doc,
- formatting=True),
+ 'doc': stat.doc,
'combined': stat.combined})
def _get_tag_links(self, stat):
=======================================
--- /src/robot/result/elementhandlers.py Sat Jun 18 17:28:41 2011
+++ /src/robot/result/elementhandlers.py Mon Jun 20 17:04:41 2011
@@ -145,6 +145,9 @@
self._attrs = dict(attrs)
self._attrs['pass'] = int(self._attrs['pass'])
self._attrs['fail'] = int(self._attrs['fail'])
+ if 'doc' in self._attrs:
+ self._attrs['doc'] = utils.html_escape(self._attrs['doc'],
+ formatting=True)
# TODO: Should we only dump attrs that have value?
# Tag stats have many attrs that are normally empty
=======================================
--- /utest/result/test_js_serializer.py Sun Jun 19 02:14:00 2011
+++ /utest/result/test_js_serializer.py Mon Jun 20 17:04:41 2011
@@ -223,7 +223,7 @@
</total>
<tag>
<stat info="" fail="1" pass="0" links=""
doc="">someothertag</stat>
- <stat info="" fail="1" pass="0" links=""
doc="">sometag</stat>
+ <stat info="" fail="1" pass="0" links=""
doc="*bold*">sometag</stat>
</tag>
<suite>
<stat fail="4" name="Data" pass="0">Data</stat>
@@ -238,7 +238,7 @@
[{'label': 'someothertag', 'pass': 0, 'fail': 1,
'info': '', 'links': '', 'doc': ''},
{'label': 'sometag', 'pass': 0, 'fail': 1,
- 'info': '', 'links': '', 'doc': ''}],
+ 'info': '', 'links': '', 'doc': '<b>bold</b>'}],
[{'label': 'Data', 'name': 'Data', 'pass': 0, 'fail':
4},
{'label': 'Data.All Settings', 'name': 'All
Settings', 'pass': 0, 'fail': 1},
{'label': 'Data.Failing Suite', 'name': 'Failing
Suite', 'pass': 0, 'fail': 3}]]
