/hg/icedtea-web: 4 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Tue Jun 19 06:40:04 PDT 2012
changeset 40f20377f8b6 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=40f20377f8b6
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 19 14:36:25 2012 +0200
testInBrowser annotation
changeset 6d1c22561492 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6d1c22561492
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 19 14:48:39 2012 +0200
added default swithces for firefox 13 and higher
changeset dadf220c1b35 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=dadf220c1b35
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 19 15:19:35 2012 +0200
Tested and used @TestInBrowser
changeset 8869ef29f987 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8869ef29f987
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Jun 19 15:40:28 2012 +0200
removed safe-mode firefox arg
diffstat:
ChangeLog | 93 +++
Makefile.am | 2 +-
acinclude.m4 | 29 +
configure.ac | 1 +
tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java | 7 +-
tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java | 7 +-
tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java | 10 +-
tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java | 11 +-
tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java | 8 +-
tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests2.html | 44 +
tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java | 65 ++-
tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java | 9 +-
tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java | 8 +-
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java | 271 +++++++++-
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java | 114 +++-
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/TestInBrowsers.java | 18 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/Browser.java | 19 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserFactory.java | 184 ++++++
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserTest.java | 23 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserTestRunner.java | 137 +++++
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/Browsers.java | 46 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Chrome.java | 15 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Chromium.java | 15 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java | 18 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Firefox.java | 29 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/LinuxBrowser.java | 60 ++
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Midory.java | 18 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/MozillaFamilyLinuxBrowser.java | 29 +
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Opera.java | 37 +
29 files changed, 1267 insertions(+), 60 deletions(-)
diffs (truncated from 1794 to 500 lines):
diff -r 79bd211c37be -r 8869ef29f987 ChangeLog
--- a/ChangeLog Tue Jun 19 12:15:07 2012 +0200
+++ b/ChangeLog Tue Jun 19 15:40:28 2012 +0200
@@ -1,3 +1,96 @@
+2012-06-19 Jiri Vanek <jvanek at redhat.com>
+
+ various test for browser engine
+ * tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests.html:
+ fixed missing parenthesis
+ * tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests2.html:
+ new test excluding XslowX for applets
+ * tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests:
+ (doubleChrome) test for ensuring that two chrome browsers launched
+ behind themselves will not cause errors as they were without
+ criticalFixes patch
+ (AppletInBrowserTest) and (AppletInBrowserTestXslowX) testing methods
+ for all browser
+ * tests/jnlp_tests/simple/AppletTest/testcases/AppletBaseURLTest:
+ * tests/jnlp_tests/simple/AppletTest/testcases/CheckServicesTests:
+ * tests/jnlp_tests/simple/AppletTest/testcases/AppletReadsInvalidJarTests:
+ Included @TestInBrowser instead of plain executeBrowser
+ * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: improved
+ to print sometimes something out
+ * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java:
+ (testDeadLockTestTerminatedBody) enhanced to ensure that not so much is
+ lost when process is terminated, but showing that something can be lost
+ (which is correct)
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:
+ (testNonExisitngBrowserWillNotDeadlock) testing taht when no browser is
+ set, then no deadlock happens as happen before criticalFixes's deadlyException
+ (testUnexistingProcessWillFailRecognizedly) is actually testing deadlyException
+ (testNonExisitngBrowserWillNotCauseMess) some but with annotation which
+ was also harming output of tool little bit without TestInBrowsersAnnotation fixed.
+ (testBrowsers2) is testing all browsers configuration without annotation
+ and (testBrowser3) do the same configuration tests annotation driven
+ (testBrowser) body of above two methods. Is testing whether used
+ browsers are correctly linked with latest build
+ (testBrowsers1) is testing parsing of -D variable
+ (testListeners) annotated that needs display
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java:
+ annotated with Bug annotation
+
+2012-06-19 Jiri Vanek <jvanek at redhat.com>
+
+ introduced possibility to run comfortably applets+html reproducers
+ * Makefile.am: used BROWSER_TESTS_MODIFICATION variable to pass global
+ switch from configure
+ * acinclude.m4: (IT_SET_GLOBAL_BROWSERTESTS_BHAVIOUR) new method
+ handling --with-browser-tests
+ * configure.ac: used IT_SET_GLOBAL_BROWSERTESTS_BHAVIOUR
+ switch and passing BROWSER_TESTS_MODIFICATION variable to Makefile.
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java:
+ (currentBrowser) variable holding injected browser for ServerAccess instance
+ (loggedBrowser) static variable keeping id of (currentBrowser) for static
+ logging purposes
+ (modifyMethodWithForBrowser) new function changing the name of method to
+ "method - browser" for logging purposes
+ (getBrowserLocation) - returning path to process to be launched when
+ browser requested
+ (getBrowserParams) - gathering set default's browser settings
+ (set/getCurrentBrowsers) - set browser by id/return id of set browser
+ (set/getCurrentBrowser) - set browser instance /returns instance of
+ current browser
+ (executeBrowser) family of methods now cooperate with above methods for
+ default set browser
+ (executeBrowser(Browser) family to work with implicit browser
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/annotations/TestInBrowsers.java:
+ annotation for determining which browser(s) to use with annotated method
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/Browser.java:
+ interface for dealing with various browsers
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserFactory.java:
+ singleton for mapping configured browsers x requested browser x browsers proxies
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserTest.java:
+ Forefather of all testcases which have methods to do tests iniside browser.
+ Is allowing correct annotation -> proxy trasnver to VirtualServer for
+ selected method and is requesting custom runner from junit framework
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/BrowserTestRunner.java:
+ custom test Ruuner which is responsible for translating annotation and
+ run the method mutlipletimes for each requested browser and to name it properly
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/Browsers.java:
+ enumeration of abstract browsers and theirs sets or subsets.
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/*:
+ individual browsers proxies and theirs abstractions,namely:
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Opera.java:
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Firefox.java:
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Chrome.java:
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Chromium.java:
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Midori.java:
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java:
+ proxies for browsers as name suggests
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/LinuxBrowser.java:
+ abstract forefather for all browsers implementing Browser interface. Is
+ setting /usr/bin as bin path, libjavaplugin.so as default plugin library name,
+ intorducing stubs for methods (eg 32/64 bit libs)
+ * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/browsertesting/browsers/MozillaFamilyLinuxBrowser:
+ forefather for all browsers except Opera. Is unifying .mozilla/plugins directories
+
2012-06-15 Jiri Vanek <jvanek at redhat.com>
* tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests.html:
diff -r 79bd211c37be -r 8869ef29f987 Makefile.am
--- a/Makefile.am Tue Jun 19 12:15:07 2012 +0200
+++ b/Makefile.am Tue Jun 19 15:40:28 2012 +0200
@@ -150,7 +150,7 @@
DTEST_SERVER=-Dtest.server.dir=$(JNLP_TESTS_SERVER_DEPLOYDIR)
DJAVAWS_BUILD=-Djavaws.build.bin=$(DESTDIR)$(bindir)/$(javaws)
DBROWSERS=-Dused.browsers=$(FIREFOX):$(CHROMIUM):$(CHROME):$(OPERA):$(MIDORI):$(EPIPHANY)
-REPRODUCERS_DPARAMETERS= $(DTEST_SERVER) $(DJAVAWS_BUILD) $(DBROWSERS)
+REPRODUCERS_DPARAMETERS= $(DTEST_SERVER) $(DJAVAWS_BUILD) $(DBROWSERS) $(BROWSER_TESTS_MODIFICATION)
# end of `D`shortcuts
# binary names
diff -r 79bd211c37be -r 8869ef29f987 acinclude.m4
--- a/acinclude.m4 Tue Jun 19 12:15:07 2012 +0200
+++ b/acinclude.m4 Tue Jun 19 15:40:28 2012 +0200
@@ -917,3 +917,32 @@
AC_MSG_RESULT([no])
fi
])
+
+AC_DEFUN_ONCE([IT_SET_GLOBAL_BROWSERTESTS_BEHAVIOUR],
+[
+ AC_MSG_CHECKING([how browser test will be run])
+ AC_ARG_WITH([browser-tests],
+ [AS_HELP_STRING([--with-browser-tests],
+ [yes - as defined (default), no - all browser tests will be skipped, one - all "mutiple browsers" test will behave as "one" test, all - all browser tests will be run for all set browsers])],
+ [
+ BROWSER_SWITCH=${withval}
+ ],
+ [
+ BROWSER_SWITCH="yes"
+ ])
+ D_PARAM_PART="-Dmodified.browsers.run"
+ case "$BROWSER_SWITCH" in
+ "yes" )
+ BROWSER_TESTS_MODIFICATION="" ;;
+ "no" )
+ BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=ignore" ;;
+ "one" )
+ BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=one" ;;
+ "all" )
+ BROWSER_TESTS_MODIFICATION="$D_PARAM_PART=all" ;;
+ *)
+ AC_MSG_ERROR([unknown valkue of with-browser-tests ($BROWSER_SWITCH), so not use (yes) or set yes|no|one|all])
+ esac
+ AC_MSG_RESULT(${BROWSER_SWITCH})
+ AC_SUBST(BROWSER_TESTS_MODIFICATION)
+])
diff -r 79bd211c37be -r 8869ef29f987 configure.ac
--- a/configure.ac Tue Jun 19 12:15:07 2012 +0200
+++ b/configure.ac Tue Jun 19 15:40:28 2012 +0200
@@ -96,6 +96,7 @@
IT_FIND_BROWSER([opera],[OPERA])
IT_FIND_BROWSER([midori],[MIDORI])
IT_FIND_BROWSER([epiphany],[EPIPHANY])
+IT_SET_GLOBAL_BROWSERTESTS_BEHAVIOUR
AM_CONDITIONAL([WITH_XSLTPROC], [test x"$XSLTPROC" != x ])
IT_FIND_OPTIONAL_JAR([rhino], RHINO,
diff -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java
--- a/tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java Tue Jun 19 12:15:07 2012 +0200
+++ b/tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java Tue Jun 19 15:40:28 2012 +0200
@@ -40,13 +40,15 @@
import java.util.List;
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 AppletTestSignedTests {
+public class AppletTestSignedTests extends BrowserTest {
- private static ServerAccess server = new ServerAccess();
private final List<String> l = Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall"}));
@Test
@@ -77,6 +79,7 @@
}
@Test
+ @TestInBrowsers(testIn = {Browsers.all})
public void AppletTestSignedFirefoxTest() throws Exception {
ServerAccess.PROCESS_TIMEOUT = 30 * 1000;
try {
diff -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java
--- a/tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java Tue Jun 19 12:15:07 2012 +0200
+++ b/tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java Tue Jun 19 15:40:28 2012 +0200
@@ -40,14 +40,16 @@
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 SpacesCanBeEverywhereTestsSigned {
+public class SpacesCanBeEverywhereTestsSigned extends BrowserTest {
- private static ServerAccess server = new ServerAccess();
@Bug(id="PR811")
@Test
@@ -104,6 +106,7 @@
@Bug(id="PR811")
@Test
@NeedsDisplay
+ @TestInBrowsers(testIn = {Browsers.one})
public void SpacesCanBeEverywhereRemoteAppletTestsHtml2Signed() throws Exception {
ServerAccess.ProcessResult pr = server.executeBrowser("/spaces+applet+Tests+signed.html");
String s="Signed spaces can be everywhere.jsr was launched correctly";
diff -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java
--- a/tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java Tue Jun 19 12:15:07 2012 +0200
+++ b/tests/jnlp_tests/simple/AppletBaseURLTest/testcases/AppletBaseURLTest.java Tue Jun 19 15:40:28 2012 +0200
@@ -35,17 +35,17 @@
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 @@
@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 @@
@Bug(id="PR855")
@NeedsDisplay
@Test
+ @TestInBrowsers(testIn={Browsers.one})
public void AppletWithJNLPHrefTest() throws Exception {
ProcessResult pr = server.executeBrowser("/AppletJNLPHrefBaseURLTest.html");
pr.process.destroy();
diff -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java
--- a/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java Tue Jun 19 12:15:07 2012 +0200
+++ b/tests/jnlp_tests/simple/AppletReadsInvalidJar/testcases/AppletReadsInvalidJarTests.java Tue Jun 19 15:40:28 2012 +0200
@@ -36,16 +36,16 @@
*/
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 {
+public class AppletReadsInvalidJarTests extends BrowserTest{
- private static ServerAccess server = new ServerAccess();
-
+
static final String CORRECT_EXECUTION = "Program Executed Correctly.";
static final String JNLP_EXPECTED_EXCEPTION = "ZipException";
@@ -60,6 +60,7 @@
/*This SHOULD execute the applet!*/
@Test
+ @TestInBrowsers(testIn={Browsers.one})
public void AppletInFirefoxTest() throws Exception {
ServerAccess.ProcessResult pr = server.executeBrowser("/AppletReadsInvalidJar.html");
diff -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java
--- a/tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java Tue Jun 19 12:15:07 2012 +0200
+++ b/tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java Tue Jun 19 15:40:28 2012 +0200
@@ -37,13 +37,14 @@
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 @@
}
@Test
+ @TestInBrowsers(testIn = {Browsers.one})
public void AppletInFirefoxTest() throws Exception {
ServerAccess.ProcessResult pr = server.executeBrowser("/appletTakesLastParam.html");
evaluateApplet(pr);
diff -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests2.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/AppletTest/resources/appletAutoTests2.html Tue Jun 19 15:40:28 2012 +0200
@@ -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 -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java
--- a/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java Tue Jun 19 12:15:07 2012 +0200
+++ b/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java Tue Jun 19 15:40:28 2012 +0200
@@ -37,15 +37,48 @@
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 {
-
- private static ServerAccess server = new ServerAccess();
+public class AppletTestTests extends BrowserTest {
@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 @@
}
@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 @@
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 -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java
--- a/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java Tue Jun 19 12:15:07 2012 +0200
+++ b/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java Tue Jun 19 15:40:28 2012 +0200
@@ -35,18 +35,18 @@
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 @@
@Test
@NeedsDisplay
+ @TestInBrowsers(testIn={Browsers.one})
public void CheckPluginJNLPHServices() throws Exception {
ProcessResult pr = server.executeBrowser(null, "/CheckPluginServices.html");
evaluateApplet(pr);
diff -r 79bd211c37be -r 8869ef29f987 tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
--- a/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java Tue Jun 19 12:15:07 2012 +0200
More information about the distro-pkg-dev
mailing list