/hg/icedtea-web: handle ignored tests in xml and html outputs co...

[jvanek at icedtea.classpath.org]

changeset 7b8a05e4443c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7b8a05e4443c
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Jun 13 15:30:28 2012 +0200

	handle ignored tests in xml and html outputs correctly


diffstat:

 ChangeLog                                          |   7 +++++++
 tests/junit-runner/JunitLikeXmlOutputListener.java |   4 ++++
 tests/report-styles/jreport.xsl                    |  12 +++++++++++-
 3 files changed, 22 insertions(+), 1 deletions(-)

diffs (64 lines):

diff -r 40776f2e940f -r 7b8a05e4443c ChangeLog
--- a/ChangeLog	Tue Jun 12 15:25:44 2012 -0400
+++ b/ChangeLog	Wed Jun 13 15:30:28 2012 +0200
@@ -1,3 +1,10 @@
+2012-06-13  Jiri Vanek  <jvanek at redhat.com>
+
+	* tests/junit-runner/JunitLikeXmlOutputListener.java:
+	Introduced TEST_IGNORED_ATTRIBUTE to mark test as ignored if should be.
+	* tests/report-styles/jreport.xsl: Applied correct text and style for
+	tests with attribute ignored. 
+
 2012-06-12  Adam Domurad  <adomurad at redhat.com>
 
 	Fixes PR722, javaws failing to run with unsigned content in META-INF/
diff -r 40776f2e940f -r 7b8a05e4443c tests/junit-runner/JunitLikeXmlOutputListener.java
--- a/tests/junit-runner/JunitLikeXmlOutputListener.java	Tue Jun 12 15:25:44 2012 -0400
+++ b/tests/junit-runner/JunitLikeXmlOutputListener.java	Wed Jun 13 15:30:28 2012 +0200
@@ -51,6 +51,7 @@
     private static final String K2F = "known-to-fail";
     private static final String TEST_NAME_ATTRIBUTE = "name";
     private static final String TEST_TIME_ATTRIBUTE = "time";
+    private static final String TEST_IGNORED_ATTRIBUTE = "ignored";
     private static final String TEST_ERROR_ELEMENT = "error";
     private static final String TEST_CLASS_ATTRIBUTE = "classname";
     private static final String ERROR_MESSAGE_ATTRIBUTE = "message";
@@ -193,6 +194,9 @@
         testcaseAtts.put(TEST_TIME_ATTRIBUTE, stringedTime);
         testcaseAtts.put(TEST_CLASS_ATTRIBUTE, description.getClassName());
         testcaseAtts.put(TEST_NAME_ATTRIBUTE, description.getMethodName());
+        if (ignored){
+            testcaseAtts.put(TEST_IGNORED_ATTRIBUTE, Boolean.TRUE.toString());
+        }
         KnownToFail k2f=null;
         try {
             if (testClass != null && testMethod != null) {
diff -r 40776f2e940f -r 7b8a05e4443c tests/report-styles/jreport.xsl
--- a/tests/report-styles/jreport.xsl	Tue Jun 12 15:25:44 2012 -0400
+++ b/tests/report-styles/jreport.xsl	Wed Jun 13 15:30:28 2012 +0200
@@ -201,6 +201,9 @@
       <div>
         <xsl:attribute name="class">
           <xsl:choose>
+            <xsl:when test="@ignored">
+           ignored
+            </xsl:when>
             <xsl:when test="error">
            failed
             </xsl:when>
@@ -246,7 +249,14 @@
           <xsl:choose>
             <xsl:when test="not(error)">
               <div class="status">
-         PASSED (<xsl:value-of select="@time"/>s) 
+         <xsl:choose>
+           <xsl:when test="@ignored">
+             IGNORED (<xsl:value-of select="@time"/>s) 
+           </xsl:when>
+           <xsl:otherwise>
+             PASSED (<xsl:value-of select="@time"/>s) 
+           </xsl:otherwise>
+         </xsl:choose>
          <xsl:choose>
            <xsl:when test="@known-to-fail">
              <xsl:choose>