aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java1
-rw-r--r--tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8dfab45..e87c861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2012-08-13 Jiri Vanek <[email protected]>
+ * tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java:
+ (executeProcessUponURL)Fixed wrong call in previous commit which was
+ causing null process name.
+ * tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java:
+ Removed unused import.
+
+2012-08-13 Jiri Vanek <[email protected]>
+
Reproducers of PR955
* tests/reproducers/simple/LocalisedInformationElement/resources/LocalisedInformationElement1.jnlp:
* tests/reproducers/simple/LocalisedInformationElement/resources/LocalisedInformationElement2.jnlp:
diff --git a/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java b/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java
index 4bfe347..588b513 100644
--- a/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java
+++ b/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java
@@ -39,7 +39,6 @@ import net.sourceforge.jnlp.ProcessResult;
import net.sourceforge.jnlp.ServerAccess;
import net.sourceforge.jnlp.browsertesting.BrowserTest;
import net.sourceforge.jnlp.browsertesting.Browsers;
-import net.sourceforge.jnlp.annotations.Bug;
import net.sourceforge.jnlp.annotations.NeedsDisplay;
import net.sourceforge.jnlp.annotations.TestInBrowsers;
import org.junit.Assert;
diff --git a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
index 35fb53f..bd5ec01 100644
--- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
+++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
@@ -625,7 +625,7 @@ public class ServerAccess {
}
public static ProcessResult executeProcessUponURL(String toBeExecuted, List<String> otherargs, URL u,ContentReaderListener stdoutl,ContentReaderListener stderrl) throws Exception {
- return executeProcess(otherargs, null, stdoutl, stderrl, null);
+ return executeProcessUponURL(toBeExecuted, otherargs, u, stdoutl, stderrl, null);
}
public static ProcessResult executeProcessUponURL(String toBeExecuted, List<String> otherargs, URL u,ContentReaderListener stdoutl,ContentReaderListener stderrl,String[] vars) throws Exception {
Assert.assertNotNull(u);