Removal of not removed file during recent refactoring

Also with changes originaly done in the "bad" one

3 files changed, 19 insertions, 393 deletions

diff --git a/Makefile.am b/Makefile.am
index 3e0208d..7997343 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1103,17 +1103,21 @@ clean_tests_reports:
 
 clean-netx-dist-tests: clean_tests_reports netx-dist-tests-remove-cert-from-public clean-custom-reproducers
 	rm -f netx-dist-tests-source-files.txt
+	rm -rf $(JNLP_TESTS_ENGINE_TESTS_DIR)
 	rm -rf $(JNLP_TESTS_DIR)
 	rm -rf $(JNLP_TESTS_SERVER_DEPLOYDIR)
 	rm -rf $(JNLP_TESTS_ENGINE_DIR)
 	rm -f stamps/junit-jnlp-dist-dirs
 	rm -f stamps/netx-dist-tests-compile.stamp
+	rm -f stamps/netx-dist-tests-tests-compile.stamp
 	rm -f stamps/netx-dist-tests-prepare-reproducers.stamp
 	rm -f stamps/netx-dist-tests-compile-testcases.stamp
 	rm -f stamps/netx-dist-tests-copy-resources.stamp
 	rm -f stamps/netx-dist-tests-sign-some-reproducers.stamp
 	rm -f stamps/change-dots-to-paths.stamp
 	rm -f junit-jnlp-dist-simple.txt
+	rm -f junit-jnlp-dist-custom.txt
+	rm -f netx-dist-tests-tests-source-files.txt
 	types=($(SIGNED_REPRODUCERS)) ; \
 	for which in "$${types[@]}" ; do \
 	  rm -f junit-jnlp-dist-$$which.txt ; \
