Revision: 2830
Author: pekka.klarck
Date: Thu Apr  1 03:00:04 2010
Log: tests and fix for the bug with suite doc ending with " (issue 523)
http://code.google.com/p/robotframework/source/detail?r=2830

Modified:
 /trunk/atest/robot/output/html_formatting.html
 /trunk/atest/testdata/output/html_formatting.html
 /trunk/src/robot/serializing/templates.py

=======================================
--- /trunk/atest/robot/output/html_formatting.html      Sat Mar 27 14:28:03 2010
+++ /trunk/atest/robot/output/html_formatting.html      Thu Apr  1 03:00:04 2010
@@ -775,7 +775,7 @@



- <pre id="line344">Test cases demonstrating html formatting of suite and test docs and suite metadata.&lt;br /&gt;\n<br>&lt;br /&gt;\n<br>It is possible to format text with &lt;b&gt;bold&lt;/b&gt;, &lt;i&gt;italic&lt;/i&gt; and &lt;i&gt;&lt;b&gt;bold italic&lt;/b&gt;&lt;/i&gt;.<br>Also links like &lt;a href="http://basso.fi/radio"&gt;http://basso.fi/radio&lt;/a&gt;,<br>&lt;a href="ftp://funet.fi"&gt;ftp://funet.fi&lt;/a&gt; and &lt;a href="file:///c:/temp"&gt;file:///c:/temp&lt;/a&gt;<br>are automatically formatted.&lt;br /&gt;\n<br>Image links like<br>&lt;img src="http://server/image.jpg"; title="http://server/image.jpg"; style="border: 1px solid gray" /&gt;<br>even create images.&lt;br /&gt;\n<br>Furthermore tables and horizontal rulers are available as seen by examples below.&lt;br /&gt;\n<br>&lt;br /&gt;\n<br>&lt;hr /&gt;\n<br>&lt;br /&gt;\n<br>&lt;table border="1" class="doc"&gt;\n<br>&lt;tr&gt;\n<br>&lt;td&gt;&lt;b&gt;a&lt;/b&gt;&lt;/td&gt;\n<br>&lt;td&gt;&lt;b&gt;b&lt;/b&gt;&lt;/td&gt;\n<br>&lt;td&gt;&lt;b&gt;c&lt;/b&gt;&lt;/td&gt;\n<br>&lt;/tr&gt;\n<br>&lt;tr&gt;\n<br>&lt;td&gt;&lt;i&gt;1&lt;/i&gt;&lt;/td&gt;\n<br>&lt;td&gt;xx&lt;/td&gt;\n<br>&lt;td&gt;yy&lt;/td&gt;\n<br>&lt;/tr&gt;\n<br>&lt;tr&gt;\n<br>&lt;td&gt;&lt;i&gt;2&lt;/i&gt;&lt;/td&gt;\n<br>&lt;td&gt;zz&lt;/td&gt;\n<br>&lt;td&gt;&lt;/td&gt;\n<br>&lt;/tr&gt;\n<br>&lt;/table&gt;\n<br>&lt;br /&gt;\n<br>&lt;hr /&gt;\n</pre> + <pre id="line344">Test cases demonstrating html formatting of suite and test docs and suite metadata.&lt;br /&gt;\n<br>&lt;br /&gt;\n<br>It is possible to format text with &lt;b&gt;bold&lt;/b&gt;, &lt;i&gt;italic&lt;/i&gt; and &lt;i&gt;&lt;b&gt;bold italic&lt;/b&gt;&lt;/i&gt;.<br>Also links like &lt;a href="http://basso.fi/radio"&gt;http://basso.fi/radio&lt;/a&gt;,<br>&lt;a href="ftp://funet.fi"&gt;ftp://funet.fi&lt;/a&gt; and &lt;a href="file:///c:/temp"&gt;file:///c:/temp&lt;/a&gt;<br>are automatically formatted.&lt;br /&gt;\n<br>Image links like<br>&lt;img src="http://server/image.jpg"; title="http://server/image.jpg"; style="border: 1px solid gray" /&gt;<br>even create images.&lt;br /&gt;\n<br>Furthermore tables and horizontal rulers are available as seen by examples below.&lt;br /&gt;\n<br>&lt;br /&gt;\n<br>&lt;hr /&gt;\n<br>&lt;br /&gt;\n<br>&lt;table border="1" class="doc"&gt;\n<br>&lt;tr&gt;\n<br>&lt;td&gt;&lt;b&gt;a&lt;/b&gt;&lt;/td&gt;\n<br>&lt;td&gt;&lt;b&gt;b&lt;/b&gt;&lt;/td&gt;\n<br>&lt;td&gt;&lt;b&gt;c&lt;/b&gt;&lt;/td&gt;\n<br>&lt;/tr&gt;\n<br>&lt;tr&gt;\n<br>&lt;td&gt;&lt;i&gt;1&lt;/i&gt;&lt;/td&gt;\n<br>&lt;td&gt;xx&lt;/td&gt;\n<br>&lt;td&gt;yy&lt;/td&gt;\n<br>&lt;/tr&gt;\n<br>&lt;tr&gt;\n<br>&lt;td&gt;&lt;i&gt;2&lt;/i&gt;&lt;/td&gt;\n<br>&lt;td&gt;zz&lt;/td&gt;\n<br>&lt;td&gt;&lt;/td&gt;\n<br>&lt;/tr&gt;\n<br>&lt;/table&gt;\n<br>&lt;br /&gt;\n<br>&lt;hr /&gt;\nThere was a bug handling " in the end of suite doc: "</pre>



=======================================
--- /trunk/atest/testdata/output/html_formatting.html Fri Sep 5 02:12:48 2008 +++ /trunk/atest/testdata/output/html_formatting.html Thu Apr 1 03:00:04 2010
@@ -358,7 +358,11 @@



----\n</td>
+---\n
+
+
+There was a bug handling " in the end of suite doc: "
+</td>



=======================================
--- /trunk/src/robot/serializing/templates.py   Tue Mar 23 04:15:41 2010
+++ /trunk/src/robot/serializing/templates.py   Thu Apr  1 03:00:04 2010
@@ -546,7 +546,7 @@
<td class="status_fail">${SUITE.critical_stats.failed} critical tests failed</td>
 <!-- END IF -->
 </tr>
-<!-- IF """${SUITE.htmldoc}""" != '' -->
+<!-- IF ${SUITE.htmldoc.__len__()} > 0 -->
   <tr><th>Documentation:</th><td>${SUITE.htmldoc}</td></tr>
 <!-- END IF -->
 <!-- FOR ${meta} IN ${SUITE.get_metadata(html=True)} -->


--
To unsubscribe, reply using "remove me" as the subject.

Reply via email to