aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Domurad <adomurad@redhat.com>2013-04-25 10:33:21 -0400
committerAdam Domurad <adomurad@redhat.com>2013-04-25 10:33:21 -0400
commitea6aec77a785846cb557916b688978714bf78426 (patch)
tree5a39b712952fde8e5f8b9f2d7b55aa0dc4738b7a
parenta2026c0ff7851152b932595a8c0de42eff262fab (diff)
Tests & test extensions for mocking the plugin input & output pipes.
-rw-r--r--ChangeLog13
-rw-r--r--Makefile.am2
-rw-r--r--plugin/icedteanp/java/sun/applet/PluginStreamHandler.java3
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d97c84..e88a8ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-04-25 Adam Domurad <adomurad@redhat.com>
+
+ Tests & test extensions for mocking the plugin input & output pipes.
+ * Makefile.am
+ (stamps/test-extensions-compile.stamp): Make plugin classes available
+ to test extensions
+ * tests/test-extensions/net/sourceforge/jnlp/AsyncCall.java: New, helper
+ for doing asynchronous calls with an optional timeout.
+ * tests/netx/unit/sun/applet/PluginAppletViewerTest.java: New, uses
+ PluginPipeMock to test the javascript requests to the plugin.
+ * tests/test-extensions/sun/applet/mock/PluginPipeMock.java: New, helper
+ for getting the plugin requests and mocking the replies.
+
2013-04-25 Jiri Vanek <jvanek@redhat.com>
Locking disabled on windows machines
diff --git a/Makefile.am b/Makefile.am
index e18353c..87201d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -760,7 +760,7 @@ stamps/test-extensions-compile.stamp: stamps/netx-dist.stamp stamps/plugin.stamp
ln -s $(TEST_EXTENSIONS_DIR) $(TEST_EXTENSIONS_COMPATIBILITY_SYMLINK);
$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
-d $(TEST_EXTENSIONS_DIR) \
- -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar \
+ -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(abs_top_builddir)/liveconnect/lib/classes.jar \
@test-extensions-source-files.txt && \
mkdir -p stamps && \
touch $@
diff --git a/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java b/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
index 06361e8..e351aef 100644
--- a/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
+++ b/plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
@@ -62,8 +62,7 @@ public class PluginStreamHandler {
private volatile boolean shuttingDown = false;
- public PluginStreamHandler(InputStream inputstream, OutputStream outputstream)
- throws MalformedURLException, IOException {
+ public PluginStreamHandler(InputStream inputstream, OutputStream outputstream) {
PluginDebug.debug("Current context CL=", Thread.currentThread().getContextClassLoader());