Reproducer test cleanup to remove deprecation warnings and type checking warnings.

ServerAccess.ProcessResult removed and reference replaced with ProcessResult.
junit.framework.assert replaced in favour of org.junit.Assert.
Added parameterized typing to instantiation of several fields and local variables
where the declaration was already parameterized.

13 files changed, 75 insertions, 65 deletions

diff --git a/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java b/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java
index 47a182b..e14c174 100644
--- a/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java
+++ b/tests/reproducers/signed/ClasspathManifestTest/testcases/ClasspathManifestTest.java
@@ -38,8 +38,8 @@ exception statement from your version.
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
-import net.sourceforge.jnlp.ServerAccess.ProcessResult;
 import net.sourceforge.jnlp.annotations.KnownToFail;
 import net.sourceforge.jnlp.annotations.NeedsDisplay;
 import net.sourceforge.jnlp.annotations.TestInBrowsers;
@@ -76,14 +76,14 @@ public class ClasspathManifestTest extends BrowserTest {
         commands.add(server.getJavawsLocation());
         commands.add(ServerAccess.HEADLES_OPTION);
         commands.add("ClasspathManifestApplicationTest.jnlp");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
         checkAppFails(pr, "ApplicationJNLPLocalTest");
     }
 
     @NeedsDisplay
     @Test
     public void AppletJNLPRemoteTest() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestAppletTest.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(null, "/ClasspathManifestAppletTest.jnlp");
         checkAppFails(pr, "AppletJNLPRemoteTest");
     }
 
@@ -95,7 +95,7 @@ public class ClasspathManifestTest extends BrowserTest {
         commands.add(server.getJavawsLocation());
         commands.add(ServerAccess.HEADLES_OPTION);
         commands.add("ClasspathManifestAppletTest.jnlp");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
         checkAppFails(pr, "AppletJNLPRLocalTest");
     }
 
@@ -103,7 +103,7 @@ public class ClasspathManifestTest extends BrowserTest {
     @TestInBrowsers(testIn = {Browsers.one})
     @Test
     public void BrowserJNLPHrefRemoteTest() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("/ClasspathManifestJNLPHrefTest.html");
+        ProcessResult pr = server.executeBrowser("/ClasspathManifestJNLPHrefTest.html");
         checkAppFails(pr, "BrowserJNLPHrefRemoteTest");
     }
 
@@ -115,7 +115,7 @@ public class ClasspathManifestTest extends BrowserTest {
         List<String> commands=new ArrayList<String>(2);
         commands.add(server.getBrowserLocation());
         commands.add("ClasspathManifestJNLPHrefTest.html");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands, server.getDir());
         checkAppFails(pr, "BrowserJNLPHrefLocalTest");
     }
 
@@ -123,7 +123,7 @@ public class ClasspathManifestTest extends BrowserTest {
     @TestInBrowsers(testIn = {Browsers.one})
     @Test
     public void BrowserAppletRemoteTest() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("/ClasspathManifestAppletTest.html");
+        ProcessResult pr = server.executeBrowser("/ClasspathManifestAppletTest.html");
         Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1));
         // Should be the only one to search manifest for classpath.
         Assert.assertTrue("ClasspathManifest.BrowserAppletRemoteTest stdout should contain " + s2 + " but didn't", pr.stdout.contains(s2));
