Changeset 429 for trunk/icedtea-web/tests/test-extensions

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

Location:

trunk/icedtea-web/tests/test-extensions

Files:

• net/sourceforge/jnlp/AsyncCall.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/AsyncCall.java )
• net/sourceforge/jnlp/ClosingListener.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/ClosingListener.java )
• net/sourceforge/jnlp/ContentReader.java (modified) (6 diffs)
• net/sourceforge/jnlp/LoggingBottleneck.java (modified) (10 diffs)
• net/sourceforge/jnlp/ProcessAssasin.java (modified) (9 diffs)
• net/sourceforge/jnlp/ProcessWrapper.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java )
• net/sourceforge/jnlp/ServerAccess.java (modified) (20 diffs)
• net/sourceforge/jnlp/ServerLauncher.java (modified) (4 diffs)
• net/sourceforge/jnlp/ThreadedProcess.java (modified) (5 diffs)
• net/sourceforge/jnlp/TinyHttpdImpl.java (modified) (6 diffs)
• net/sourceforge/jnlp/annotations/KnownToFail.java (modified) (3 diffs)
• net/sourceforge/jnlp/annotations/Remote.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/annotations/Remote.java )
• net/sourceforge/jnlp/awt (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/awt )
• net/sourceforge/jnlp/browsertesting/Browser.java (modified) (2 diffs)
• net/sourceforge/jnlp/browsertesting/ReactingProcess.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/browsertesting/ReactingProcess.java )
• net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java (modified) (2 diffs)
• net/sourceforge/jnlp/browsertesting/browsers/Firefox.java (modified) (2 diffs)
• net/sourceforge/jnlp/browsertesting/browsers/LinuxBrowser.java (modified) (1 diff)
• net/sourceforge/jnlp/browsertesting/browsers/Midory.java (modified) (1 diff)
• net/sourceforge/jnlp/browsertesting/browsers/firefox (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/firefox )
• net/sourceforge/jnlp/closinglisteners (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/closinglisteners )
• net/sourceforge/jnlp/mock/DummyJNLPFile.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFile.java )
• net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java )
• net/sourceforge/jnlp/tools (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/tools )
• net/sourceforge/jnlp/util (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/net/sourceforge/jnlp/util )
• sun (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions/sun )

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/ContentReader.java

@@ -35 +35 @@
 exception statement from your version.
  */
-
 package net.sourceforge.jnlp;
 
