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.

1 files changed, 3 insertions, 13 deletions

diff --git a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
index 31e81ad..6f45a23 100644
--- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
+++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
@@ -55,6 +55,7 @@ import java.net.ServerSocket;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessResult;
 import net.sourceforge.jnlp.browsertesting.Browser;
 import net.sourceforge.jnlp.browsertesting.BrowserFactory;
 import net.sourceforge.jnlp.browsertesting.Browsers;
@@ -270,7 +271,7 @@ public class ServerAccess {
        if (this.currentBrowser==null) return null;
        List<String> l1=this.currentBrowser.getComaptibilitySwitches();
        List<String> l2=this.currentBrowser.getDefaultSwitches();
-       List<String> l= new ArrayList();
+       List<String> l= new ArrayList<String>();
        if (l1!=null)l.addAll(l1);
        if (l2!=null)l.addAll(l2);
        return l;
@@ -832,15 +833,4 @@ public class ServerAccess {
         return new ProcessWrapper(args, dir, stdoutl, stderrl, vars).execute();
     }
 
-    /**
-     * this is temprary solution until refactoring is fully done
-     * Use  net.sourceforge.jnlp.ProcessResult instead
-     */
-    @Deprecated
-    public static class ProcessResult extends net.sourceforge.jnlp.ProcessResult {
-
-        public ProcessResult(String stdout, String stderr, Process process, boolean wasTerminated, Integer r, Throwable deadlyException) {
-            super(stdout, stderr, process, wasTerminated, r, deadlyException);
-        }
-    }
-    }
+}