Tested and used @TestInBrowser

7 files changed, 129 insertions, 24 deletions

diff --git a/tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java b/tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java
index 8b1d893..ec14cfa 100644
--- a/tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java
+++ b/tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java
@@ -35,17 +35,17 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.
  */
 
-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;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-public class AppletBaseURLTest {
-
-    private static ServerAccess server = new ServerAccess();
+public class AppletBaseURLTest extends BrowserTest{
 
     private void evaluateApplet(ProcessResult pr, String baseName) {
         String s8 = "(?s).*Codebase is http://localhost:[0-9]{5}/ for this applet(?s).*";
@@ -68,6 +68,7 @@ public class AppletBaseURLTest {
     @Bug(id="PR855")
     @NeedsDisplay
     @Test
+    @TestInBrowsers(testIn={Browsers.one})
     public void AppletInFirefoxTest() throws Exception {
         ProcessResult pr = server.executeBrowser("/AppletBaseURLTest.html");
         pr.process.destroy();
@@ -78,6 +79,7 @@ public class AppletBaseURLTest {
     @Bug(id="PR855")
     @NeedsDisplay
     @Test
+    @TestInBrowsers(testIn={Browsers.one})
     public void AppletWithJNLPHrefTest() throws Exception {
         ProcessResult pr = server.executeBrowser("/AppletJNLPHrefBaseURLTest.html");
         pr.process.destroy();
diff --git a/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java b/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java
index fef0e4a..11b0bb0 100644
--- a/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java
+++ b/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java
@@ -36,16 +36,16 @@ exception statement from your version.
  */
 
 import net.sourceforge.jnlp.ServerAccess;
-import net.sourceforge.jnlp.ServerAccess.ProcessResult;
-import net.sourceforge.jnlp.LaunchException;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
 import org.junit.Assert;
 
 import org.junit.Test;
 
-public class AppletReadsInvalidJarTests {
-
-    private static ServerAccess server = new ServerAccess();
+public class AppletReadsInvalidJarTests extends BrowserTest{
 
+  
     static final String CORRECT_EXECUTION = "Program Executed Correctly.";
     static final String JNLP_EXPECTED_EXCEPTION = "ZipException";
 
@@ -60,6 +60,7 @@ public class AppletReadsInvalidJarTests {
 
     /*This SHOULD execute the applet!*/
     @Test
+    @TestInBrowsers(testIn={Browsers.one})
     public void AppletInFirefoxTest() throws Exception {
         ServerAccess.ProcessResult pr = server.executeBrowser("/AppletReadsInvalidJar.html");
 
diff --git a/tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java b/tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java
index 05b1661..206f6de 100644
--- a/tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java
+++ b/tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java
@@ -37,13 +37,14 @@ exception statement from your version.
 
 import net.sourceforge.jnlp.ServerAccess;
 import net.sourceforge.jnlp.ServerAccess.ProcessResult;
+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.Test;
 
-public class AppletTakesLastParamTests {
-
-    private static ServerAccess server = new ServerAccess();
+public class AppletTakesLastParamTests extends BrowserTest {
 
     @Test
     public void AppletTest() throws Exception {
@@ -59,6 +60,7 @@ public class AppletTakesLastParamTests {
     }
 
     @Test
+    @TestInBrowsers(testIn = {Browsers.one})
     public void AppletInFirefoxTest() throws Exception {
         ServerAccess.ProcessResult pr = server.executeBrowser("/appletTakesLastParam.html");
         evaluateApplet(pr);
diff --git a/tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests2.html b/tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests2.html
new file mode 100644
index 0000000..a5c370c
--- /dev/null
+++ b/tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests2.html
@@ -0,0 +1,44 @@
+<!--
+
+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; either version 2, or (at your option)
+any later version.
+
+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.
+
+ -->
+<html><head></head><body bgcolor="blue">
+<p><applet code="AppletTest.class" archive="AppletTest.jar" codebase="." width="800" height="600">
+  <param name="key1" value="value1">
+  <param name="key2" value="#value2">
+</applet></p>
+</body>
+</html>
diff --git a/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java b/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java
index d93d6f4..9fd662d 100644
--- a/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java
+++ b/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java
@@ -37,15 +37,48 @@ exception statement from your version.
 
 import net.sourceforge.jnlp.ServerAccess;
 import net.sourceforge.jnlp.ServerAccess.ProcessResult;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.annotations.Bug;
+import net.sourceforge.jnlp.annotations.NeedsDisplay;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
 import org.junit.Assert;
 
 import org.junit.Test;
 
-public class AppletTestTests {
+public class AppletTestTests extends BrowserTest {
 
-    private static ServerAccess server = new ServerAccess();
+    @Test
+    @TestInBrowsers(testIn = {Browsers.googleChrome})
+    @NeedsDisplay
+    public void doubleChrome() throws Exception {
+        server.PROCESS_TIMEOUT = 30 * 1000;
+        try {
+            //System.out.println("connecting AppletInFirefoxTest request in " + getBrowser().toString());
+            //just verify loging is recording browser
+            ServerAccess.ProcessResult pr1 = server.executeBrowser("/appletAutoTests.html");
+            if (pr1.process == null) {
+                Assert.assertTrue("If proces was null here, then google-chrome had to not exist, and so "
+                        + ServerAccess.UNSET_BROWSER
+                        + " should be in exception, but exception was "
+                        + pr1.deadlyException.getMessage(),
+                        pr1.deadlyException.getMessage().contains(ServerAccess.UNSET_BROWSER));
+                return;
+            }
+            evaluateApplet(pr1);
+            Assert.assertTrue(pr1.wasTerminated);
+            //System.out.println("connecting AppletInFirefoxTest request in " + getBrowser().toString());
+            // just verify loging is recording browser
+            ServerAccess.ProcessResult pr = server.executeBrowser("/appletAutoTests.html");
+            evaluateApplet(pr);
+            Assert.assertTrue(pr.wasTerminated);
+        } finally {
+            server.PROCESS_TIMEOUT = 20 * 1000; //back to normal
+        }
+    }
 
     @Test
+    @NeedsDisplay
     public void AppletTest() throws Exception {
         ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/AppletTest.jnlp");
         evaluateApplet(pr);
@@ -73,8 +106,28 @@ public class AppletTestTests {
     }
 
     @Test
-    public void AppletInFirefoxTest() throws Exception {
-        server.PROCESS_TIMEOUT = 30 * 1000;
+    @TestInBrowsers(testIn = {Browsers.all})
+    @NeedsDisplay
+    public void AppletInBrowserTest() throws Exception {
+        //System.out.println("connecting AppletInFirefoxTest request in " + getBrowser().toString());
+        //just verify loging is recordingb rowser
+        ServerAccess.PROCESS_TIMEOUT = 30 * 1000;
+        try {
+            ServerAccess.ProcessResult pr = server.executeBrowser("/appletAutoTests2.html");
+            evaluateApplet(pr);
+            Assert.assertTrue(pr.wasTerminated);
+            //Assert.assertEquals((Integer) 0, pr.returnValue); due to destroy is null
+        } finally {
+            ServerAccess.PROCESS_TIMEOUT = 20 * 1000; //back to normal
+        }
+    }
+
+    @TestInBrowsers(testIn = {Browsers.all})
+    @NeedsDisplay
+    public void AppletInBrowserTestXslowX() throws Exception {
+        //System.out.println("connecting AppletInFirefoxTest request in " + getBrowser().toString());
+        //just verify loging is recording browser
+        ServerAccess.PROCESS_TIMEOUT = 30 * 1000;
         try {
             ServerAccess.ProcessResult pr = server.executeBrowser("/appletAutoTests.html");
             pr.process.destroy();
@@ -82,7 +135,7 @@ public class AppletTestTests {
             Assert.assertTrue(pr.wasTerminated);
             //Assert.assertEquals((Integer) 0, pr.returnValue); due to destroy is null
         } finally {
-            server.PROCESS_TIMEOUT = 20 * 1000; //back to normal
+            ServerAccess.PROCESS_TIMEOUT = 20 * 1000; //back to normal
         }
     }
 }
diff --git a/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java b/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java
index 7257984..a36e394 100644
--- a/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java
+++ b/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java
@@ -35,18 +35,18 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.
  */
 
-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;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 @Bug(id="http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-February/017153.html")
-public class CheckServicesTests {
-
-    private static ServerAccess server = new ServerAccess();
+public class CheckServicesTests extends BrowserTest{
 
     public void evaluateApplet(ProcessResult pr) {
         String s0 = "Codebase for applet was found in constructor";
@@ -79,6 +79,7 @@ public class CheckServicesTests {
 
     @Test
     @NeedsDisplay
+    @TestInBrowsers(testIn={Browsers.one})
     public void CheckPluginJNLPHServices() throws Exception {
         ProcessResult pr = server.executeBrowser(null, "/CheckPluginServices.html");
         evaluateApplet(pr);
diff --git a/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java b/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
index 3741757..cb2a98f 100644
--- a/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
+++ b/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
@@ -40,14 +40,15 @@ import java.util.List;
 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.Test;
 
 @Bug(id={"http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016127.html","PR804","PR811"})
-public class SpacesCanBeEverywhereTests {
+public class SpacesCanBeEverywhereTests extends BrowserTest {
 
-    private static ServerAccess server = new ServerAccess();
 
     @Bug(id="PR811")
     @Test
@@ -104,6 +105,7 @@ public class SpacesCanBeEverywhereTests {
     @Bug(id="PR811")
     @Test
     @NeedsDisplay
+    @TestInBrowsers(testIn = {Browsers.all})
     public void SpacesCanBeEverywhereRemoteAppletTestsHtml2() throws Exception {
         ServerAccess.ProcessResult pr = server.executeBrowser("/spaces+applet+Tests.html");
         String s="Spaces can be everywhere.jsr was launched correctly";