/hg/icedtea-web: Added bug annotation forr testing engine
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed May 2 03:54:19 PDT 2012
changeset 11029e99d733 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=11029e99d733
author: Jiri Vanek <jvanek at redhat.com>
date: Wed May 02 12:53:07 2012 +0200
Added bug annotation forr testing engine
diffstat:
ChangeLog | 22 +
Makefile.am | 13 +-
tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java | 3 +
tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java | 2 +
tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java | 10 +-
tests/junit-runner/JunitLikeXmlOutputListener.java | 146 +++++++++-
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/Bug.java | 32 ++
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/NeedsDisplay.java | 18 +
tests/report-styles/jreport.xsl | 13 +
9 files changed, 249 insertions(+), 10 deletions(-)
diffs (487 lines):
diff -r 82e908d46d70 -r 11029e99d733 ChangeLog
--- a/ChangeLog Tue Apr 24 14:43:34 2012 -0400
+++ b/ChangeLog Wed May 02 12:53:07 2012 +0200
@@ -1,3 +1,25 @@
+2012-05-02 Jiri Vanek <jvanek at redhat.com>
+
+ Introduced new annotations Bug (to connect test/reproducer with documentation)
+ and NeedsDisplay which tells the launching engine that this particular
+ test needs Display. Based on ptisnovs's ideas and jtreg experiences
+ *Makefile.am: (JUNIT_RUNNER_JAR), (stamps/run-netx-unit-tests.stamp) and
+ (stamps/run-unit-test-code-coverage.stamp) are now dependent on (stamps/netx-dist-tests-compile)
+ and classpaths inside them have been enriched for JNLP_TESTS_ENGINE_DIR
+ which contains definitions of those annotations
+ *tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java: and
+ *tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java: and
+ *tests/jnlp_tests/simple/Spaces can be everywhere/testcase/SpacesCanBeEverywhereTests.java:
+ filled Bug annotations
+ *tests/junit-runner/JunitLikeXmlOutputListener.java: made to understand
+ Bug annotation
+ *tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/NeedsDisplay.java:
+ and
+ *tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/Bug.java:
+ annotations definitions
+ *tests/report-styles/jreport.xsl: made nice links from bug annotation
+ prepared by JunitLikeXmlOutputListener
+
2012-04-24 Omair Majid <omajid at redhat.com>
* Makefile.am
diff -r 82e908d46d70 -r 11029e99d733 Makefile.am
--- a/Makefile.am Tue Apr 24 14:43:34 2012 -0400
+++ b/Makefile.am Wed May 02 12:53:07 2012 +0200
@@ -457,18 +457,17 @@
junit-runner-source-files.txt:
find $(JUNIT_RUNNER_SRCDIR) -name '*.java' | sort > $@
-$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt
+$(JUNIT_RUNNER_JAR): junit-runner-source-files.txt stamps/netx-dist-tests-compile.stamp
mkdir -p $(JUNIT_RUNNER_DIR) && \
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(JUNIT_RUNNER_DIR) \
- -classpath $(JUNIT_JAR) \
+ -classpath $(JUNIT_JAR):$(JNLP_TESTS_ENGINE_DIR) \
@junit-runner-source-files.txt && \
$(BOOT_DIR)/bin/jar cf $@ -C $(JUNIT_RUNNER_DIR) .
stamps/junit-jnlp-dist-dirs: junit-jnlp-dist-simple.txt junit-jnlp-dist-signed.txt
mkdir -p $(JNLP_TESTS_SERVER_DEPLOYDIR)
mkdir -p $(JNLP_TESTS_DIR)
- mkdir -p $(JNLP_TESTS_ENGINE_DIR)
touch $@
junit-jnlp-dist-simple.txt:
@@ -540,6 +539,7 @@
stamps/netx-dist-tests-compile.stamp: stamps/netx.stamp \
stamps/junit-jnlp-dist-dirs netx-dist-tests-source-files.txt
+ mkdir -p $(JNLP_TESTS_ENGINE_DIR);
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(JNLP_TESTS_ENGINE_DIR) \
-classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar \
@@ -596,11 +596,11 @@
find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort > $@
stamps/netx-unit-tests-compile.stamp: stamps/netx.stamp \
- netx-unit-tests-source-files.txt
+ netx-unit-tests-source-files.txt stamps/netx-dist-tests-compile.stamp
mkdir -p $(NETX_UNIT_TEST_DIR) && \
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(NETX_UNIT_TEST_DIR) \
- -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar \
+ -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(JNLP_TESTS_ENGINE_DIR) \
@netx-unit-tests-source-files.txt && \
mkdir -p stamps && \
touch $@
@@ -630,7 +630,7 @@
done ; \
cd $(NETX_UNIT_TEST_DIR) ; \
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
- CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \
+ CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(JNLP_TESTS_ENGINE_DIR):. \
$(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \
> stdout.log 2> stderr.log ; \
cat stdout.log ; \
@@ -663,6 +663,7 @@
-cp $(BOOT_DIR)/jre/lib/jsse.jar \
-cp $(BOOT_DIR)/jre/lib/resources.jar \
-cp $(RHINO_RUNTIME) \
+ -cp $(JNLP_TESTS_ENGINE_DIR) \
-cp . \
-ix "-org.junit.*" \
-ix "-junit.*" \
diff -r 82e908d46d70 -r 11029e99d733 tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java
--- a/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java Tue Apr 24 14:43:34 2012 -0400
+++ b/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java Wed May 02 12:53:07 2012 +0200
@@ -36,12 +36,15 @@
*/
import net.sourceforge.jnlp.ServerAccess;
+import net.sourceforge.jnlp.annotations.Bug;
import org.junit.Assert;
import org.junit.Test;
+ at Bug(id="http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-February/017153.html")
public class CheckServicesTests {
private static ServerAccess server = new ServerAccess();
+
@Test
public void CheckServices() throws Exception {
System.out.println("connecting CheckServices request");
diff -r 82e908d46d70 -r 11029e99d733 tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java
--- a/tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java Tue Apr 24 14:43:34 2012 -0400
+++ b/tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java Wed May 02 12:53:07 2012 +0200
@@ -36,10 +36,12 @@
*/
import net.sourceforge.jnlp.ServerAccess;
+import net.sourceforge.jnlp.annotations.Bug;
import org.junit.Assert;
import org.junit.Test;
+ at Bug(id="http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-February/017435.html")
public class ManifestedJar1Test {
private static ServerAccess server = new ServerAccess();
diff -r 82e908d46d70 -r 11029e99d733 tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
--- a/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java Tue Apr 24 14:43:34 2012 -0400
+++ b/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java Wed May 02 12:53:07 2012 +0200
@@ -39,14 +39,17 @@
import java.util.ArrayList;
import java.util.List;
import net.sourceforge.jnlp.ServerAccess;
+import net.sourceforge.jnlp.annotations.Bug;
import org.junit.Assert;
import org.junit.Test;
+ at Bug(id={"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016127.html","PR804","PR811"})
public class SpacesCanBeEverywhereTests {
private static ServerAccess server = new ServerAccess();
+ @Bug(id={"PR811","http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016144.html"})
@Test
public void SpacesCanBeEverywhereRemoteTests1() throws Exception {
System.out.println("connecting SpacesCanBeEverywhereRemoteTests1 request");
@@ -62,6 +65,7 @@
Assert.assertEquals((Integer) 0, pr.returnValue);
}
+ @Bug(id="PR811")
@Test
public void SpacesCanBeEverywhereRemoteTests2() throws Exception {
System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
@@ -77,6 +81,7 @@
Assert.assertEquals((Integer) 0, pr.returnValue);
}
+ @Bug(id="PR811")
@Test
public void SpacesCanBeEverywhereRemoteTests3() throws Exception {
System.out.println("connecting SpacesCanBeEverywhereRemoteTests3 request");
@@ -93,7 +98,8 @@
}
- @Test
+ @Bug(id="PR804")
+ @Test
public void SpacesCanBeEverywhereLocalTests1() throws Exception {
System.out.println("connecting SpacesCanBeEverywhereLocalTests1 request");
System.err.println("connecting SpacesCanBeEverywhereLocalTests1 request");
@@ -112,6 +118,7 @@
Assert.assertEquals((Integer) 0, pr.returnValue);
}
+ @Bug(id="PR804")
@Test
public void SpacesCanBeEverywhereLocalTests2() throws Exception {
System.out.println("connecting SpacesCanBeEverywhereLocalTests2 request");
@@ -131,6 +138,7 @@
Assert.assertEquals((Integer) 0, pr.returnValue);
}
+ @Bug(id="PR804")
@Test
public void SpacesCanBeEverywhereLocalTests3() throws Exception {
System.out.println("connecting SpacesCanBeEverywhereLocalTests3 request");
diff -r 82e908d46d70 -r 11029e99d733 tests/junit-runner/JunitLikeXmlOutputListener.java
--- a/tests/junit-runner/JunitLikeXmlOutputListener.java Tue Apr 24 14:43:34 2012 -0400
+++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Wed May 02 12:53:07 2012 +0200
@@ -12,6 +12,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.lang.reflect.Method;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.Date;
@@ -19,6 +20,7 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import net.sourceforge.jnlp.annotations.Bug;
import org.junit.internal.JUnitSystem;
@@ -41,6 +43,8 @@
private static final String ROOT = "testsuite";
private static final String DATE_ELEMENT = "date";
private static final String TEST_ELEMENT = "testcase";
+ private static final String BUGS = "bugs";
+ private static final String BUG = "bug";
private static final String TEST_NAME_ATTRIBUTE = "name";
private static final String TEST_TIME_ATTRIBUTE = "time";
private static final String TEST_ERROR_ELEMENT = "error";
@@ -63,6 +67,7 @@
private class ClassCounter {
+ Class c;
int total;
int failed;
int passed;
@@ -94,7 +99,10 @@
attString.append(" ");
Set<Entry<String, String>> entries = atts.entrySet();
for (Entry<String, String> entry : entries) {
- attString.append(entry.getKey()).append("=\"").append(attributize(entry.getValue())).append("\"");
+ String k=entry.getKey();
+ String v= entry.getValue();
+ if (v==null)v="null";
+ attString.append(k).append("=\"").append(attributize(v)).append("\"");
attString.append(" ");
}
}
@@ -164,13 +172,35 @@
writeElement(TEST_ERROR_ELEMENT, testFailed.getTrace(), errorAtts);
}
-
+ try {
+ Class q = description.getTestClass();
+ String qs=description.getMethodName();
+ if (qs.contains(" - ")) qs=qs.replaceAll(" - .*", "");
+ Method qm = q.getMethod(qs);
+ Bug b = qm.getAnnotation(Bug.class);
+ if (b != null) {
+ openElement(BUGS);
+ String[] s = b.id();
+ for (String string : s) {
+ String ss[]=createBug(string);
+ Map<String, String> visibleNameAtt=new HashMap<String, String>(1);
+ visibleNameAtt.put("visibleName", ss[0]);
+ openElement(BUG,visibleNameAtt);
+ writer.write(ss[1]);
+ closeElement(BUG);
+ }
+ closeElement(BUGS);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
closeElement(TEST_ELEMENT);
writer.flush();
ClassCounter cc = classStats.get(description.getClassName());
if (cc == null) {
cc = new ClassCounter();
+ cc.c=description.getTestClass();
classStats.put(description.getClassName(), cc);
}
cc.total++;
@@ -211,7 +241,27 @@
writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(entry.getValue().failed));
writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(entry.getValue().total - entry.getValue().failed - entry.getValue().passed));
writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(entry.getValue().total));
-
+ try {
+ Bug b = null;
+ if (entry.getValue().c != null) {
+ b = (Bug) entry.getValue().c.getAnnotation(Bug.class);
+ }
+ if (b != null) {
+ openElement(BUGS);
+ String[] s = b.id();
+ for (String string : s) {
+ String ss[]=createBug(string);
+ Map<String, String> visibleNameAtt=new HashMap<String, String>(1);
+ visibleNameAtt.put("visibleName", ss[0]);
+ openElement(BUG,visibleNameAtt);
+ writer.write(ss[1]);
+ closeElement(BUG);
+ }
+ closeElement(BUGS);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
closeElement(TEST_CLASS_ELEMENT);
}
closeElement(CLASSES_ELEMENT);
@@ -222,4 +272,94 @@
writer.close();
}
+
+
+ /**
+ * When declare for suite class or for Test-marked method,
+ * should be interpreted by report generating tool to links.
+ * Known shortcuts are
+ * SX - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=X
+ * PRX - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X
+ * RHX - https://bugzilla.redhat.com/show_bug.cgi?id=X
+ * DX - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X
+ * GX - http://bugs.gentoo.org/show_bug.cgi?id=X
+ * CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X
+ * LPX - https://bugs.launchpad.net/bugs/X
+ *
+ * http://mail.openjdk.java.net/pipermail/distro-pkg-dev/
+ * and http://mail.openjdk.java.net/pipermail/ are proceed differently
+ *
+ * You just put eg @Bug(id="RH12345",id="http:/my.bukpage.com/terribleNew")
+ * and RH12345 will be transalated as
+ * <a href="https://bugzilla.redhat.com/show_bug.cgi?id=123456">123456<a> or
+ * similar, the url will be inclueded as is. Both added to proper tests or suites
+ *
+ * @return Strng[2]{nameToBeShown, hrefValue}
+ */
+ public static String[] createBug(String string) {
+ String[] r = {"ex", string};
+ String[] prefixes = {
+ "S",
+ "PR",
+ "RH",
+ "D",
+ "G",
+ "CA",
+ "LP",};
+ String[] urls = {
+ "http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=",
+ "http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=",
+ "https://bugzilla.redhat.com/show_bug.cgi?id=",
+ "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=",
+ "http://bugs.gentoo.org/show_bug.cgi?id=",
+ "http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id",
+ "https://bugs.launchpad.net/bugs/",};
+
+ for (int i = 0; i < urls.length; i++) {
+ if (string.startsWith(prefixes[i])) {
+ r[0] = string;
+ r[1] = urls[i] + string.substring(prefixes[i].length());
+ return r;
+ }
+
+ }
+
+ String distro = "http://mail.openjdk.java.net/pipermail/distro-pkg-dev/";
+ String openjdk = "http://mail.openjdk.java.net/pipermail/";
+ if (string.startsWith(distro)){
+ r[0]="distro-pkg";
+ return r;
+ }
+ if (string.startsWith(openjdk)){
+ r[0]="openjdk";
+ return r;
+ }
+ return r;
+
+ }
+
+ public static void main(String[] args){
+ String[] q=createBug("PR608");
+ System.out.println(q[0]+" : "+q[1]);
+ q=createBug("S4854");
+ System.out.println(q[0]+" : "+q[1]);
+ q=createBug("RH649423");
+ System.out.println(q[0]+" : "+q[1]);
+ q=createBug("D464");
+ System.out.println(q[0]+" : "+q[1]);
+ q=createBug("G6554");
+ System.out.println(q[0]+" : "+q[1]);
+ q=createBug("CA1654");
+ System.out.println(q[0]+" : "+q[1]);
+ q=createBug("LP5445");
+ System.out.println(q[0]+" : "+q[1]);
+
+ q=createBug("http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-November/016178.html");
+ System.out.println(q[0]+" : "+q[1]);
+ q=createBug("http://mail.openjdk.java.net/pipermail/awt-dev/2012-March/002324.html");
+ System.out.println(q[0]+" : "+q[1]);
+
+ q=createBug("http://lists.fedoraproject.org/pipermail/chinese/2012-January/008868.html");
+ System.out.println(q[0]+" : "+q[1]);
+ }
}
diff -r 82e908d46d70 -r 11029e99d733 tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/Bug.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/Bug.java Wed May 02 12:53:07 2012 +0200
@@ -0,0 +1,32 @@
+package net.sourceforge.jnlp.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * When declare for suite class or for Test-marked method,
+ * should be interpreted by report generating tool to links.
+ * Known shortcuts are
+ * SX - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=X
+ * PRX - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X
+ * RHX - https://bugzilla.redhat.com/show_bug.cgi?id=X
+ * DX - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X
+ * GX - http://bugs.gentoo.org/show_bug.cgi?id=X
+ * CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X
+ * LPX - https://bugs.launchpad.net/bugs/X
+ *
+ * http://mail.openjdk.java.net/pipermail/distro-pkg-dev/
+ * and http://mail.openjdk.java.net/pipermail/ are proceed differently
+ * You just put eg @Bug(id="RH12345",id="http:/my.bukpage.com/terribleNew")
+ * and RH12345 will be transalated as
+ * <a href="https://bugzilla.redhat.com/show_bug.cgi?id=123456">123456<a> or
+ * similar, the url will be inclueded as is. Both added to proper tests or suites
+ *
+ */
+ at Target({ElementType.METHOD,ElementType.TYPE})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface Bug {
+ public String[] id();
+}
diff -r 82e908d46d70 -r 11029e99d733 tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/NeedsDisplay.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/NeedsDisplay.java Wed May 02 12:53:07 2012 +0200
@@ -0,0 +1,18 @@
+
+package net.sourceforge.jnlp.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation should be declared for each test which requires DISPALY defined.
+ * If no display is defined, then those test will not be run
+ *
+ */
+ at Target(ElementType.METHOD)
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface NeedsDisplay {
+
+}
diff -r 82e908d46d70 -r 11029e99d733 tests/report-styles/jreport.xsl
--- a/tests/report-styles/jreport.xsl Tue Apr 24 14:43:34 2012 -0400
+++ b/tests/report-styles/jreport.xsl Wed May 02 12:53:07 2012 +0200
@@ -102,6 +102,12 @@
</xsl:attribute><xsl:value-of select="@name"/>
(<xsl:value-of select="@time"/>ms):
</a>
+ <xsl:for-each select="bugs/bug">
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="normalize-space(.)"/></xsl:attribute>
+ <xsl:value-of select="@visibleName"/>
+ </a>;
+ </xsl:for-each>
</div>
<blockquote>
<div class="tablee">
@@ -166,6 +172,13 @@
<xsl:text disable-output-escaping="no"> - </xsl:text>
<div class="method">
<xsl:value-of select="@name"/>
+ <xsl:for-each select="bugs/bug">
+ <xsl:text disable-output-escaping="no"> - </xsl:text>
+ <a>
+ <xsl:attribute name="href"><xsl:value-of select="normalize-space(.)"/></xsl:attribute>
+ <xsl:value-of select="@visibleName"/>
+ </a>
+ </xsl:for-each>
</div>
</div>
<div class="result">
More information about the distro-pkg-dev
mailing list