Author: pekka.klarck
Date: Wed Mar 25 06:19:57 2009
New Revision: 1538
Modified:
trunk/atest/robot/rebot/critical_tags.html
Log:
fixed tests after removing filtering/criticality information from outputs
Modified: trunk/atest/robot/rebot/critical_tags.html
==============================================================================
--- trunk/atest/robot/rebot/critical_tags.html (original)
+++ trunk/atest/robot/rebot/critical_tags.html Wed Mar 25 06:19:57 2009
@@ -2160,7 +2160,9 @@
<tr><td>${INPUT_FILE}</td><td>
-${TEMPDIR}${/}rebot-test-input.xml</td><td></td><td></td><td></td></tr><tr><td
align="undefined"
valign="undefined">${M_000_211}</td><td align="undefined"
valign="undefined">
+${TEMPDIR}${/}rebot-test-input.xml</td><td></td><td></td><td></td></tr><tr><td
align="undefined"
valign="undefined">${M_000_211}</td><td align="undefined"
valign="undefined">0&nbsp;critical&nbsp;tests,&nbsp;0&nbsp;passed,&nbsp;<span>0&nbsp;failed</span><br
+/>2&nbsp;tests&nbsp;total,&nbsp;1&nbsp;passed,&nbsp;<span
+class="fail">1&nbsp;failed</span></td><td align="undefined"
valign="undefined"># 0 critical tests, 0 passed, 0 failed\n<br>
@@ -2168,32 +2170,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-0 critical tests, 0 passed, 0 failed\n<br>
-
-
-
-
-
-
-
-2 tests total, 1 passed, 1
failed</td><td></td><td></td><td></td></tr><tr><td align="undefined"
valign="undefined">${M_211_211}</td><td align="undefined"
valign="undefined">
+2 tests total, 1 passed, 1 failed</td><td></td><td></td></tr><tr><td
align="undefined"
valign="undefined">${M_211_211}</td><td>2&nbsp;critical&nbsp;tests,&nbsp;1&nbsp;passed,&nbsp;<span
+class="fail">1&nbsp;failed</span><br
+/>2&nbsp;tests&nbsp;total,&nbsp;1&nbsp;passed,&nbsp;<span
+class="fail">1&nbsp;failed</span></td><td>#
@@ -2226,7 +2206,7 @@
-2 tests total, 1 passed, 1 failed</td><td></td><td></td><td></td></tr><tr>
+2 tests total, 1 passed, 1 failed</td><td></td><td></td></tr><tr>
@@ -2290,13 +2270,9 @@
- <td align="undefined" valign="undefined">
-
-
-
-
-
-
+ <td align="undefined"
valign="undefined">1&nbsp;critical&nbsp;test,&nbsp;1&nbsp;passed,&nbsp;<span>0&nbsp;failed</span><br
+/>2&nbsp;tests&nbsp;total,&nbsp;1&nbsp;passed,&nbsp;<span
+class="fail">1&nbsp;failed</span></td>
@@ -2315,7 +2291,6 @@
-1 critical test, 1 passed, 0 failed\n<br>
@@ -2323,13 +2298,13 @@
-2 tests total, 1 passed, 1 failed</td>
+ <td align="undefined" valign="undefined"># 1 critical test, 1
passed, 0 failed\n<br>
@@ -2337,6 +2312,7 @@
+2 tests total, 1 passed, 1 failed</td><td></td>
@@ -2355,16 +2331,6 @@
- <td></td>
-
-
-
-
-
-
-
-
-
@@ -2378,16 +2344,7 @@
-
-
-
-
-
-
-
-
-
- <td></td>
+
@@ -2451,16 +2408,10 @@
- </tr><tr><td align="undefined" valign="undefined">${M_101_211}</td><td
align="undefined" valign="undefined">
-
-
-
-
-
-
-
-
-
+ </tr><tr><td align="undefined" valign="undefined">${M_101_211}</td><td
align="undefined"
valign="undefined">1&nbsp;critical&nbsp;test,&nbsp;0&nbsp;passed,&nbsp;<span
+class="fail">1&nbsp;failed</span><br
+/>2&nbsp;tests&nbsp;total,&nbsp;1&nbsp;passed,&nbsp;<span
+class="fail">1&nbsp;failed</span></td><td align="undefined"
valign="undefined"># 1 critical test, 0 passed, 1 failed\n<br>
@@ -2468,23 +2419,7 @@
-
-
-
-
-
-
-
-
-1 critical test, 0 passed, 1 failed\n<br>
-
-
-
-
-
-
-
-2 tests total, 1 passed, 1 failed</td><td></td><td></td><td></td></tr>
+2 tests total, 1 passed, 1 failed</td><td></td><td></td></tr>
@@ -2871,7 +2806,7 @@
- <th style="width: 58px;">Crit</th><th>Non-Crit</th><th>Test
1</th><th>Test 2</th>
+
@@ -6245,7 +6180,7 @@
- <tr><td>Neither Critical Nor Non-Critical</td><td align="undefined"
valign="undefined">[Document]</td><td align="undefined"
valign="undefined">Critical options set when running tests should not be
altered.</td><td align="undefined" valign="undefined"></td><td
align="undefined" valign="undefined"></td><td align="undefined"
valign="undefined"></td><td align="undefined"
valign="undefined"></td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Test Critical</td><td
align="undefined" valign="undefined"><br></td><td align="undefined"
valign="undefined">PASS</td><td align="undefined"
valign="undefined">${M_110_211}</td><td align="undefined"
valign="undefined">pass</td><td align="undefined"
valign="undefined">fail</td><td>yes</td><td>no</td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr>
+ <tr><td><br></td><td align="undefined" valign="undefined"></td><td
align="undefined" valign="undefined"></td><td align="undefined"
valign="undefined"></td><td align="undefined"
valign="undefined"></td></tr><tr><td>Neither Critical Nor
Non-Critical</td><td align="undefined" valign="undefined">Test
Critical</td><td align="undefined" valign="undefined"><br></td><td
align="undefined" valign="undefined">FAIL</td><td align="undefined"
valign="undefined">${M_211_211}</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr>
@@ -6444,7 +6379,7 @@
- <td align="undefined" valign="undefined">pass</td><td
align="undefined" valign="undefined"></td><td>yes</td><td>no</td>
+
@@ -6706,7 +6641,7 @@
- <tr><td>Critical Not Matching</td><td align="undefined"
valign="undefined">Test Critical</td><td align="undefined"
valign="undefined">-c nomatch</td><td align="undefined"
valign="undefined">PASS</td><td align="undefined"
valign="undefined">${M_000_211}</td><td align="undefined"
valign="undefined">nomatch</td><td align="undefined"
valign="undefined"></td><td>no</td><td>no</td></tr>
+ <tr><td>Critical Not Matching</td><td align="undefined"
valign="undefined">Test Critical</td><td align="undefined"
valign="undefined">-c nomatch</td><td align="undefined"
valign="undefined">PASS</td><td align="undefined"
valign="undefined">${M_000_211}</td></tr>
@@ -8284,8 +8219,8 @@
- <tr><td>Critical With Pattern</td><td align="undefined"
valign="undefined">Test Critical</td><td align="undefined"
valign="undefined">--critical fSTAR<br>-c QUESTass</td><td
align="undefined" valign="undefined">FAIL</td><td align="undefined"
valign="undefined">${M_211_211}</td><td align="undefined"
valign="undefined">?ass f* </td><td align="undefined"
valign="undefined"></td><td>yes</td><td>yes</td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Non-Critical</td><td
align="undefined" valign="undefined">Test Critical</td><td
align="undefined" valign="undefined">--noncritical
-pass</td><td align="undefined" valign="undefined">FAIL</td><td
align="undefined" valign="undefined">${M_101_211}</td><td align="undefined"
valign="undefined"></td><td align="undefined"
valign="undefined">pass</td><td align="undefined"
valign="undefined">no</td><td align="undefined"
valign="undefined">yes</td></tr><tr><td>Non-Critical Not Matching</td><td
align="undefined" valign="undefined">Test Critical</td><td
align="undefined" valign="undefined">-n these -n dont -n match</td><td
align="undefined" valign="undefined">FAIL</td><td align="undefined"
valign="undefined">${M_211_211}</td><td align="undefined"
valign="undefined"></td><td align="undefined" valign="undefined">dont match
these</td><td align="undefined" valign="undefined">yes</td><td
align="undefined" valign="undefined">yes</td></tr><tr><td>Non-Critical With
Pattern</td><td align="undefined" valign="undefined">Test Critical</td><td
align="undefined" valign="undefined">--NonCritical fSTAR<br>-n
QUESTass</td><td align="undefined" valign="undefined">PASS</td><td
align="undefined" valign="undefined">${M_000_211}</td><td align="undefined"
valign="undefined"></td><td align="undefined" valign="undefined">?ass
f*</td><td>no</td><td>no</td></tr><tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Critical
And Non-Critical Matching Different Test</td><td align="undefined"
valign="undefined">Test Critical</td><td align="undefined"
valign="undefined">--critical paSTARss<br>--noncritical faiQUEST<br>-c
nomatch</td><td align="undefined" valign="undefined">PASS</td><td
align="undefined" valign="undefined">${M_110_211}</td><td align="undefined"
valign="undefined">nomatch pa*ss</td><td align="undefined"
valign="undefined">fai?</td><td>yes</td><td>no</td></tr><tr><td>Critical
And Non-Critical Matching Same Test</td><td align="undefined"
valign="undefined">Test Critical</td><td align="undefined"
valign="undefined">--critical force<br>--noncritical fail<br>-c a -c b -c
c<br>-n x -n y -n z<br></td><td align="undefined"
valign="undefined">PASS</td><td align="undefined"
valign="undefined">${M_110_211}</td><td align="undefined"
valign="undefined">a b c force</td><td align="undefined"
valign="undefined">fail x y
z</td><td>yes</td><td>no</td></tr><tr><td>Critical And Non-Critical
Matching Same Tag</td><td align="undefined" valign="undefined">Test
Critical</td><td align="undefined" valign="undefined">--critical
force<br>--noncritical fSTAR<br></td><td align="undefined"
valign="undefined">PASS</td><td align="undefined"
valign="undefined">${M_000_211}</td><td align="undefined"
valign="undefined">force</td><td align="undefined"
valign="undefined">f*</td><td>no</td><td>no</td></tr>
+ <tr><td>Critical With Pattern</td><td align="undefined"
valign="undefined">Test Critical</td><td align="undefined"
valign="undefined">--critical fSTAR<br>-c QUESTass</td><td
align="undefined" valign="undefined">FAIL</td><td align="undefined"
valign="undefined">${M_211_211}</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Non-Critical</td><td
align="undefined" valign="undefined">Test Critical</td><td
align="undefined" valign="undefined">--noncritical
+pass</td><td align="undefined" valign="undefined">FAIL</td><td
align="undefined"
valign="undefined">${M_101_211}</td></tr><tr><td>Non-Critical Not
Matching</td><td align="undefined" valign="undefined">Test Critical</td><td
align="undefined" valign="undefined">-n these -n dont -n match</td><td
align="undefined" valign="undefined">FAIL</td><td align="undefined"
valign="undefined">${M_211_211}</td></tr><tr><td>Non-Critical With
Pattern</td><td align="undefined" valign="undefined">Test Critical</td><td
align="undefined" valign="undefined">--NonCritical fSTAR<br>-n
QUESTass</td><td align="undefined" valign="undefined">PASS</td><td
align="undefined"
valign="undefined">${M_000_211}</td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Critical
And Non-Critical Matching Different Test</td><td align="undefined"
valign="undefined">Test Critical</td><td align="undefined"
valign="undefined">--critical paSTARss<br>--noncritical faiQUEST<br>-c
nomatch</td><td align="undefined" valign="undefined">PASS</td><td
align="undefined" valign="undefined">${M_110_211}</td></tr><tr><td>Critical
And Non-Critical Matching Same Test</td><td align="undefined"
valign="undefined">Test Critical</td><td align="undefined"
valign="undefined">--critical force<br>--noncritical fail<br>-c a -c b -c
c<br>-n x -n y -n z<br></td><td align="undefined"
valign="undefined">PASS</td><td align="undefined"
valign="undefined">${M_110_211}</td></tr><tr><td>Critical And Non-Critical
Matching Same Tag</td><td align="undefined" valign="undefined">Test
Critical</td><td align="undefined" valign="undefined">--critical
force<br>--noncritical fSTAR<br></td><td align="undefined"
valign="undefined">PASS</td><td align="undefined"
valign="undefined">${M_000_211}</td></tr>
@@ -8938,7 +8873,7 @@
<tr><td>Run Test To Create Output</td><td align="undefined"
valign="undefined">Run Tests</td><td align="undefined"
valign="undefined">--critical pass<br>--noncritical fail</td><td
align="undefined" valign="undefined">
misc${/}pass_and_fail.html</td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Move File</td><td align="undefined"
valign="undefined">
-${OUTFILE}</td><td align="undefined"
valign="undefined">${INPUT_FILE}</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Test
Critical</td><td>[Arguments]</td><td>${options}</td><td>${suite_status}</td><td>${suite_msg}</td></tr><tr><td></td><td>...</td><td>${suite_critical}</td><td>${suite_non_critical}</td><td>${test1_criticality}</td></tr><tr><td></td><td>...</td><td>${test2_criticality}</td><td><br></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Rebot Outputs With Given Critical
Optins</td><td align="undefined" valign="undefined">${options}</td><td
align="undefined" valign="undefined"></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Suite Status And Message Should
Be</td><td>${suite_status}</td><td>${suite_msg}</td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Suite's Critical And Non-Critical Tags
Should
Be</td><td>${suite_critical}</td><td>${suite_non_critical}</td><td></td></tr><tr><td></td><td>Test
Criticalities Should
Be</td><td>${test1_criticality}</td><td>${test2_criticality}</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Rebot
Outputs With Given Critical
Optins</td><td>[Arguments]</td><td>${options}</td><td></td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Run Rebot</td><td align="undefined"
valign="undefined">${options}<br>--escape star:STAR<br>--escape
quest:QUEST</td><td align="undefined"
valign="undefined">${INPUT_FILE}</td><td></td></tr><tr><td></td><td>Should
Not Be
Equal</td><td>${SUITE}</td><td>${None}</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Suite
Status And Message Should
Be</td><td>[Arguments]</td><td>${status}</td><td>${message}</td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Should Be Equal</td><td
align="undefined"
valign="undefined">${SUITE.status}</td><td>${status}</td><td></td></tr><tr>
+${OUTFILE}</td><td align="undefined"
valign="undefined">${INPUT_FILE}</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Test
Critical</td><td>[Arguments]</td><td>${options}</td><td>${suite_status}</td><td>${suite_msg}</td></tr><tr><td></td><td
align="undefined" valign="undefined">Run Rebot</td><td align="undefined"
valign="undefined">${options}<br>--escape star:STAR<br>--escape
quest:QUEST<br>--report rebot-report.html</td><td align="undefined"
valign="undefined">${INPUT_FILE}</td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">Suite Status And Message Should
Be</td><td>${suite_status}</td><td>${suite_msg}</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Suite
Status And Message Should
Be</td><td>[Arguments]</td><td>${status}</td><td>${message}</td><td></td></tr><tr><td></td><td
align="undefined" valign="undefined">[Documentation]</td><td
align="undefined" valign="undefined">Must check status and message<br>from
stdout because re-processed suite would not have same criticality as during
executiong</td><td></td><td></td></tr><tr><td></td><td>${output}
=</td><td>Get
File</td><td>${OUTDIR}/rebot-report.html</td><td></td></tr><tr>
@@ -8966,7 +8901,7 @@
- <td align="undefined" valign="undefined">Should Be Equal</td><td
align="undefined" valign="undefined">${SUITE.get_full_message()}</td>
+ <td align="undefined" valign="undefined">Should Contain</td><td
align="undefined" valign="undefined">${output}</td>
@@ -8994,7 +8929,7 @@
- <td>${message}</td>
+ <td align="undefined" valign="undefined"><td class="col_status
${status.lower()}">${status}</td>\n<br><td
class="col_msg">${message}</td></td><td></td>
@@ -9008,7 +8943,7 @@
- <td></td>
+
@@ -9036,9 +8971,7 @@
-
</tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Suite's
Critical And Non-Critical Tags Should
Be</td><td>[Arguments]</td><td>${critical}</td><td>${non-critical}</td><td></td></tr><tr><td></td><td>Fail
Unless</td><td>${SUITE.critical.tags}
-== "${critical}".split()</td><td></td><td></td></tr><tr><td></td><td>Fail
Unless</td><td>${SUITE.critical.nons}
-== "${non-critical}".split()</td><td></td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr><tr><td>Test
Criticalities
Should
Be</td><td>[Arguments]</td><td>${crit_0}</td><td>${crit_1}</td><td></td></tr><tr><td></td><td>Should
Be
Equal</td><td>${SUITE.tests[0].critical}</td><td>${crit_0}</td><td></td></tr><tr><td></td><td>Should
Be
Equal</td><td>${SUITE.tests[1].critical}</td><td>${crit_1}</td><td></td></tr><tr><td></td><td></td><td></td><td></td><td></td></tr>
+
</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>