@@ -42 +41 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
- * Class to read content of stdout/stderr of process, and to cooperate with its running/terminated/finished statuses.
+ * Class to read content of stdout/stderr of process, and to cooperate with its
+ * running/terminated/finished statuses.
  */
 class ContentReader implements Runnable {
@@ -51 +53 @@
     private final InputStream is;
     private boolean done;
-    ContentReaderListener listener;
+    final List<ContentReaderListener> listeners = new ArrayList<ContentReaderListener>(1);
 
     public String getContent() {
@@ -63 +65 @@
     public ContentReader(InputStream is, ContentReaderListener l) throws IOException {
         this.is = is;
-        this.listener = l;
+        if (l != null) {
+            this.listeners.add(l);
+        }
     }
 
-    public void setListener(ContentReaderListener listener) {
-        this.listener = listener;
+    public ContentReader(InputStream is, List<ContentReaderListener> l) throws IOException {
+        this.is = is;
+        if (l != null) {
+            this.listeners.addAll(l);
+        }
     }
 
-    public ContentReaderListener getListener() {
-        return listener;
+    public void addListener(ContentReaderListener listener) {
+        this.listeners.add(listener);
+    }
+
+    public List<ContentReaderListener> getListener() {
+        return listeners;
     }
 
@@ -97 +108 @@
                 int s = br.read();
                 if (s < 0) {
-                    if (line.length() > 0 && listener != null) {
-                        listener.lineReaded(line.toString());
+                    if (line.length() > 0 && listeners != null) {
+                        for (ContentReaderListener listener : listeners) {
+                            if (listener != null) {
+                                listener.lineReaded(line.toString());
+                            }
+                        }
                     }
                     break;
@@ -106 +121 @@
                 line.append(ch);
                 if (ch == '\n') {
-                    if (listener != null) {
-                        listener.lineReaded(line.toString());
+                    if (listeners != null) {
+                        for (ContentReaderListener listener : listeners) {
+                            if (listener != null) {
+                                listener.lineReaded(line.toString());
+                            }
+                        }
                     }
                     line = new StringBuilder();
                 }
-                if (listener != null) {
-                    listener.charReaded(ch);
+                if (listeners != null) {
+                    for (ContentReaderListener listener : listeners) {
+                        if (listener != null) {
+                            listener.charReaded(ch);
+                        }
+                    }
                 }
             }
-            //do not want to bother output with terminations
-            //mostly compaling when assassin kill the process about StreamClosed
-            //do not want to bother output with terminations
-            //mostly compaling when assassin kill the process about StreamClosed
-        } catch (Exception ex) {
+        } catch (NullPointerException ex) {
+            ex.printStackTrace();
+        }
+        //do not want to bother output with terminations
+        //mostly compaling when assassin kill the process about StreamClosed
+        catch (Exception ex) {
             // logException(ex);
+            //ex.printStackTrace();
         } finally {
             try {

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/LoggingBottleneck.java

@@ -46 +46 @@
 import java.io.Writer;
 import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -81 +82 @@
      * class.testMethod.logs
      */
-    final Map<String, Map<String, TestsLogs>> processLogs = new HashMap<String, Map<String, TestsLogs>>(100);
+    final Map<String, Map<String, TestsLogs>> processLogs = Collections.synchronizedMap(new HashMap<String, Map<String, TestsLogs>>(1000));
     private boolean added = false;
 
-    public static LoggingBottleneck getDefaultLoggingBottleneck() {
+    synchronized public static LoggingBottleneck getDefaultLoggingBottleneck() {
         if (loggingBottleneck == null) {
             loggingBottleneck = new LoggingBottleneck();
@@ -102 +103 @@
     }
 
-    void writeXmlLog() throws FileNotFoundException, IOException {
+   synchronized void writeXmlLog() throws FileNotFoundException, IOException {
         writeXmlLog(DEFAULT_LOG_FILE);
     }
 
-    void writeXmlLog(File f) throws FileNotFoundException, IOException {
+    synchronized void writeXmlLog(File f) throws FileNotFoundException, IOException {
+        writeXmlLog(f, Collections.unmodifiableMap(processLogs));
+    }
+        
+    synchronized static void writeXmlLog(File f, Map<String, Map<String, TestsLogs>> processLogs) throws FileNotFoundException, IOException {
         Writer w = new OutputStreamWriter(new FileOutputStream(f));
         Set<Entry<String, Map<String, TestsLogs>>> classes = processLogs.entrySet();
@@ -118 +123 @@
                 String testLogs = testLog.getValue().toString();
                 w.write("<" + TESTLOG_ELEMENT + " " + TESTMETHOD_ATTRIBUTE + "=\"" + testName + "\" " + FULLID_ATTRIBUTE + "=\"" + className + "." + testName + "\"  >");
-                w.write(testLogs);
+                w.write(clearChars(testLogs));
                 w.write("</" + TESTLOG_ELEMENT + ">");
             }
@@ -128 +133 @@
     }
 
-    void addToXmlLog(String message, boolean printToOut, boolean printToErr, StackTraceElement ste) {
+    synchronized  void addToXmlLog(String message, boolean printToOut, boolean printToErr, StackTraceElement ste) {
         Map<String, TestsLogs> classLog = processLogs.get(ste.getClassName());
         if (classLog == null) {
@@ -158 +163 @@
     }
 
-    public String modifyMethodWithForBrowser(String methodBrowseredName, String className) {
+   synchronized public String modifyMethodWithForBrowser(String methodBrowseredName, String className) {
         try {
-            Class clazz = Class.forName(className);
+            Class<?> clazz = Class.forName(className);
             /*
              * By using this isAssignable to ensure corect class before invocation,
@@ -181 +186 @@
     }
 
-    public void setLoggedBrowser(String loggedBrowser) {
+   synchronized public void setLoggedBrowser(String loggedBrowser) {
         this.loggedBrowser = loggedBrowser;
     }
 
-    public void logIntoPlaintextLog(String message, boolean printToOut, boolean printToErr) {
+  synchronized  public void logIntoPlaintextLog(String message, boolean printToOut, boolean printToErr) {
         try {
             if (printToOut) {
@@ -202 +207 @@
         DEFAULT_STDOUT_WRITER.write(idded);
         DEFAULT_STDOUT_WRITER.newLine();
+        DEFAULT_STDOUT_WRITER.flush();
     }
 
@@ -207 +213 @@
         DEFAULT_STDERR_WRITER.write(idded);
         DEFAULT_STDERR_WRITER.newLine();
+        DEFAULT_STDERR_WRITER.flush();
     }
 
@@ -212 +219 @@
         DEFAULT_STDLOGS_WRITER.write(idded);
         DEFAULT_STDLOGS_WRITER.newLine();
+        DEFAULT_STDLOGS_WRITER.flush();
+    }
+    
+   synchronized public  static String clearChars(String ss) {
+        StringBuilder s = new StringBuilder(ss);
+        for (int i = 0; i < s.length(); i++) {
+            char q = s.charAt(i);
+            if (q == '\n') {
+                continue;
+            }
+            if (q == '\t') {
+                continue;
+            }
+            int iq = (int) q;
+            if ((iq <= 31 || iq > 65533)||(iq >= 64976 && iq <= 65007)) {
+                s.setCharAt(i, 'I');
+                s.insert(i + 1, "NVALID_CHAR_" + iq);
+                i--;
+            }
+        }
+        return s.toString();
     }
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/ProcessAssasin.java

@@ -40 +40 @@
 import java.util.ArrayList;
 import java.util.List;
+import net.sourceforge.jnlp.browsertesting.ReactingProcess;
 
 /**
- * class which timeout any ThreadedProcess. This killing of 'thread with process' replaced not working process.destroy().
+ * class which timeout any ThreadedProcess. This killing of 'thread with
+ * process' replaced not working process.destroy().
  */
-class ProcessAssasin extends Thread {
+public class ProcessAssasin extends Thread {
 
     long timeout;
@@ -51 +53 @@
     private boolean canRun = true;
     private boolean wasTerminated = false;
+    //signifies that assasin have been summoned
+    private volatile boolean killing = false;
+    //signifies that assasin have done its job
+    private volatile boolean killed = false;
     /**
-     * if this is true, then process is not destroyed after timeout, but just left to its own destiny.
-     * Its stdout/err is no longer recorded, and it is leaking system resources until it dies by itself
-     * The contorl is returned to main thread with all informations recorded  untill now.
-     * You will be able to listen to std out from listeners still
+     * if this is true, then process is not destroyed after timeout, but just
+     * left to its own destiny. Its stdout/err is no longer recorded, and it is
+     * leaking system resources until it dies by itself The contorl is returned
+     * to main thread with all informations recorded untill now. You will be
+     * able to listen to std out from listeners still
      */
     private boolean skipInstedOfDesroy = false;
+    private ReactingProcess reactingProcess;
 
     public ProcessAssasin(ThreadedProcess p, long timeout) {
@@ -98 +106 @@
         return skipInstedOfDesroy;
     }
+
+    void setTimeout(long timeout) {
+        this.timeout = timeout;
+    }
+
 
     @Override
@@ -119 +132 @@
                                 try {
                                     if (!skipInstedOfDesroy) {
-                                        destroyProcess(p);
+                                        destroyProcess();
                                     }
                                 } catch (Throwable ex) {
@@ -161 +174 @@
     }
 
-    public static void destroyProcess(ThreadedProcess pp) {
+    public void destroyProcess() {
+        try {
+            killing = true;
+            destroyProcess(p, reactingProcess);
+        } finally {
+            killed = true;
+        }
+    }
+
+    public boolean haveKilled() {
+        return killed;
+    }
+
+    public boolean isKilling() {
+        return killing;
+    }
+
+
+
+    public static void destroyProcess(ThreadedProcess pp, ReactingProcess reactingProcess) {
         Process p = pp.getP();
         try {
@@ -167 +199 @@
             f.setAccessible(true);
             String pid = (f.get(p)).toString();
+            if (reactingProcess != null) {
+                reactingProcess.beforeKill(pid);
+            };
             sigInt(pid);
             //sigTerm(pid);
@@ -174 +209 @@
         } finally {
             p.destroy();
+            if (reactingProcess != null) {
+                reactingProcess.afterKill("");
+            };
         }
     }
@@ -189 +227 @@
     }
 
-    public static void kill(String pid,String signal) throws InterruptedException, Exception {
+    public static void kill(String pid, String signal) throws InterruptedException, Exception {
         List<String> ll = new ArrayList<String>(4);
         ll.add("kill");
@@ -199 +237 @@
         Thread.sleep(1000);
     }
+
+    void setReactingProcess(ReactingProcess reactingProcess) {
+        this.reactingProcess = reactingProcess;
+    }
+
+    public static void closeWindow(String pid) throws Exception {
+        List<String> ll = new ArrayList<String>(2);
+        ll.add(ServerAccess.getInstance().getDir().getParent() + "/softkiller");
+        ll.add(pid);
+        ServerAccess.executeProcess(ll); //sync, but  acctually release
+        //before affected application "close"
+        Thread.sleep(100);
+
+    }
+
+    public static void closeWindows(String s) throws Exception {
+        closeWindows(s, 10);
+    }
+    
+    public static void closeWindows(String s, int count) throws Exception {
+        //each close closes just one tab...
+        for (int i = 0; i < count; i++) {
+            ProcessAssasin.closeWindow(s);
+        }
+    }
+
+
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java

@@ -1 +1 @@
 /* ServerAccess.java
-Copyright (C) 2011 Red Hat, Inc.
+Copyright (C) 2011, 2012 Red Hat, Inc.
 
 This file is part of IcedTea.
@@ -56 +56 @@
 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;
+import net.sourceforge.jnlp.closinglisteners.AutoErrorClosingListener;
+import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener;
+import net.sourceforge.jnlp.util.FileUtils;
+import net.sourceforge.jnlp.util.logging.OutputController;
 import org.junit.Assert;
 
@@ -78 +83 @@
 public class ServerAccess {
 
+    public static enum AutoClose {
+
+        CLOSE_ON_EXCEPTION, CLOSE_ON_CORRECT_END, CLOSE_ON_BOTH
+    }
+
     public static final long NANO_TIME_DELIMITER=1000000l;
     /**
@@ -132 +142 @@
         } else {
             int port = 44321;
-            if (args.length > 0) {
-                port=new Integer(args[0]);
+            if (args.length > 0 && args[0].equalsIgnoreCase("randomport")) {
+                port = findFreePort();
+            } else if (args.length > 0) {
+                port = new Integer(args[0]);
             }
             getIndependentInstance(port);
@@ -157 +169 @@
     }
     public static final  String HEADLES_OPTION="-headless";
-    public static final  String VERBOSE_OPTION="-verbose ";
+    public static final  String VERBOSE_OPTION="-verbose";
 
     /**
@@ -260 +272 @@
        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);
@@ -409 +421 @@
      * @throws IOException if connection can't be established or resource does not exist
      */
-    public static String getContentOfStream(InputStream is,String encoding) throws IOException {
-        try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(is, encoding));
-            StringBuilder sb = new StringBuilder();
-            while (true) {
-                String s = br.readLine();
-                if (s == null) {
-                    break;
-                }
-                sb.append(s).append("\n");
-
-            }
-            return sb.toString();
-        } finally {
-            is.close();
-        }
-
+    public static String getContentOfStream(InputStream is, String encoding) throws IOException {
+        return FileUtils.getContentOfStream(is, encoding);
     }
 
@@ -436 +433 @@
      */
     public static String getContentOfStream(InputStream is) throws IOException {
-        return getContentOfStream(is, "UTF-8");
-
+        return FileUtils.getContentOfStream(is);
     }
 
@@ -483 +479 @@
      */
     public static void saveFile(String content, File f) throws IOException {
-        saveFile(content, f, "utf-8");
+        FileUtils.saveFile(content, f);
     }
     public static void saveFile(String content, File f,String encoding) throws IOException {
-        Writer output = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f),encoding));
-        output.write(content);
-        output.flush();
-        output.close();
+        FileUtils.saveFile(content, f, encoding);
     }
 
@@ -546 +539 @@
         return executeJavaws(null, resource,stdoutl,stderrl);
     }
+
+    public net.sourceforge.jnlp.ProcessResult executeBrowser(String string, AutoClose autoClose) throws Exception {
+        ClosingListener errClosing = null;
+        ClosingListener outClosing = null;
+        if (autoClose == AutoClose.CLOSE_ON_BOTH || autoClose == AutoClose.CLOSE_ON_EXCEPTION){
+            errClosing=new AutoErrorClosingListener();
+        }
+        if (autoClose == AutoClose.CLOSE_ON_BOTH || autoClose == AutoClose.CLOSE_ON_CORRECT_END){
+            outClosing=new AutoOkClosingListener();
+        }
+        return executeBrowser(string, outClosing, errClosing);
+    }
+    
+
     public ProcessResult executeBrowser(String resource) throws Exception {
         return executeBrowser(getBrowserParams(), resource);
     }
     public ProcessResult executeBrowser(String resource,ContentReaderListener stdoutl,ContentReaderListener stderrl) throws Exception {
+        return executeBrowser(getBrowserParams(), resource, stdoutl, stderrl);
+    }
+
+    public ProcessResult executeBrowser(String resource, List<ContentReaderListener> stdoutl, List<ContentReaderListener> stderrl) throws Exception {
         return executeBrowser(getBrowserParams(), resource, stdoutl, stderrl);
     }
@@ -572 +583 @@
 
     public ProcessResult executeBrowser(List<String> otherargs, String resource) throws Exception {
-        return executeProcessUponURL(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource));
-    }
-    public ProcessResult executeBrowser(List<String> otherargs, String resource,ContentReaderListener stdoutl,ContentReaderListener stderrl) throws Exception {
-        return executeProcessUponURL(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource),stdoutl,stderrl);
-    }
-
-     public ProcessResult executeBrowser(Browser b,List<String> otherargs, String resource) throws Exception {
-        return executeProcessUponURL(b.getBin(), otherargs, getUrlUponThisInstance(resource));
-    }
-    public ProcessResult executeBrowser(Browser b,List<String> otherargs, String resource,ContentReaderListener stdoutl,ContentReaderListener stderrl) throws Exception {
-        return executeProcessUponURL(b.getBin(), otherargs, getUrlUponThisInstance(resource),stdoutl,stderrl);
+        return executeBrowser(otherargs, getUrlUponThisInstance(resource));        
+    }
+    
+     public ProcessResult executeBrowser(List<String> otherargs, URL url) throws Exception {
+        ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, url);
+        rpw.setReactingProcess(getCurrentBrowser());//current browser may be null, but it does not metter
+        return rpw.execute();
+    }
+
+    public ProcessResult executeBrowser(List<String> otherargs, String resource, ContentReaderListener stdoutl, ContentReaderListener stderrl) throws Exception {
+        ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null);
+        rpw.setReactingProcess(getCurrentBrowser());//current browser may be null, but it does not metter
+        return rpw.execute();
+    }
+
+    public ProcessResult executeBrowser(List<String> otherargs,    String resource, List<ContentReaderListener> stdoutl, List<ContentReaderListener> stderrl) throws Exception {
+        ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null);
+        rpw.setReactingProcess(getCurrentBrowser());// current browser may be null, but it does not matter
+        return rpw.execute();
+    }
+
+    public ProcessResult executeBrowser(Browser b, List<String> otherargs, String resource) throws Exception {
+        ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource));
+        rpw.setReactingProcess(b);
+        return rpw.execute();
+    }
+
+    public ProcessResult executeBrowser(Browser b, List<String> otherargs, String resource, ContentReaderListener stdoutl, ContentReaderListener stderrl) throws Exception {
+        ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null);
+        rpw.setReactingProcess(b);
+        return rpw.execute();
+    }
+
+    public ProcessResult executeBrowser(Browser b, List<String> otherargs, String resource, List<ContentReaderListener> stdoutl, List<ContentReaderListener> stderrl) throws Exception {
+        ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null);
+        rpw.setReactingProcess(b);
+        return rpw.execute();
+    }
+
+    /**
+     * Create resource on http, on 'localhost' on port on which this cached instance is running
+     * @param resource
+     * @return
+     * @throws MalformedURLException
+     */
+    public URL getUrlUponThisInstance(String resource) throws MalformedURLException {
+        getInstance();
+        return getUrlUponInstance(server, resource);
     }
 
@@ -591 +639 @@
      * @throws MalformedURLException
      */
-    public URL getUrlUponThisInstance(String resource) throws MalformedURLException {
-        if (!resource.startsWith("/")) {
-            resource = "/" + resource;
-        }
-        return new URL("http", server.getServerName(), getPort(), resource);
+    public static URL getUrlUponInstance(ServerLauncher instance,String resource) throws MalformedURLException {
+       return instance.getUrl(resource);
     }
 
@@ -623 +668 @@
      */
     public static ProcessResult executeProcessUponURL(String toBeExecuted, List<String> otherargs, URL u) throws Exception {
-        return executeProcessUponURL(toBeExecuted, otherargs, u,null,null);
-    }
-
-    public static ProcessResult executeProcessUponURL(String toBeExecuted, List<String> otherargs, URL u,ContentReaderListener stdoutl,ContentReaderListener stderrl) throws Exception {
-        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);
-        Assert.assertNotNull(toBeExecuted);
-        Assert.assertTrue(toBeExecuted.trim().length() > 1);
-        if (otherargs == null) {
-            otherargs = new ArrayList<String>(1);
-        }
-        List<String> urledArgs = new ArrayList<String>(otherargs);
-        urledArgs.add(0, toBeExecuted);
-        urledArgs.add(u.toString());
-        return executeProcess(urledArgs, stdoutl, stderrl,vars);
+        return new ProcessWrapper(toBeExecuted, otherargs, u).execute();
+    }
+
+    public static ProcessResult executeProcessUponURL(String toBeExecuted, List<String> otherargs, URL u, ContentReaderListener stdoutl, ContentReaderListener stderrl) throws Exception {
+        return new ProcessWrapper(toBeExecuted, otherargs, u, stdoutl, stderrl, null).execute();
+    }
+
+    public static ProcessResult executeProcessUponURL(String toBeExecuted, List<String> otherargs, URL u, ContentReaderListener stdoutl, ContentReaderListener stderrl, String[] vars) throws Exception {
+        return new ProcessWrapper(toBeExecuted, otherargs, u, stdoutl, stderrl, vars).execute();
     }
 
@@ -671 +708 @@
     }
 
-    private static String createConnectionMessage(ThreadedProcess t) {
-        return "Connecting " + t.getCommandLine();
-    }
-
     /**
      * Proceed message s to logging with request to reprint to System.err
@@ -699 +732 @@
     }
 
-    private static void log(String message, boolean printToOut, boolean printToErr) {
+    static void log(String message, boolean printToOut, boolean printToErr) {
         String idded;
         StackTraceElement ste = getTestMethod();
@@ -726 +759 @@
     }
     public static void logException(Throwable t, boolean print){
-        try{
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        t.printStackTrace(pw);
-        log(sw.toString(), false, print);
-        pw.close();
-        sw.close();
-        }catch(Exception ex){
-           throw new RuntimeException(ex);
-        }
+        log(OutputController.exceptionToString(t), false, print);
     }
 
@@ -744 +768 @@
     private static StackTraceElement getTestMethod(StackTraceElement[] stack) {
         //0 is always thread
-        //1 is net.sourceforge.jnlp.ServerAccess
+        //1 is net.sourceforge.jnlp.*
+        //we need to get out of all  of classes from this package or pick last of it
         StackTraceElement result = stack[1];
         String baseClass = stack[1].getClassName();
@@ -750 +775 @@
         for (; i < stack.length; i++) {
             result = stack[i];//at least moving up
-            if(stack[i].getClassName().contains("$")){
+            if (stack[i].getClassName().contains("$")) {
                 continue;
             }
-            if (!baseClass.equals(stack[i].getClassName())) {
-                break;
+            //probablky it is necessary to get out of net.sourceforge.jnlp.
+            //package where are right now all test-extensions
+            //for now keeping exactly the three classes helping you  access the log
+            try {
+                Class<?> clazz = Class.forName(stack[i].getClassName());
+                String path = null;
+                try {
+                    path = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();
+                } catch (NullPointerException ex) {
+                    //silently ignoring and continuing with null path
+                }
+                if (path != null && path.contains("/tests.build/")) {
+                    if (!path.contains("/test-extensions/")) {
+                        break;
+                    }
+                } else {
+                    //running from ide 
+                    if (!stack[i].getClassName().startsWith("net.sourceforge.jnlp.")) {
+                        break;
+                    }
+                }
+            } catch (ClassNotFoundException ex) {
+                ///should not happen, searching  only for already loaded class
+                ex.printStackTrace();
             }
         }
@@ -760 +807 @@
         //so the target method is the highest form it and better to return it
         //rather then die to ArrayOutOfBounds
-        if(i >= stack.length){
+        if (i >= stack.length) {
             return result;
         }
-        //now we are out of net.sourceforge.jnlp.ServerAccess
+        //now we are out of test-extensions
         //method we need (the test)  is highest from following class
         baseClass = stack[i].getClassName();
@@ -783 +830 @@
 
     }
-    public static ProcessResult executeProcess(final List<String> args, File dir, ContentReaderListener stdoutl, ContentReaderListener stderrl,String[] vars) throws Exception {
-        ThreadedProcess t = new ThreadedProcess(args, dir,vars);
-        if (PROCESS_LOG) {
-            String connectionMesaage = createConnectionMessage(t);
-            log(connectionMesaage, true, true);
-        }
-        ProcessAssasin pa = new ProcessAssasin(t, PROCESS_TIMEOUT);
-        pa.start();
-        t.start();
-        while (t.getP() == null && t.deadlyException == null) {
-            Thread.sleep(100);
-        }
-        if (t.deadlyException != null) {
-            pa.setCanRun(false);
-            return new ProcessResult("", "", null, true, Integer.MIN_VALUE, t.deadlyException);
-        }
-        ContentReader crs = new ContentReader(t.getP().getInputStream(),stdoutl);
-        ContentReader cre = new ContentReader(t.getP().getErrorStream(),stderrl);
-
-        OutputStream out = t.getP().getOutputStream();
-        if (out != null) {
-            out.close();
-        }
-
-        new Thread(crs).start();
-        new Thread(cre).start();
-        while (t.isRunning()) {
-            Thread.sleep(100);
-        }
-
-        while (!t.isDestoyed()) {
-            Thread.sleep(100);
-        }
-        pa.setCanRun(false);
-        // ServerAccess.logOutputReprint(t.getP().exitValue()); when process is killed, this throws exception
-
-        ProcessResult pr=new ProcessResult(crs.getContent(), cre.getContent(), t.getP(), pa.wasTerminated(), t.getExitCode(), null);
-        if (PROCESS_LOG) {
-            log(pr.stdout, true, false);
-            log(pr.stderr, false, true);
-        }
-        return pr;
-    }
-
-    /**
-     * 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);
-        }
-    }
-    }
+    public static ProcessResult executeProcess(final List<String> args, File dir, ContentReaderListener stdoutl, ContentReaderListener stderrl, String[] vars) throws Exception {
+        return new ProcessWrapper(args, dir, stdoutl, stderrl, vars).execute();
+    }
+
+}

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java

@@ -57 +57 @@
     private final Integer port;
     private final File dir;
+    private ServerSocket serverSocket;
+    private boolean supportingHeadRequest = true;
 
+    public void setSupportingHeadRequest(boolean supportsHead) {
+        this.supportingHeadRequest = supportsHead;
+    }
+
+    public boolean isSupportingHeadRequest() {
+        return supportingHeadRequest;
+    }
+
+    
+    
     public String getServerName() {
         return serverName;
@@ -100 +112 @@
         running = true;
         try {
-            ServerSocket s = new ServerSocket(port);
+            serverSocket = new ServerSocket(port);
             while (running) {
-                new TinyHttpdImpl(s.accept(), dir, port);
+                TinyHttpdImpl server = new TinyHttpdImpl(serverSocket.accept(), dir, false);
+                server.setSupportingHeadRequest(isSupportingHeadRequest());
+                server.start();
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            ServerAccess.logException(e);
         } finally {
             running = false;
@@ -112 +126 @@
 
     public URL getUrl(String resource) throws MalformedURLException {
+        if (resource == null) {
+            resource = "";
+        }
+        if (resource.trim().length() > 0 && !resource.startsWith("/")) {
+            resource = "/" + resource;
+        }
         return new URL("http", getServerName(), getPort(), resource);
     }
@@ -118 +138 @@
         return getUrl("");
     }
+
+    public void stop() {
+        this.running = false;
+        if (serverSocket != null) {
+            try {
+                serverSocket.close();
+            } catch (Exception ex) {
+                ServerAccess.logException(ex);
+            }
+        }
+    }
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/ThreadedProcess.java

@@ -46 +46 @@
  * Process builder caused some unexpected and weird behavior :/
  */
-class ThreadedProcess extends Thread {
+public class ThreadedProcess extends Thread {
 
     Process p = null;
@@ -60 +60 @@
      */
     private boolean destoyed = false;
+    private ProcessAssasin assasin;
 
     public boolean isDestoyed() {
@@ -118 +119 @@
         } catch (Exception ex) {
             ex.printStackTrace();
-        } finally {
-            return commandLine;
         }
+        return commandLine;
     }
 
@@ -144 +144 @@
                 exitCode = p.waitFor();
                 Thread.sleep(500); //this is giving to fast done proecesses's e/o readers time to read all. I would like to know better solution :-/
+                while(assasin.isKilling() && !assasin.haveKilled()){
+                    Thread.sleep(100);
+                };
             } finally {
                 destoyed = true;
@@ -164 +167 @@
         }
     }
+
+    void setAssasin(ProcessAssasin pa) {
+        this.assasin=pa;
+    }
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java

@@ -43 +43 @@
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
 import java.net.Socket;
 import java.net.SocketException;
@@ -56 +58 @@
  * is returned, but its delivery is delayed
  */
-class TinyHttpdImpl extends Thread {
-
-    Socket c;
-    private final File dir;
-    private final int port;
+public class TinyHttpdImpl extends Thread {
+
+    private static final String CRLF = "\r\n";
+    private static final String HTTP_NOT_IMPLEMENTED = "HTTP/1.0 " + HttpURLConnection.HTTP_NOT_IMPLEMENTED + " Not Implemented" + CRLF;
+    private static final String HTTP_NOT_FOUND = "HTTP/1.0 " + HttpURLConnection.HTTP_NOT_FOUND + " Not Found" + CRLF;
+    private static final String HTTP_OK = "HTTP/1.0 " + HttpURLConnection.HTTP_OK + " OK" + CRLF;
+    private static final String XSX = "/XslowX";
+
+    private Socket socket;
+    private final File testDir;
     private boolean canRun = true;
-    private static final String XSX = "/XslowX";
-
-    public TinyHttpdImpl(Socket s, File f, int port) {
-        c = s;
-        this.dir = f;
-        this.port = port;
-        start();
+    private boolean supportingHeadRequest = true;
+
+    public TinyHttpdImpl(Socket socket, File dir) {
+        this(socket, dir, true);
+    }
+
+    public TinyHttpdImpl(Socket socket, File dir, boolean start) {
+        this.socket = socket;
+        this.testDir = dir;
+        if (start) {
+            start();
+        }
     }
 
@@ -75 +87 @@
     }
 
+    public void setSupportingHeadRequest(boolean supportsHead) {
+        this.supportingHeadRequest = supportsHead;
+    }
+
+    public boolean isSupportingHeadRequest() {
+        return this.supportingHeadRequest;
+    }
+
     public int getPort() {
-        return port;
+        return this.socket.getPort();
     }
 
@@ -82 +102 @@
     public void run() {
         try {
-            BufferedReader i = new BufferedReader(new InputStreamReader(c.getInputStream()));
-            DataOutputStream o = new DataOutputStream(c.getOutputStream());
+            BufferedReader reader = new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
+            DataOutputStream writer = new DataOutputStream(this.socket.getOutputStream());
             try {
                 while (canRun) {
-                    String s = i.readLine();
-                    if (s.length() < 1) {
+                    String line = reader.readLine();
+                    if (line.length() < 1) {
                         break;
                     }
-                    if (s.startsWith("GET")) {
-                        StringTokenizer t = new StringTokenizer(s, " ");
-                        t.nextToken();
-                        String op = t.nextToken();
-                        String p = op;
-                        if (p.startsWith(XSX)) {
-                            p = p.replace(XSX, "/");
-                        }
-                        ServerAccess.logNoReprint("Getting: " + p);
-                        p = URLDecoder.decode(p, "UTF-8");
-                        ServerAccess.logNoReprint("Serving: " + p);
-                        p = (".".concat((p.endsWith("/")) ? p.concat("index.html") : p)).replace('/', File.separatorChar);
-                        File pp = new File(dir, p);
-                        int l = (int) pp.length();
-                        byte[] b = new byte[l];
-                        FileInputStream f = new FileInputStream(pp);
-                        f.read(b);
-                        String content = "";
-                        String ct = "Content-Type: ";
-                        if (p.toLowerCase().endsWith(".jnlp")) {
-                            content = ct + "application/x-java-jnlp-file\n";
-                        } else if (p.toLowerCase().endsWith(".html")) {
-                            content = ct + "text/html\n";
-                        } else if (p.toLowerCase().endsWith(".jar")) {
-                            content = ct + "application/x-jar\n";
-                        }
-                        o.writeBytes("HTTP/1.0 200 OK\nConten" + "t-Length:" + l + "\n" + content + "\n");
-                        if (op.startsWith(XSX)) {
-                            byte[][] bb = splitArray(b, 10);
+
+                    StringTokenizer t = new StringTokenizer(line, " ");
+                    String request = t.nextToken();
+
+                    boolean isHeadRequest = request.equals("HEAD");
+                    boolean isGetRequest = request.equals("GET");
+
+                    if (isHeadRequest && !isSupportingHeadRequest()) {
+                        ServerAccess.logOutputReprint("Received HEAD request but not supported");
+                        writer.writeBytes(HTTP_NOT_IMPLEMENTED);
+                        continue;
+                    }
+
+                    if (!isHeadRequest && !isGetRequest) {
+                        ServerAccess.logOutputReprint("Received unknown request type " + request);
+                        continue;
+                    }
+
+                    String filePath = t.nextToken();
+                    boolean slowSend = filePath.startsWith(XSX);
+
+                    if (slowSend) {
+                        filePath = filePath.replace(XSX, "/");
+                    }
+
+                    ServerAccess.logOutputReprint("Getting- " + request + ": " + filePath);
+                    filePath = urlToFilePath(filePath);
+
+                    File resource = new File(this.testDir, filePath);
+
+                    if (!(resource.isFile() && resource.canRead())) {
+                        ServerAccess.logOutputReprint("Could not open file " + filePath);
+                        writer.writeBytes(HTTP_NOT_FOUND);
+                        continue;
+                    }
+                    ServerAccess.logOutputReprint("Serving- " + request + ": " + filePath);
+
+                    int resourceLength = (int) resource.length();
+                    byte[] buff = new byte[resourceLength];
+                    FileInputStream fis = new FileInputStream(resource);
+                    fis.read(buff);
+                    fis.close();
+
+                    String contentType = "Content-Type: ";
+                    if (filePath.toLowerCase().endsWith(".jnlp")) {
+                        contentType += "application/x-java-jnlp-file";
+                    } else if (filePath.toLowerCase().endsWith(".jar")) {
+                        contentType += "application/x-jar";
+                    } else {
+                        contentType += "text/html";
+                    }
+                    writer.writeBytes(HTTP_OK + "Content-Length:" + resourceLength + CRLF + contentType + CRLF + CRLF);
+
+                    if (isGetRequest) {
+                        if (slowSend) {
+                            byte[][] bb = splitArray(buff, 10);
                             for (int j = 0; j < bb.length; j++) {
                                 Thread.sleep(2000);
                                 byte[] bs = bb[j];
-                                o.write(bs, 0, bs.length);
+                                writer.write(bs, 0, bs.length);
                             }
                         } else {
-                            o.write(b, 0, l);
+                            writer.write(buff, 0, resourceLength);
                         }
                     }
@@ -132 +179 @@
                 ServerAccess.logException(e, false);
             } catch (Exception e) {
-                o.writeBytes("HTTP/1.0 404 ERROR\n\n\n");
+                writer.writeBytes(HTTP_NOT_FOUND);
                 ServerAccess.logException(e, false);
+            } finally {
+                reader.close();
+                writer.close();
             }
-            o.close();
         } catch (Exception e) {
             ServerAccess.logException(e, false);
@@ -172 +221 @@
         return array;
     }
+
+    /**
+    * This function transforms a request URL into a path to a file which the server
+    * will return to the requester.
+    * @param url - the request URL
+    * @return a String representation of the local path to the file
+    * @throws UnsupportedEncodingException
+    */
+    public static String urlToFilePath(String url) throws UnsupportedEncodingException {
+        url = URLDecoder.decode(url, "UTF-8"); // Decode URL encoded charaters, eg "%3B" becomes ';'
+        if (url.startsWith(XSX)) {
+            url = url.replace(XSX, "/");
+        }
+        url = url.replaceAll("\\?.*", ""); // Remove query string from URL
+        url = ".".concat(url); // Change path into relative path
+        if (url.endsWith("/")) {
+            url += "index.html";
+        }
+        url = url.replace('/', File.separatorChar); // If running on Windows, replace '/' in path with "\\"
+        url = stripHttpPathParams(url);
+        return url;
+    }
+
+    /**
+     * This function removes the HTTP Path Parameter from a given JAR URL, assuming that the
+     * path param delimiter is a semicolon
+     * @param url - the URL from which to remove the path parameter
+     * @return the URL with the path parameter removed
+     */
+    public static String stripHttpPathParams(String url) {
+        if (url == null) {
+            return null;
+        }
+
+        // If JNLP specifies JAR URL with .JAR extension (as it should), then look for any semicolons
+        // after this position. If one is found, remove it and any following characters.
+        int fileExtension = url.toUpperCase().lastIndexOf(".JAR");
+        if (fileExtension != -1) {
+            int firstSemiColon = url.indexOf(';', fileExtension);
+            if (firstSemiColon != -1) {
+                url = url.substring(0, firstSemiColon);
+            }
+        }
+        return url;
+    }
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/annotations/KnownToFail.java

@@ -42 +42 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import net.sourceforge.jnlp.browsertesting.Browsers;
 
 /**
@@ -53 +54 @@
  * implemented.
  * </p>
+ * <p>
+ * The meaning of optional parameter failsIn is either a list of 
+ * browsers where the test fails, or a default value - an empty array {},
+ * default value means that the test fails always.
+ * </p>
  */
 
@@ -58 +64 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface KnownToFail {
-    
+    public Browsers[] failsIn() default {}; 
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/browsertesting/Browser.java

@@ -43 +43 @@
  * interface which represents individual browsers
  */
-public interface Browser {
+public interface Browser extends ReactingProcess{
     public String getDefaultBin();
     public String getDefaultPluginExpectedLocation();
@@ -53 +53 @@
     public List<String> getDefaultSwitches();
 
-
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java

@@ -35 +35 @@
 exception statement from your version.
  */
-
 package net.sourceforge.jnlp.browsertesting.browsers;
 
+import java.util.Arrays;
+import java.util.List;
 import net.sourceforge.jnlp.browsertesting.Browsers;
 
 public class Epiphany extends MozillaFamilyLinuxBrowser {
+
+    
+    String[] cs = {};
 
     public Epiphany(String bin) {
@@ -47 +51 @@
 
     @Override
+    public List<String> getComaptibilitySwitches() {
+        return Arrays.asList(cs);
+    }
+
+    @Override
     public Browsers getID() {
         return Browsers.epiphany;
     }
-
-
-    
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Firefox.java

@@ -35 +35 @@
 exception statement from your version.
  */
-
 package net.sourceforge.jnlp.browsertesting.browsers;
 
 import java.util.Arrays;
 import java.util.List;
+import net.sourceforge.jnlp.ProcessAssasin;
+import net.sourceforge.jnlp.ServerAccess;
 import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.browsertesting.browsers.firefox.FirefoxProfilesOperator;
 
 public class Firefox extends MozillaFamilyLinuxBrowser {
+
+    private static final FirefoxProfilesOperator firefoxProfilesOperatorSingleton = new FirefoxProfilesOperator();
 
     public Firefox(String bin) {
         super(bin);
     }
-
-    String[] cs={"-new-tab"};
+    String[] cs = {"-new-tab"};
 
     @Override
@@ -60 +63 @@
     }
 
+    @Override
+    public void beforeProcess(String s) {
+        try {
+            firefoxProfilesOperatorSingleton.backupProfiles(); //assuming firefox is not in  safemode already
+        } catch (Exception ex) {
+            throw new RuntimeException("Firefox profile backup failed", ex);
+        }
+    }
 
+    @Override
+    public void afterProcess(String s) {
+    }
 
+    @Override
+    public void beforeKill(String s) {
+        try {
+            ProcessAssasin.closeWindows(s);
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
 
-    
+    @Override
+    public void afterKill(String s) {
+        try {
+            firefoxProfilesOperatorSingleton.restoreProfiles();
+        } catch (Exception ex) {
+            throw new RuntimeException("Firefox profile restoration failed", ex);
+        }
+
+    }
 }

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/LinuxBrowser.java

@@ -93 +93 @@
     }
 
+    @Override
+    public void beforeProcess(String s) {
+        
+    }
+
+    @Override
+    public void afterProcess(String s) {
+       
+    }
+
+    @Override
+    public void beforeKill(String s) {
+
+    }
+
+    @Override
+    public void afterKill(String s) {
+       
+    }
 
     

trunk/icedtea-web/tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Midory.java

@@ -51 +51 @@
     }
 
-
+     
     
 }