diff --git a/tests/test-extensions-tests/net/sourceforge/jnlp/ResourcesTest.java b/tests/test-extensions-tests/net/sourceforge/jnlp/ResourcesTest.java
index 0116152..d0635cb 100644
--- a/tests/test-extensions-tests/net/sourceforge/jnlp/ResourcesTest.java
+++ b/tests/test-extensions-tests/net/sourceforge/jnlp/ResourcesTest.java
@@ -1,5 +1,5 @@
 /* ResourcesTest.java
-Copyright (C) 2011 Red Hat, Inc.
+Copyright (C) 2011-2012 Red Hat, Inc.
 
 This file is part of IcedTea.
 
@@ -40,7 +40,9 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import net.sourceforge.jnlp.browsertesting.Browser;
@@ -62,7 +64,7 @@ public class ResourcesTest extends  BrowserTest{
     @NeedsDisplay
     public void testNonExisitngBrowserWillNotDeadlock() throws Exception {
         server.setCurrentBrowser(Browsers.none);
-        ServerAccess.ProcessResult pr = server.executeBrowser("simpletest1.jnlp");
+        ServerAccess.ProcessResult pr = server.executeBrowser("not_existing_url.html");
         Assert.assertNull(pr.process);
         Assert.assertEquals(pr.stderr, "");
         Assert.assertEquals(pr.stdout, "");
@@ -85,9 +87,16 @@ public class ResourcesTest extends  BrowserTest{
     }
 
     @Test
+    public void testGetUrlUponThisInstance() throws MalformedURLException{
+        URL u1=server.getUrlUponThisInstance("simple.jsp");
+        URL u2=server.getUrlUponThisInstance("/simple.jsp");
+        Assert.assertEquals(u1, u2);
+    }
+
+    @Test
     @TestInBrowsers(testIn=Browsers.none)
     public void testNonExisitngBrowserWillNotCauseMess() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("simpletest1.jnlp");
+        ServerAccess.ProcessResult pr = server.executeBrowser("not_existing_url.html");
         Assert.assertNull(pr.process);
         Assert.assertEquals(pr.stderr, "");
         Assert.assertEquals(pr.stdout, "");
@@ -289,7 +298,7 @@ public class ResourcesTest extends  BrowserTest{
                 e2.append(s).append("\n");
             }
         };
-       ServerAccess.ProcessResult pr=server.executeBrowser("simpletest1.jnlp",le,lo);
+       ServerAccess.ProcessResult pr=server.executeBrowser("not_existing_url.html",le,lo);
         server.setCurrentBrowser(BrowserFactory.getFactory().getFirst().getID());
         Assert.assertNotNull(server.getCurrentBrowsers());
         Assert.assertNotNull(server.getCurrentBrowser());
@@ -310,6 +319,8 @@ public class ResourcesTest extends  BrowserTest{
         Assert.assertEquals(bf.getBrowser(Browsers.googleChrome).getID(), Browsers.googleChrome);
         Assert.assertEquals(bf.getBrowser(Browsers.firefox).getID(), Browsers.firefox);
         Assert.assertEquals(bf.getBrowser(Browsers.opera).getID(), Browsers.opera);
+        Assert.assertEquals(bf.getBrowser(Browsers.epiphany).getID(), Browsers.epiphany);
+        Assert.assertEquals(bf.getBrowser(Browsers.midori).getID(), Browsers.midori);
     }
 
     private void testBrowser(Browser browser) throws IOException {
diff --git a/tests/test-extensions/net/sourceforge/jnlp/ResourcesTest.java b/tests/test-extensions/net/sourceforge/jnlp/ResourcesTest.java
deleted file mode 100644
index 097ac4f..0000000
--- a/tests/test-extensions/net/sourceforge/jnlp/ResourcesTest.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/* ResourcesTestl.java
-Copyright (C) 2011 Red Hat, Inc.
-
-This file is part of IcedTea.
-
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
-
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version.
- */
-package net.sourceforge.jnlp;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import net.sourceforge.jnlp.browsertesting.Browser;
-import net.sourceforge.jnlp.browsertesting.BrowserFactory;
-import net.sourceforge.jnlp.browsertesting.BrowserTest;
-import net.sourceforge.jnlp.browsertesting.Browsers;
-import net.sourceforge.jnlp.annotations.NeedsDisplay;
-import net.sourceforge.jnlp.browsertesting.browsers.LinuxBrowser;
-import net.sourceforge.jnlp.annotations.TestInBrowsers;
-import org.junit.Assert;
-
-import org.junit.Test;
-
-public class ResourcesTest extends  BrowserTest{
-
-
-    @Test
-    @NeedsDisplay
-    public void testNonExisitngBrowserWillNotDeadlock() throws Exception {
-        server.setCurrentBrowser(Browsers.none);
-        ServerAccess.ProcessResult pr = server.executeBrowser("/simpletest1.jnlp");
-        Assert.assertNull(pr.process);
-        Assert.assertEquals(pr.stderr, "");
-        Assert.assertEquals(pr.stdout, "");
-        Assert.assertTrue(pr.wasTerminated);
-        Assert.assertTrue(pr.returnValue < 0);
-        junit.framework.Assert.assertNotNull(pr.deadlyException);
-    }
-
-    @Test
-    public void testUnexistingProcessWillFailRecognizedly() throws Exception {
-        server.setCurrentBrowser(Browsers.none);
-        List<String> al=Arrays.asList(new String[] {"definietly_not_Existing_process"});
-        ServerAccess.ProcessResult pr = server.executeProcess(al);
-        Assert.assertNull(pr.process);
-        Assert.assertEquals(pr.stderr, "");
-        Assert.assertEquals(pr.stdout, "");
-        Assert.assertTrue(pr.wasTerminated);
-        Assert.assertTrue(pr.returnValue < 0);
-        junit.framework.Assert.assertNotNull(pr.deadlyException);
-    }
-
-    @Test
-    public void testGetUrlUponThisInstance() throws MalformedURLException{
-        URL u1=server.getUrlUponThisInstance("simple.jsp");
-        URL u2=server.getUrlUponThisInstance("/simple.jsp");
-        Assert.assertEquals(u1, u2);
-    }
-
-    @Test
-    @TestInBrowsers(testIn=Browsers.none)
-    public void testNonExisitngBrowserWillNotCauseMess() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("/simpletest1.jnlp");
-        Assert.assertNull(pr.process);
-        Assert.assertEquals(pr.stderr, "");
-        Assert.assertEquals(pr.stdout, "");
-        Assert.assertTrue(pr.wasTerminated);
-        Assert.assertTrue(pr.returnValue < 0);
-        junit.framework.Assert.assertNotNull(pr.deadlyException);
-    }
-
-    @Test
-    public void testBrowsers2() throws Exception {
-        List<Browser> a = BrowserFactory.getFactory().getAllBrowsers();
-        Assert.assertNotNull("returned browsers array must not be null", a);
-        Assert.assertTrue("at least one browser must be configured", a.size() > 0);
-        for (Browser b : a) {
-            testBrowser(b);
-        }
-
-    }
-
-    @Test
-    @TestInBrowsers(testIn = Browsers.all)
-    public void testBrowser3() throws Exception {
-        testBrowser(server.getCurrentBrowser());
-
-
-    }
-
-    @Test
-    public void testBrowsers1() throws Exception {
-        BrowserFactory bf = new BrowserFactory(null);
-        int expected = 0;
-        Assert.assertTrue("Created from null there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        bf = new BrowserFactory("");
-        expected = 0;
-        Assert.assertTrue("Created from empty there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        String s = "dsgrdg";
-        bf = new BrowserFactory(s);
-        expected = 0;
-        Assert.assertTrue("Created from nonsense " + s + " there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = "sgrg/jkik";
-        bf = new BrowserFactory(s);
-        expected = 0;
-        Assert.assertTrue("Created from nonsense " + s + " there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = Browsers.firefox + "/jkik";
-        bf = new BrowserFactory(s);
-        expected = 0;
-        Assert.assertTrue("Created from nonsense " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = "sgrg/jkik:sege";
-        bf = new BrowserFactory(s);
-        expected = 0;
-        Assert.assertTrue("Created from  two nonsenses " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = Browsers.firefox.toExec() + ":" + Browsers.firefox;
-        bf = new BrowserFactory(s);
-        expected = 2;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = Browsers.firefox.toExec();
-        bf = new BrowserFactory(s);
-        expected = 1;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = "something/somewhere/" + Browsers.firefox.toExec();
-        bf = new BrowserFactory(s);
-        expected = 1;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = "something/somewhere/" + Browsers.firefox.toExec() + ":" + "something/somewhere/" + Browsers.opera.toExec();
-        bf = new BrowserFactory(s);
-        expected = 2;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = "something/somewhere/" + Browsers.firefox.toExec() + ":" + "something/somewhere/" + Browsers.opera.toExec() + ":" + Browsers.chromiumBrowser;
-        bf = new BrowserFactory(s);
-        expected = 3;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = Browsers.firefox.toExec() + ":" + "vfdgf" + ":" + Browsers.googleChrome.toExec();
-        bf = new BrowserFactory(s);
-        expected = 2;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = Browsers.firefox.toExec() + ":" + Browsers.chromiumBrowser + ":" + Browsers.googleChrome.toExec() + ":" + Browsers.opera + ":" + Browsers.epiphany + ":" + Browsers.midori;
-        bf = new BrowserFactory(s);
-        expected = 6;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-        testFullFactory(bf);
-
-        s = "fgfd/" + Browsers.firefox.toExec() + ":" + "/fgfd/" + Browsers.chromiumBrowser + ":" + "fgfd/dfsdf/" + Browsers.googleChrome.toExec() + ":" + "/g/fgfd/" + Browsers.opera + ":" + Browsers.epiphany + ":" + Browsers.midori;
-        bf = new BrowserFactory(s);
-        expected = 6;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-        testFullFactory(bf);
-
-        s = Browsers.firefox.toExec() + ":" + ":" + Browsers.googleChrome.toExec() + ":" + Browsers.opera;
-        bf = new BrowserFactory(s);
-        expected = 3;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = Browsers.firefox.toExec() + ":" + ":" + ":" + Browsers.opera;
-        bf = new BrowserFactory(s);
-        expected = 2;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = ":" + ":" + Browsers.googleChrome.toExec() + ":";
-        bf = new BrowserFactory(s);
-        expected = 1;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-        s = ":" + Browsers.firefox.toExec() + ":bfgbfg/fddf/" + Browsers.googleChrome.toExec() + ":";
-        bf = new BrowserFactory(s);
-        expected = 2;
-        Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-
-
-
-    }
-
-    @Test
-    public void testResourcesExists() throws Exception {
-        File[] simpleContent = server.getDir().listFiles(new FileFilter() {
-
-            public boolean accept(File file) {
-                if (!file.isDirectory()) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        });
-        Assert.assertNotNull(simpleContent);
-        Assert.assertTrue(simpleContent.length > 5);
-
-        for (int i = 0; i < simpleContent.length; i++) {
-            File file = simpleContent[i];
-            ServerAccess.logOutputReprint(file.getName());
-            //server port have in fact no usage in converting filename to uri-like-filename.
-            //But if there is null, instead if some number, then nullpointer exception is thrown (Integer->int).
-            //So I'm using "real" currently used port, instead of some random value.
-            URI u = new URI((String) null, (String) null, (String) null, server.getPort(), file.getName(), (String) null, null);
-            ServerAccess.logOutputReprint(" ("+u.toString()+")");
-            String fname = u.toString();
-            if (file.getName().toLowerCase().endsWith(".jnlp")) {
-                String c = server.getResourceAsString("/" + fname);
-                Assert.assertTrue(c.contains("<"));
-                Assert.assertTrue(c.contains(">"));
-                Assert.assertTrue(c.contains("jnlp"));
-                Assert.assertTrue(c.contains("resources"));
-                Assert.assertTrue(c.replaceAll("\\s*", "").contains("</jnlp>"));
-
-            } else {
-                byte[] c = server.getResourceAsBytes("/" + fname).toByteArray();
-                Assert.assertEquals(c.length, file.length());
-            }
-
-        }
-
-    }
-
-    @Test
-    @NeedsDisplay
-    @TestInBrowsers(testIn = Browsers.one)
-    public void testListeners() throws Exception {
-        final StringBuilder o1 = new StringBuilder();
-        final StringBuilder e1 = new StringBuilder();
-        final StringBuilder o2 = new StringBuilder();
-        final StringBuilder e2 = new StringBuilder();
-        final ContentReaderListener lo = new ContentReaderListener() {
-
-            @Override
-            public void charReaded(char ch) {
-                //ServerAccess.logOutputReprint("OO recieved char: "+ch);
-                o1.append(ch);
-            }
-
-            @Override
-            public void lineReaded(String s) {
-                //ServerAccess.logOutputReprint("OO recieved line: "+s);
-                o2.append(s).append("\n");
-            }
-        };
-        ContentReaderListener le = new ContentReaderListener() {
-
-            @Override
-            public void charReaded(char ch) {
-                //ServerAccess.logOutputReprint("EE recieved char: "+ch);
-                e1.append(ch);
-            }
-
-            @Override
-            public void lineReaded(String s) {
-                //ServerAccess.logOutputReprint("EE recieved line: "+s);
-                e2.append(s).append("\n");
-            }
-        };
-        ServerAccess.ProcessResult pr = server.executeBrowser("/simpletest1.jnlp", le, lo);
-        server.setCurrentBrowser(BrowserFactory.getFactory().getFirst().getID());
-        Assert.assertNotNull(server.getCurrentBrowsers());
-        Assert.assertNotNull(server.getCurrentBrowser());
-//        ServerAccess.logOutputReprint("total o");
-//        ServerAccess.logOutputReprint(pr.stdout);
-//        ServerAccess.logOutputReprint("total e");
-//        ServerAccess.logOutputReprint(pr.stderr);
-       Assert.assertEquals(pr.stdout, o1.toString());
-       Assert.assertEquals(pr.stderr, e1.toString());
-       //the last \n is mandatory as las tline is flushed also when proces dies
-       Assert.assertEquals(pr.stdout.replace("\n", ""), o2.toString().replace("\n", ""));
-       Assert.assertEquals(pr.stderr.replace("\n", ""), e2.toString().replace("\n", ""));
-
-    }
-
-    private void testFullFactory(BrowserFactory bf) {
-        Assert.assertEquals(bf.getBrowser(Browsers.chromiumBrowser).getID(), Browsers.chromiumBrowser);
-        Assert.assertEquals(bf.getBrowser(Browsers.googleChrome).getID(), Browsers.googleChrome);
-        Assert.assertEquals(bf.getBrowser(Browsers.firefox).getID(), Browsers.firefox);
-        Assert.assertEquals(bf.getBrowser(Browsers.opera).getID(), Browsers.opera);
-        Assert.assertEquals(bf.getBrowser(Browsers.epiphany).getID(), Browsers.epiphany);
-        Assert.assertEquals(bf.getBrowser(Browsers.midori).getID(), Browsers.midori);
-    }
-
-    private void testBrowser(Browser browser) throws IOException {
-        File f1 = null;
-        if (browser.getDefaultPluginExpectedLocation() != null) {
-            f1 = new File(browser.getDefaultPluginExpectedLocation());
-        }
-        File f2 = null;
-        if (browser.getUserDefaultPluginExpectedLocation() != null) {
-            f2 = new File(browser.getUserDefaultPluginExpectedLocation());
-        }
-        if (f1 != null) {
-            Assert.assertTrue("browser's plugins  location should exist " + f1.toString() + " for " + browser.getID().toString(), f1.exists());
-        }
-        if (f2 != null) {
-            Assert.assertTrue("browser's users-plugins  location should exist " + f2.toString() + " for " + browser.getID().toString(), f2.exists());
-        }
-
-        File[] ff1 = new File[0];
-        if (f1 != null) {
-            ff1 = f1.listFiles();
-        }
-
-        File[] ff2 = new File[0];
-        if (f2 != null) {
-            ff2 = f2.listFiles();
-        }
-
-        Assert.assertTrue("at least one of browser's plugins  directory should contains at least one file didn't. For " + browser.getID().toString(), ff1.length + ff2.length > 0);
-
-        ff1 = new File[0];
-        if (f1 != null) {
-            ff1 = f1.listFiles(new FileFilter() {
-
-                @Override
-                public boolean accept(File pathname) {
-                    return (pathname.getName().equals(LinuxBrowser.DEFAULT_PLUGIN_NAME));
-                }
-            });
-        }
-
-        ff2 = new File[0];
-        if (f2 != null) {
-            ff2 = f2.listFiles(new FileFilter() {
-
-                @Override
-                public boolean accept(File pathname) {
-                    return (pathname.getName().equals(LinuxBrowser.DEFAULT_PLUGIN_NAME));
-                }
-            });
-        }
-
-        Assert.assertTrue("browser's plugins  directories should contains exactly one  " + LinuxBrowser.DEFAULT_PLUGIN_NAME + ", but didnt for " + browser.getID().toString(),
-                ff1.length + ff2.length == 1);
-        String currentPath = server.getJavawsFile().getParentFile().getParentFile().getAbsolutePath();
-
-        File[] ff;
-        if (ff1.length == 1) {
-            ff = ff1;
-        } else {
-            ff = ff2;
-        }
-        String s = ServerAccess.getContentOfStream(new FileInputStream(ff[0]), "ASCII");
-        Assert.assertTrue("browser's plugins  shoud points to" + currentPath + ", but  didnt",
-                s.contains(s));
-    }
-}