/hg/icedtea-web: Added test for hanging firefox by LaunchExcepti...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Feb 13 05:23:01 PST 2013
changeset acf6ee5df468 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=acf6ee5df468
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Feb 13 14:21:47 2013 +0100
Added test for hanging firefox by LaunchException and Improved AddShutdownHookTest
diffstat:
ChangeLog | 16 +
tests/reproducers/simple/AddShutdownHook/resources/AddShutdownHook.html | 42 +++
tests/reproducers/simple/AddShutdownHook/resources/AddShutdownHook_wrong.html | 42 +++
tests/reproducers/simple/AddShutdownHook/srcs/AddShutdownHook.java | 79 +++--
tests/reproducers/simple/AddShutdownHook/testcases/AddShutdownHookTest.java | 100 +++++---
tests/reproducers/simple/AddShutdownHook/testcases/HangFirefoxTests.java | 124 ++++++++++
tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java | 6 +-
7 files changed, 335 insertions(+), 74 deletions(-)
diffs (481 lines):
diff -r 14f9bbbf5f6f -r acf6ee5df468 ChangeLog
--- a/ChangeLog Tue Feb 12 17:10:19 2013 +0100
+++ b/ChangeLog Wed Feb 13 14:21:47 2013 +0100
@@ -1,3 +1,19 @@
+2013-02-13 Jiri Vanek <jvanek at redhat.com>
+
+ Added test for hanging firefox by LaunchException and Improved AddShutdownHookTest
+ * tests/reproducers/simple/AddShutdownHook/resources/AddShutdownHook.html:
+ new file to launch applet with RuntimeException as result.
+ * tests/reproducers/simple/AddShutdownHook/resources/AddShutdownHook_wrong.html:
+ new file to launch applet with LaunchException as result.
+ * tests/reproducers/simple/AddShutdownHook/srcs/AddShutdownHook.java: is
+ now also applet.
+ * tests/reproducers/simple/AddShutdownHook/testcases/AddShutdownHookTest.java:
+ Added test (AddShutdownHookApplet)for applet, removed duplicate code by rules.
+ * tests/reproducers/simple/AddShutdownHook/testcases/HangFirefoxTests.java:
+ New test set which is launching exception throwing applet, and after exception
+ is thrown then it tries jsut stdou-ing applet. Second applet have to be
+ launched.
+
2013-02-12 Jana Fabrikova <jfabriko at redhat.com>
* /tests/reproducers/simple/JSToJFuncParam/testcases/JSToJFuncParamTest.java:
diff -r 14f9bbbf5f6f -r acf6ee5df468 tests/reproducers/simple/AddShutdownHook/resources/AddShutdownHook.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/AddShutdownHook/resources/AddShutdownHook.html Wed Feb 13 14:21:47 2013 +0100
@@ -0,0 +1,42 @@
+<!--
+
+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="AddShutdownHook.class" archive="AddShutdownHook.jar" codebase="." width="800" height="600">
+</applet></p>
+</body>
+</html>
\ No newline at end of file
diff -r 14f9bbbf5f6f -r acf6ee5df468 tests/reproducers/simple/AddShutdownHook/resources/AddShutdownHook_wrong.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/AddShutdownHook/resources/AddShutdownHook_wrong.html Wed Feb 13 14:21:47 2013 +0100
@@ -0,0 +1,42 @@
+<!--
+
+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="NotExistingMain.class" archive="NotExistingArchive.jar" codebase="." width="800" height="600">
+</applet></p>
+</body>
+</html>
\ No newline at end of file
diff -r 14f9bbbf5f6f -r acf6ee5df468 tests/reproducers/simple/AddShutdownHook/srcs/AddShutdownHook.java
--- a/tests/reproducers/simple/AddShutdownHook/srcs/AddShutdownHook.java Tue Feb 12 17:10:19 2013 +0100
+++ b/tests/reproducers/simple/AddShutdownHook/srcs/AddShutdownHook.java Wed Feb 13 14:21:47 2013 +0100
@@ -1,48 +1,57 @@
+
+import java.applet.Applet;
+
/* AddShutdownHook.java
-Copyright (C) 2011 Red Hat, Inc.
+ Copyright (C) 2011 Red Hat, Inc.
-This file is part of IcedTea.
+ 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 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.
+ 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.
+ 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.
+ 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.
+ 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.
*/
+public class AddShutdownHook extends Applet {
-public class AddShutdownHook {
public static void main(String[] args) {
- Runtime.getRuntime().addShutdownHook(new Thread() {
- public void run() {
- // no op
- }
- });
-
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ public void run() {
+ // no op
+ }
+ });
+
+ }
+
+ @Override
+ public void start() {
+ main(null);
+ System.err.println("WRONG - ShutdownHook was probably added");
}
}
diff -r 14f9bbbf5f6f -r acf6ee5df468 tests/reproducers/simple/AddShutdownHook/testcases/AddShutdownHookTest.java
--- a/tests/reproducers/simple/AddShutdownHook/testcases/AddShutdownHookTest.java Tue Feb 12 17:10:19 2013 +0100
+++ b/tests/reproducers/simple/AddShutdownHook/testcases/AddShutdownHookTest.java Wed Feb 13 14:21:47 2013 +0100
@@ -1,58 +1,82 @@
/* AddShutdownHookTest.java
-Copyright (C) 2011 Red Hat, Inc.
+ Copyright (C) 2011 Red Hat, Inc.
-This file is part of IcedTea.
+ 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 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.
+ 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.
+ 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.
+ 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.
+ 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.
*/
-import net.sourceforge.jnlp.ServerAccess;
+import net.sourceforge.jnlp.ClosingListener;
+import net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
+import net.sourceforge.jnlp.closinglisteners.StringMatchClosingListener;
import org.junit.Assert;
import org.junit.Test;
-public class AddShutdownHookTest {
+public class AddShutdownHookTest extends BrowserTest {
- private static ServerAccess server = new ServerAccess();
+ public static final String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "shutdownHooks" + ".*";
+ public static final String cnfString = "ClassNotFoundException";
+ public static final String confirmFailure = "WRONG - ShutdownHook was probably added";
+ public static final RulesFolowingClosingListener.MatchesRule mr = new RulesFolowingClosingListener.MatchesRule(s);
+ public static final RulesFolowingClosingListener.ContainsRule cnf = new RulesFolowingClosingListener.ContainsRule(cnfString);
+ public static final RulesFolowingClosingListener.ContainsRule cf = new RulesFolowingClosingListener.ContainsRule(confirmFailure);
+ public static final RulesFolowingClosingListener rfc = new RulesFolowingClosingListener(mr);
@Test
public void AddShutdownHookTestLunch1() throws Exception {
- ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/AddShutdownHook.jnlp");
- String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "shutdownHooks" + ".*";
- Assert.assertTrue("stderr should match "+s+" but didn't",pr.stderr.matches(s));
- String cc="ClassNotFoundException";
- Assert.assertFalse("stderr should NOT contains `"+cc+"`, but did",pr.stderr.contains(cc));
- Assert.assertFalse("stdout length should be <=2, but was "+pr.stdout.length(),pr.stdout.length()>2);
- Assert.assertFalse("AddShutdownHookTestLunch1 should not be terminated, but was",pr.wasTerminated);
+ ProcessResult pr = server.executeJavawsHeadless(null, "/AddShutdownHook.jnlp");
+ Assert.assertTrue("stderr " + mr.toPassingString(), mr.evaluate(pr.stderr));
+ Assert.assertFalse("stderr " + cnf.toFailingString(), cnf.evaluate(pr.stderr));
+ Assert.assertFalse("stdout length should be <=2, but was " + pr.stdout.length(), pr.stdout.length() > 2);
+ Assert.assertFalse("AddShutdownHookTestLunch1 should not be terminated, but was", pr.wasTerminated);
+ Assert.assertFalse("stderr " + cf.toFailingString(), cf.evaluate(pr.stderr));
Assert.assertEquals((Integer) 0, pr.returnValue);
}
+
+ @Test
+ @TestInBrowsers(testIn = Browsers.one)
+ public void AddShutdownHookApplet() throws Exception {
+ ProcessResult pr = server.executeBrowser("/AddShutdownHook.html", null, rfc);
+
+ if (server.getCurrentBrowsers() == Browsers.firefox) {
+ //lookslike only firefox is able to recieve this
+ Assert.assertTrue("stderr " + mr.toPassingString(), mr.evaluate(pr.stderr));
+ }
+ Assert.assertFalse("stderr " + cnf.toFailingString(), cnf.evaluate(pr.stderr));
+ Assert.assertFalse("stderr " + cf.toFailingString(), cf.evaluate(pr.stderr));
+ }
}
diff -r 14f9bbbf5f6f -r acf6ee5df468 tests/reproducers/simple/AddShutdownHook/testcases/HangFirefoxTests.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/AddShutdownHook/testcases/HangFirefoxTests.java Wed Feb 13 14:21:47 2013 +0100
@@ -0,0 +1,124 @@
+/* AddShutdownHookTest.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.
+ */
+
+import net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.closinglisteners.CountingClosingListener;
+import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
+import org.junit.Assert;
+
+import org.junit.Test;
+
+/**
+
+If this test has failed, you may try the following to reproduce the problem more consistently:
+
+- private static final int MAX_WORKERS = MAX_PARALLEL_INITS * 4;
+- private static final int PRIORITY_WORKERS = MAX_PARALLEL_INITS * 2;
++ private static final int MAX_WORKERS = MAX_PARALLEL_INITS * 2;
++ private static final int PRIORITY_WORKERS = MAX_PARALLEL_INITS * 1;
+
+in PluginMessageConsumer.java
+
+
+*/
+public class HangFirefoxTests extends BrowserTest {
+
+ String leString = "LaunchException";
+ ;
+ String startedString = "applet was started";
+ RulesFolowingClosingListener.ContainsRule leRule = new RulesFolowingClosingListener.ContainsRule(leString);
+ RulesFolowingClosingListener.ContainsRule appleStartedRule = new RulesFolowingClosingListener.ContainsRule(startedString);
+
+ @Test
+ @TestInBrowsers(testIn = Browsers.firefox)
+ public void HangFirefoxWithRuntimeExceptionTests() throws Exception {
+ ProcessResult pr = server.executeBrowser("/AddShutdownHook.html", new RulesFolowingClosingListener(appleStartedRule), new CountingClosingListener() {
+ private boolean launched = false;
+
+ @Override
+ protected boolean isAlowedToFinish(String content) {
+ if (AddShutdownHookTest.mr.evaluate(content) && !launched) {
+ launched = true;
+ try {
+ server.executeBrowser("/appletAutoTests2.html", null, (CountingClosingListener) null);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ return false;
+ }
+ });
+ Assert.assertTrue("stderr " + AddShutdownHookTest.mr.toPassingString(), AddShutdownHookTest.mr.evaluate(pr.stderr));
+ Assert.assertTrue("stdout " + appleStartedRule.toPassingString(), appleStartedRule.evaluate(pr.stdout));
+ Assert.assertFalse("stderr " + AddShutdownHookTest.cnf.toFailingString(), AddShutdownHookTest.cnf.evaluate(pr.stderr));
+ }
+
+ @Test
+ @TestInBrowsers(testIn = Browsers.firefox)
+ public void HangFirefoxWithLaunchException() throws Exception {
+ ProcessResult pr = server.executeBrowser("/AddShutdownHook_wrong.html", new RulesFolowingClosingListener(appleStartedRule), new CountingClosingListener() {
+ private boolean launched = false;
+
+ @Override
+ protected boolean isAlowedToFinish(String content) {
+ if (leRule.evaluate(content) && !launched) {
+ launched = true;
+ try {
+ server.executeBrowser("/appletAutoTests2.html", null, (CountingClosingListener) null);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ return false;
+ }
+ });
+ Assert.assertTrue("stderr " + leRule.toPassingString(), leRule.evaluate(pr.stderr));
+ Assert.assertTrue("stdout " + appleStartedRule.toPassingString(), appleStartedRule.evaluate(pr.stdout));
+ Assert.assertFalse("stderr " + AddShutdownHookTest.cnf.toFailingString(), AddShutdownHookTest.cnf.evaluate(pr.stderr));
+ }
+
+ @Test
+ @TestInBrowsers(testIn = Browsers.one)
+ public void TestAddShutdownHookWrong() throws Exception {
+ ProcessResult pr = server.executeBrowser("/AddShutdownHook_wrong.html", null, new RulesFolowingClosingListener(leRule));
+ Assert.assertTrue("stderr " + leRule.toPassingString(), leRule.evaluate(pr.stderr));
+ Assert.assertFalse("stderr " + AddShutdownHookTest.cnf.toFailingString(), AddShutdownHookTest.cnf.evaluate(pr.stderr));
+ }
+}
diff -r 14f9bbbf5f6f -r acf6ee5df468 tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java
--- a/tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java Tue Feb 12 17:10:19 2013 +0100
+++ b/tests/test-extensions/net/sourceforge/jnlp/browsertesting/browsers/Epiphany.java Wed Feb 13 14:21:47 2013 +0100
@@ -42,7 +42,11 @@
public class Epiphany extends MozillaFamilyLinuxBrowser {
- String[] cs = {"--new-tab"};
+ //the --sm-client-disable is hack which fixed separate calls to epiphany
+ //without this, the second tab is never open :(
+ //with this, also no tab, but at least new window in same process. So ok for testsuite.
+ //may fall to --new-tab with some fix on this issue again
+ String[] cs = {"--sm-client-disable"};
public Epiphany(String bin) {
super(bin);
More information about the distro-pkg-dev
mailing list