/hg/release/icedtea-web-1.5: All tests adapted to run from XBoot...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Thu Jun 19 13:05:19 UTC 2014
changeset a2ed2390946a in /hg/release/icedtea-web-1.5
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.5?cmd=changeset;node=a2ed2390946a
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jun 19 15:05:09 2014 +0200
All tests adapted to run from XBootclaspath (forced by extending package private rt.jar class) (including Fixed slipped test classlaoder fix in JavawsAWTRobotFindsButtonTest.java)
diffstat:
ChangeLog | 13 +++++++
Makefile.am | 18 +++++----
tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java | 2 +-
tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java | 2 +-
tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java | 2 +-
5 files changed, 26 insertions(+), 11 deletions(-)
diffs (135 lines):
diff -r 006c94731726 -r a2ed2390946a ChangeLog
--- a/ChangeLog Thu Jun 19 14:29:19 2014 +0200
+++ b/ChangeLog Thu Jun 19 15:05:09 2014 +0200
@@ -1,3 +1,16 @@
+2014-06-19 Jiri Vanek <jvanek at redhat.com>
+
+ All tests adapted to run from XBootclaspath (forced by extending package private
+ rt.jar class)
+ * Makefile.am: all sets of call of -Xbootclasspath in tests and coverage
+ are now adding $CLASSPATH to boot classapth. Where CLASSPATH was not deffined,
+ was added.
+ * tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java: and
+ * tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java:
+ resources loaded from boot classloader
+ * tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java
+ (static init) used system classlaoder to laod image
+
2014-06-19 Jiri Vanek <jvanek at redhat.com>
Made it works (basicaly) on any JDK
diff -r 006c94731726 -r a2ed2390946a Makefile.am
--- a/Makefile.am Thu Jun 19 14:29:19 2014 +0200
+++ b/Makefile.am Thu Jun 19 15:05:09 2014 +0200
@@ -899,7 +899,7 @@
class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \
$(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
- -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
+ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names
if WITH_XSLTPROC
-$(XSLTPROC) --stringparam logs logs_reproducers.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(TEST_EXTENSIONS_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html
-$(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(TEST_EXTENSIONS_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_reproducers.html
@@ -1077,7 +1077,7 @@
cd $(NETX_UNIT_TEST_DIR) ; \
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) \
- $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names
+ $(BOOT_DIR)/bin/java -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names
if WITH_XSLTPROC
-$(XSLTPROC) --stringparam logs logs_unit.html $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html
-$(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/logs.xsl $(NETX_UNIT_TEST_DIR)/ServerAccess-logs.xml > $(TESTS_DIR)/logs_unit.html
@@ -1097,7 +1097,8 @@
mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" ; \
done ;\
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
- $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emmarun \
+ CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \
+ $(BOOT_DIR)/bin/java $(EMMA_JAVA_ARGS) -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH -cp $(EMMA_JAR) -Demma.report.html.out.encoding=UTF-8 emmarun \
-Dreport.html.out.encoding=UTF-8 \
-raw \
-sp $(NETX_SRCDIR) \
@@ -1162,7 +1163,7 @@
done ;\
class_names=`cat $(UNIT_CLASS_NAMES)` ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):.:$(TEST_EXTENSIONS_SRCDIR):$(TAGSOUP_JAR) \
- $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \
+ $(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names ; \
for file in $(EMMA_MODIFIED_FILES) ; do \
mv $(NETX_UNIT_TEST_DIR)/$$file $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_SUFFIX)" ; \
mv $(NETX_UNIT_TEST_DIR)/"$$file""$(EMMA_BACKUP_SUFFIX)" $(NETX_UNIT_TEST_DIR)/$$file ; \
@@ -1218,10 +1219,11 @@
done ; \
cd $(TEST_EXTENSIONS_DIR) ; \
class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
+ CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):$(TEST_EXTENSIONS_DIR):.:$(TEST_EXTENSIONS_SRCDIR) \
$(BOOT_DIR)/bin/java \
$(EMMA_JAVA_ARGS) \
$(REPRODUCERS_DPARAMETERS) \
- -Xbootclasspath:$(RUNTIME) -cp $(EMMA_JAR) emmarun \
+ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH -cp $(EMMA_JAR) emmarun \
-raw \
-cp $(NETX_DIR)/lib/classes.jar \
-cp $(JUNIT_JAR) \
@@ -1337,7 +1339,7 @@
class_names=`cat $(REPRODUCERS_CLASS_NAMES)` ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_DIR):$(JACOCO_CLASSPATH):$(TEST_EXTENSIONS_TESTS_DIR):$(TEST_EXTENSIONS_SRCDIR) \
$(BOOT_DIR)/bin/java $(JACOCO_AGENT_SWITCH) $(REPRODUCERS_DPARAMETERS) \
- -Xbootclasspath:$(RUNTIME) CommandLine $$class_names ; \
+ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH CommandLine $$class_names ; \
if [ -f $(JACOCO_JAVAWS_RESULTS) ] ; then \
jacoco_javaws_results=$(JACOCO_JAVAWS_RESULTS) ; \
$(JACOCO_OPERATOR_EXEC) \
@@ -1446,14 +1448,14 @@
cd $(TEST_EXTENSIONS_DIR) ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \
$(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
- -Xbootclasspath:$(RUNTIME) net.sourceforge.jnlp.ServerAccess
+ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH net.sourceforge.jnlp.ServerAccess
run-test-server-on-random-port: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp
cd $(TEST_EXTENSIONS_DIR) ; \
CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \
$(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
- -Xbootclasspath:$(RUNTIME) net.sourceforge.jnlp.ServerAccess randomport
+ -Xbootclasspath/a:$(RUNTIME):$$CLASSPATH net.sourceforge.jnlp.ServerAccess randomport
clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests clean-test-code-coverage-jacoco clean-test-code-coverage
if [ -e $(TESTS_DIR)/netx ]; then \
diff -r 006c94731726 -r a2ed2390946a tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java Thu Jun 19 14:29:19 2014 +0200
+++ b/tests/netx/unit/net/sourceforge/jnlp/JNLPMatcherTest.java Thu Jun 19 15:05:09 2014 +0200
@@ -71,7 +71,7 @@
"Testing application with a complete different JNLP application file",
"Testing by calling JNLPMatcher.match() multiple times. Checking to see if the returns value is consistent" };
- final ClassLoader cl = JNLPMatcherTest.class.getClassLoader();
+ final ClassLoader cl = ClassLoader.getSystemClassLoader();
private InputStreamReader getLaunchReader() {
InputStream launchStream = cl
diff -r 006c94731726 -r a2ed2390946a tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java
--- a/tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java Thu Jun 19 14:29:19 2014 +0200
+++ b/tests/reproducers/simple/JavawsAWTRobotFindsButton/testcases/JavawsAWTRobotFindsButtonTest.java Thu Jun 19 15:05:09 2014 +0200
@@ -68,7 +68,7 @@
static{
try {
- buttonIcon = ImageIO.read(JavawsAWTRobotFindsButtonTest.class.getClassLoader().getResource("buttonA.png"));
+ buttonIcon = ImageIO.read(ClassLoader.getSystemClassLoader().getResource("buttonA.png"));
} catch (IOException e) {
throw new RuntimeException("Problem initializing buttonIcon",e);
}
diff -r 006c94731726 -r a2ed2390946a tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java
--- a/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Thu Jun 19 14:29:19 2014 +0200
+++ b/tests/test-extensions/net/sourceforge/jnlp/awt/imagesearch/ComponentFinder.java Thu Jun 19 15:05:09 2014 +0200
@@ -50,7 +50,7 @@
static{
try {
- defaultIcon = ImageIO.read(ComponentFinder.class.getClassLoader().getResource("net/sourceforge/jnlp/awt/imagesearch/marker.png"));
+ defaultIcon = ImageIO.read(ClassLoader.getSystemClassLoader().getResource("net/sourceforge/jnlp/awt/imagesearch/marker.png"));
} catch (IOException e) {
throw new RuntimeException("ComponentFinder - problem initializing defaultIcon",e);
}
More information about the distro-pkg-dev
mailing list