diff --git a/tests/reproducers/signed/DownloadService/testcases/DownloadServiceTest.java b/tests/reproducers/signed/DownloadService/testcases/DownloadServiceTest.java
index 69c5736..de92292 100644
--- a/tests/reproducers/signed/DownloadService/testcases/DownloadServiceTest.java
+++ b/tests/reproducers/signed/DownloadService/testcases/DownloadServiceTest.java
@@ -40,10 +40,10 @@ import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
 import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
 
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/tests/reproducers/signed/EmptySignedJar/testcases/EmptySignedJarTest.java b/tests/reproducers/signed/EmptySignedJar/testcases/EmptySignedJarTest.java
index c2fda0a..6cfa884 100644
--- a/tests/reproducers/signed/EmptySignedJar/testcases/EmptySignedJarTest.java
+++ b/tests/reproducers/signed/EmptySignedJar/testcases/EmptySignedJarTest.java
@@ -1,4 +1,4 @@
-/* EmptySignedJar.java
+/* EmptySignedJarTest.java
 Copyright (C) 2012 Red Hat, Inc.
 
 This file is part of IcedTea.
@@ -38,6 +38,7 @@ exception statement from your version.
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
 import net.sourceforge.jnlp.annotations.Bug;
 
@@ -53,21 +54,21 @@ public class EmptySignedJarTest {
     @Test
     public void checkingForRequiredResources() throws Exception {
         String s = "Running SignedJarResource..";
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJarResource.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJarResource.jnlp");
         Assert.assertTrue("Could not locate SignedJarResource class within SignedJarResource jar", pr.stdout.contains(s));
     }
 
     @Bug(id = "PR1049")
     @Test
     public void usingExtensionWithEmptyJar() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/EmptySignedJarInExtensionJnlp.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/EmptySignedJarInExtensionJnlp.jnlp");
         Assert.assertTrue("Stdout should contain " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
     }
 
     @Bug(id = "PR1049")
     @Test
     public void usingLauncherWithEmptyJar() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/EmptySignedJarInLaunchingJnlp.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/EmptySignedJarInLaunchingJnlp.jnlp");
         Assert.assertTrue("Stdout should contain " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
     }
 }
diff --git a/tests/reproducers/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java b/tests/reproducers/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java
index 385e937..749e844 100644
--- a/tests/reproducers/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java
+++ b/tests/reproducers/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java
@@ -38,6 +38,7 @@ exception statement from your version.
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
 import net.sourceforge.jnlp.annotations.Bug;
 
@@ -55,7 +56,7 @@ public class ExtensionJnlpTest {
 
     @Test
     public void checkingForRequiredResources() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJar.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJar.jnlp");
         Assert.assertTrue("Could not locate SignedJarResource class within SignedJarResource jar", pr.stdout.contains(jarOutput));
 
         String s = "Running SignedJnlpResource..";
@@ -66,21 +67,21 @@ public class ExtensionJnlpTest {
     @Bug(id = "PR1040")
     @Test
     public void usingSignedExtension() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJarExtension.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJarExtension.jnlp");
         Assert.assertTrue("Stdout should contain " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
     }
 
     @Bug(id = "PR1041")
     @Test
     public void mainJarInExtension() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJnlpJarAndSignedJarExtension.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJnlpJarAndSignedJarExtension.jnlp");
         Assert.assertTrue("Stdout should contain " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
     }
 
     @Bug(id = "PR1042")
     @Test
     public void checkingSignedJnlpInExtension() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJnlpExtension.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/UsesSignedJnlpExtension.jnlp");
         Assert.assertTrue("Stdout should contain " + signedJnlpException + " but did not", pr.stderr.contains(signedJnlpException));
     }
 }
diff --git a/tests/reproducers/signed/InternalClassloaderWithDownloadedResource/testcases/InternalClassloaderWithDownloadedResourceTest.java b/tests/reproducers/signed/InternalClassloaderWithDownloadedResource/testcases/InternalClassloaderWithDownloadedResourceTest.java
index 54cb203..02ffd7b 100644
--- a/tests/reproducers/signed/InternalClassloaderWithDownloadedResource/testcases/InternalClassloaderWithDownloadedResourceTest.java
+++ b/tests/reproducers/signed/InternalClassloaderWithDownloadedResource/testcases/InternalClassloaderWithDownloadedResourceTest.java
@@ -39,8 +39,8 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
-import net.sourceforge.jnlp.ServerAccess.ProcessResult;
 import net.sourceforge.jnlp.annotations.Bug;
 import net.sourceforge.jnlp.annotations.NeedsDisplay;
 import net.sourceforge.jnlp.annotations.TestInBrowsers;
@@ -78,7 +78,7 @@ public class InternalClassloaderWithDownloadedResourceTest extends BrowserTest {
     @Test
     @Bug(id = {"RH816592","PR858"})
     public void launchInternalClassloaderWithDownloadedResourceAsJnlpApplication() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-new.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-new.jnlp");
         evaluate(pr);
         Assert.assertFalse("should not be terminated but was", pr.wasTerminated);
         Assert.assertEquals((Integer) 0, pr.returnValue);
@@ -94,7 +94,7 @@ public class InternalClassloaderWithDownloadedResourceTest extends BrowserTest {
     @Test
     @Bug(id = {"RH816592","PR858"})
     public void launchInternalClassloaderWithDownloadedResourceAsJnlpApplet() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-applet-new.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-applet-new.jnlp");
         evaluate(pr);
         Assert.assertFalse("should not be terminated but was", pr.wasTerminated);
         Assert.assertEquals((Integer) 0, pr.returnValue);
@@ -105,7 +105,7 @@ public class InternalClassloaderWithDownloadedResourceTest extends BrowserTest {
     @NeedsDisplay
     @TestInBrowsers(testIn={Browsers.all})
     public void launchInternalClassloaderWithDownloadedResourceAsHtmlApplet() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("/InternalClassloaderWithDownloadedResource-new.html");
+        ProcessResult pr = server.executeBrowser("/InternalClassloaderWithDownloadedResource-new.html");
         evaluate(pr);
         Assert.assertTrue("should be terminated but was not", pr.wasTerminated);
     }
@@ -113,7 +113,7 @@ public class InternalClassloaderWithDownloadedResourceTest extends BrowserTest {
     @Test
     @Bug(id = {"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-May/018737.html"})
     public void launchInternalClassloaderWithDownloadedResourceAsJnlpApplicationHack() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-hack.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-hack.jnlp");
         evaluate(pr);
         Assert.assertFalse("should not be terminated but was", pr.wasTerminated);
         Assert.assertEquals((Integer) 0, pr.returnValue);
@@ -122,7 +122,7 @@ public class InternalClassloaderWithDownloadedResourceTest extends BrowserTest {
     @Test
     @Bug(id = {"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-May/018737.html"})
     public void launchInternalClassloaderWithDownloadedResourceAsJnlpAppletHack() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-applet-hack.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/InternalClassloaderWithDownloadedResource-applet-hack.jnlp");
         evaluate(pr);
         Assert.assertFalse("should not be terminated but was", pr.wasTerminated);
         Assert.assertEquals((Integer) 0, pr.returnValue);
@@ -133,7 +133,7 @@ public class InternalClassloaderWithDownloadedResourceTest extends BrowserTest {
     @Bug(id = {"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-May/018737.html"})
     @TestInBrowsers(testIn={Browsers.all})
     public void launchInternalClassloaderWithDownloadedResourceAsHtmlAppletHack() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("/InternalClassloaderWithDownloadedResource-hack.html");
+        ProcessResult pr = server.executeBrowser("/InternalClassloaderWithDownloadedResource-hack.html");
         evaluate(pr);
         Assert.assertTrue("should be terminated but was not", pr.wasTerminated);
     }
diff --git a/tests/reproducers/signed/MissingJar/testcases/MissingJarTest.java b/tests/reproducers/signed/MissingJar/testcases/MissingJarTest.java
index dc8bb77..a0233eb 100644
--- a/tests/reproducers/signed/MissingJar/testcases/MissingJarTest.java
+++ b/tests/reproducers/signed/MissingJar/testcases/MissingJarTest.java
@@ -1,4 +1,4 @@
-/* MissingJar.java
+/* MissingJarTest.java
 Copyright (C) 2011 Red Hat, Inc.
 
 This file is part of IcedTea.
@@ -38,10 +38,10 @@ exception statement from your version.
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
-import net.sourceforge.jnlp.ServerAccess.ProcessResult;
-import org.junit.Assert;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class MissingJarTest {
@@ -60,25 +60,25 @@ public class MissingJarTest {
 
     @Test
     public void MissingJarTest1() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar.jnlp");
         evaluateResult(pr);
     }
 
     @Test
     public void MissingJarTest2() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar2.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar2.jnlp");
         evaluateResult(pr);
     }
 
     @Test
     public void MissingJarTest3() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar3.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar3.jnlp");
         evaluateResult(pr);
     }
 
     @Test
     public void MissingJarTest4() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar4.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar4.jnlp");
         evaluateResult(pr);
     }
 }
diff --git a/tests/reproducers/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java b/tests/reproducers/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java
index 8f9455d..e0d9488 100644
--- a/tests/reproducers/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java
+++ b/tests/reproducers/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java
@@ -1,4 +1,4 @@
-/* ReadPropertiesSignedTest.java
+/* ReadPropertiesBySignedHackTest.java
 Copyright (C) 2011 Red Hat, Inc.
 
 This file is part of IcedTea.
@@ -35,11 +35,12 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.
  */
 
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -52,7 +53,7 @@ public class ReadPropertiesBySignedHackTest {
     @Test
     public void ReadPropertiesBySignedHackWithjoutXtrustAll() throws Exception {
         //no request for permissions
-        ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesBySignedHack.jnlp");
+        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesBySignedHack.jnlp");
         String s="java.lang.SecurityException: class \"ReadProperties\"'s signer information does not match signer information of other classes in the same package";
         Assert.assertTrue("Stderr should contains "+s+" but did not",pr.stderr.contains(s));
         String ss="ClassNotFoundException";
diff --git a/tests/reproducers/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java b/tests/reproducers/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java
index 6b389e3..ee74183 100644
--- a/tests/reproducers/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java
+++ b/tests/reproducers/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java
@@ -35,11 +35,12 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.
  */
 
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -53,7 +54,7 @@ public class ReadPropertiesSignedTest {
     @Test
     public void ReadSignedPropertiesWithoutPermissionsWithXtrustAll() throws Exception {
         //no request for permissions
-        ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned1.jnlp");
+        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned1.jnlp");
         Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
         String ss="ClassNotFoundException";
         Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
@@ -65,7 +66,7 @@ public class ReadPropertiesSignedTest {
     @Test
     public void ReadSignedPropertiesWithPermissionsWithXtrustAll() throws Exception {
         //request for allpermissions
-        ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned2.jnlp");
+        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned2.jnlp");
         Assert.assertFalse("Stderr should NOT match "+accessMatcher+" but did",pr.stderr.matches(accessMatcher));
         String ss="ClassNotFoundException";
         Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
@@ -76,16 +77,15 @@ public class ReadPropertiesSignedTest {
 
     @Test
     public void EnsureXtrustallNotAffectingUnsignedBehaviour() throws Exception {
-        ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadProperties1.jnlp");
+        ProcessResult pr=server.executeJavawsHeadless(l,"/ReadProperties1.jnlp");
         Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
         String ss="ClassNotFoundException";
         Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
         Assert.assertFalse("stdout lenght should not be  >2 but was "+pr.stdout.length(),pr.stdout.length()>2);
         Assert.assertFalse("should not be terminated but was",pr.wasTerminated);
         Assert.assertEquals((Integer)0, pr.returnValue);
-        ServerAccess.ProcessResult pr2=server.executeJavawsHeadless(null,"/ReadProperties1.jnlp");
+        ProcessResult pr2=server.executeJavawsHeadless(null,"/ReadProperties1.jnlp");
         Assert.assertEquals(pr.stderr, pr2.stderr);
         Assert.assertEquals(pr.stdout, pr2.stdout);
-
     }
   }
diff --git a/tests/reproducers/signed/SignedJnlpApplication/testcases/SignedJnlpApplicationTest.java b/tests/reproducers/signed/SignedJnlpApplication/testcases/SignedJnlpApplicationTest.java
index fb4e9ff..78e5590 100644
--- a/tests/reproducers/signed/SignedJnlpApplication/testcases/SignedJnlpApplicationTest.java
+++ b/tests/reproducers/signed/SignedJnlpApplication/testcases/SignedJnlpApplicationTest.java
@@ -38,7 +38,9 @@ exception statement from your version.
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -52,7 +54,7 @@ public class SignedJnlpApplicationTest {
 
     @Test
     public void launchingFileMatchesSignedApplication1() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication1.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication1.jnlp");
         String s = "Running signed application in main";
         Assert.assertTrue("Stdout should contains " + s + " but did not", pr.stdout.contains(s));
     }
@@ -62,7 +64,7 @@ public class SignedJnlpApplicationTest {
      */
     @Test
     public void launchingFileDoesNotMatchSignedApplication1() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication2.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication2.jnlp");
         Assert.assertTrue("Stderr should contains " + signedException + " but did not", pr.stderr.contains(signedException));
     }
 
@@ -71,7 +73,7 @@ public class SignedJnlpApplicationTest {
      */
     @Test
     public void launchingFileDoesNotMatchSignedApplication2() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication3.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpApplication3.jnlp");
         Assert.assertTrue("Stderr should contains " + signedException + " but did not", pr.stderr.contains(signedException));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/reproducers/signed/SignedJnlpCaseTestOne/testcases/SignedJnlpCaseOneTest.java b/tests/reproducers/signed/SignedJnlpCaseTestOne/testcases/SignedJnlpCaseOneTest.java
index d410790..d8bd03b 100644
--- a/tests/reproducers/signed/SignedJnlpCaseTestOne/testcases/SignedJnlpCaseOneTest.java
+++ b/tests/reproducers/signed/SignedJnlpCaseTestOne/testcases/SignedJnlpCaseOneTest.java
@@ -38,7 +38,9 @@ exception statement from your version.
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -49,14 +51,14 @@ public class SignedJnlpCaseOneTest {
 
     @Test
     public void launchingFileMatchesSigned() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestOne1.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestOne1.jnlp");
         String s = "Running signed application in main";
         Assert.assertTrue("Stdout should contains " + s + " but did not", pr.stdout.contains(s));
     }
 
     @Test
     public void launchingFileDoesNotMatchSigned() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestOne2.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestOne2.jnlp");
         String s = "net.sourceforge.jnlp.LaunchException: Fatal: Application Error: The signed " +
                 "JNLP file did not match the launching JNLP file. Missing Resource: Signed Application did not match " +
                 "launching JNLP File";
diff --git a/tests/reproducers/signed/SignedJnlpCaseTestTwo/testcases/SignedJnlpCaseTwoTest.java b/tests/reproducers/signed/SignedJnlpCaseTestTwo/testcases/SignedJnlpCaseTwoTest.java
index 2869552..3fd066c 100644
--- a/tests/reproducers/signed/SignedJnlpCaseTestTwo/testcases/SignedJnlpCaseTwoTest.java
+++ b/tests/reproducers/signed/SignedJnlpCaseTestTwo/testcases/SignedJnlpCaseTwoTest.java
@@ -38,6 +38,7 @@ exception statement from your version.
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
 import org.junit.Assert;
 import org.junit.Test;
@@ -49,14 +50,14 @@ public class SignedJnlpCaseTwoTest {
 
     @Test
     public void launchingFileMatchesSigned() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestTwo1.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestTwo1.jnlp");
         String s = "Running signed application in main";
         Assert.assertTrue("Stdout should contains " + s + " but did not", pr.stdout.contains(s));
     }
 
     @Test
     public void launchingFileDoesNotMatchSigned() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestTwo2.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpCaseTestTwo2.jnlp");
         String s = "net.sourceforge.jnlp.LaunchException: Fatal: Application Error: The signed " +
                 "JNLP file did not match the launching JNLP file. Missing Resource: Signed Application did not match " +
                 "launching JNLP File";
diff --git a/tests/reproducers/signed/SignedJnlpTemplate/testcases/SignedJnlpTemplateTest.java b/tests/reproducers/signed/SignedJnlpTemplate/testcases/SignedJnlpTemplateTest.java
index 5f2dd78..46a218e 100644
--- a/tests/reproducers/signed/SignedJnlpTemplate/testcases/SignedJnlpTemplateTest.java
+++ b/tests/reproducers/signed/SignedJnlpTemplate/testcases/SignedJnlpTemplateTest.java
@@ -38,7 +38,9 @@ exception statement from your version.
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -52,7 +54,7 @@ public class SignedJnlpTemplateTest {
 
     @Test
     public void launchingFileMatchesSignedTemplate1() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate1.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate1.jnlp");
         String s = "Running signed application in main";
         Assert.assertTrue("Stdout should contains " + s + " but did not", pr.stdout.contains(s));
     }
@@ -62,7 +64,7 @@ public class SignedJnlpTemplateTest {
      */
     @Test
     public void launchingFileDoesNotMatchSignedTemplate2() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate2.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate2.jnlp");
         Assert.assertTrue("Stderr should contains " + signedException + " but did not", pr.stderr.contains(signedException));
     }
 
@@ -71,7 +73,7 @@ public class SignedJnlpTemplateTest {
      */
     @Test
     public void launchingFileDoesNotMatchSignedTemplate3() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate3.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(l, "/SignedJnlpTemplate3.jnlp");
         Assert.assertTrue("Stderr should contains " + signedException + " but did not", pr.stderr.contains(signedException));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/reproducers/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java b/tests/reproducers/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java
index f33b203..605646e 100644
--- a/tests/reproducers/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java
+++ b/tests/reproducers/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java
@@ -37,20 +37,20 @@ exception statement from your version.
 
 import java.util.ArrayList;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.ServerAccess;
 import net.sourceforge.jnlp.annotations.Bug;
 import net.sourceforge.jnlp.annotations.NeedsDisplay;
 import net.sourceforge.jnlp.browsertesting.BrowserTest;
 import net.sourceforge.jnlp.browsertesting.Browsers;
 import net.sourceforge.jnlp.annotations.TestInBrowsers;
-import org.junit.Assert;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 @Bug(id={"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016127.html","PR804","PR811"})
 public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
 
-
     @Bug(id="PR811")
     @Test
     @NeedsDisplay
@@ -82,7 +82,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
          * it is in headless mode. This can be considered as bug, but because it is
          * only on ocal files, and probably only from test run - it can be ignored
          */
-        ServerAccess.ProcessResult pr =  ServerAccess.executeProcess(commands);
+        ProcessResult pr =  ServerAccess.executeProcess(commands);
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "xception";
@@ -95,7 +95,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
     @Test
     @NeedsDisplay
     public void SpacesCanBeEverywhereRemoteAppletTestsJnlp2Signed() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavaws("/NotOnly%20spaces%20can%20kill%20%C4%9B%C5%A1%C4%8D%C5%99%C5%BE%20too%20signed.jnlp");
+        ProcessResult pr = server.executeJavaws("/NotOnly%20spaces%20can%20kill%20%C4%9B%C5%A1%C4%8D%C5%99%C5%BE%20too%20signed.jnlp");
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "xception";
@@ -108,7 +108,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
     @NeedsDisplay
     @TestInBrowsers(testIn = {Browsers.one})
     public void SpacesCanBeEverywhereRemoteAppletTestsHtml2Signed() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("/spaces+applet+Tests+signed.html");
+        ProcessResult pr = server.executeBrowser("/spaces+applet+Tests+signed.html");
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "xception";
@@ -120,7 +120,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
     @Bug(id={"PR811","http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016144.html"})
     @Test
     public void SpacesCanBeEverywhereRemoteTests1Signed() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere1%20signed.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere1%20signed.jnlp");
         String s = "Good simple javaws exapmle";
         Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
         String cc = "ClassNotFoundException";
@@ -132,7 +132,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
     @Bug(id="PR811")
     @Test
     public void SpacesCanBeEverywhereRemoteTests2Signed() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp");
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "ClassNotFoundException";
@@ -144,7 +144,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
     @Bug(id="PR811")
     @Test
     public void SpacesCanBeEverywhereRemoteTests2Signed_withQuery1() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test=20");
+        ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test=20");
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "ClassNotFoundException";
@@ -156,7 +156,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
      @Bug(id="PR811")
     @Test
     public void SpacesCanBeEverywhereRemoteTests2Signed_withQuery2() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test%3D20");
+        ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test%3D20");
 
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
@@ -169,7 +169,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
     @Bug(id="PR811")
     @Test
     public void SpacesCanBeEverywhereRemoteTests3Signed() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/SpacesCanBeEverywhere1signed.jnlp");
+        ProcessResult pr = server.executeJavawsHeadless(null, "/SpacesCanBeEverywhere1signed.jnlp");
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "ClassNotFoundException";
@@ -186,7 +186,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
         commands.add(server.getJavawsLocation());
         commands.add(ServerAccess.HEADLES_OPTION);
         commands.add("Spaces can be everywhere1.jnlp");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
         String s = "Good simple javaws exapmle";
         Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
         String cc = "ClassNotFoundException";
@@ -202,7 +202,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
         commands.add(server.getJavawsLocation());
         commands.add(ServerAccess.HEADLES_OPTION);
         commands.add("Spaces can be everywhere2 signed.jnlp");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "ClassNotFoundException";
@@ -218,7 +218,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
         commands.add(server.getJavawsLocation());
         commands.add(ServerAccess.HEADLES_OPTION);
         commands.add(server.getDir()+"/Spaces can be everywhere2 signed.jnlp");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands);
+        ProcessResult pr = ServerAccess.executeProcess(commands);
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "ClassNotFoundException";
@@ -234,7 +234,7 @@ public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
         commands.add(server.getJavawsLocation());
         commands.add(ServerAccess.HEADLES_OPTION);
         commands.add("SpacesCanBeEverywhere1signed.jnlp");
-        ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
+        ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
         String s="Signed spaces can be everywhere.jsr was launched correctly";
         Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
         String cc = "ClassNotFoundException";