/hg/icedtea-web: JNLPClassLoaderDeadlock reproducer made more re...

[aazores at icedtea.classpath.org]

changeset 72f45c87b008 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=72f45c87b008
author: Andrew Azores <aazores at redhat.com>
date: Wed Nov 27 16:37:38 2013 -0500

	JNLPClassLoaderDeadlock reproducer made more reliable


diffstat:

 ChangeLog                                                                                   |  10 ++++++++++
 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java        |   1 -
 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java        |   1 -
 tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java |   7 +++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r d5bcc8f80d90 -r 72f45c87b008 ChangeLog
--- a/ChangeLog	Wed Nov 27 14:20:25 2013 +0100
+++ b/ChangeLog	Wed Nov 27 16:37:38 2013 -0500
@@ -1,3 +1,13 @@
+2013-11-27  Andrew Azores  <aazores at redhat.com>
+
+	Made JNLPClassLoaderDeadlock reproducer more reliable
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java:
+	Removed "AutoOkClosingListener" magic string
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java:
+	same
+	* tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java:
+	Changed AutoOkClosingListener to RulesFolowingClosingListener
+
 2013-11-26  Jiri Vanek  <jvanek at redhat.com>
 
 	Reverted "fix to ManifestedJar1Test cases", better manifestedjar tests,
diff -r d5bcc8f80d90 -r 72f45c87b008 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java
--- a/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java	Wed Nov 27 14:20:25 2013 +0100
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_1.java	Wed Nov 27 16:37:38 2013 -0500
@@ -15,7 +15,6 @@
         setBackground(Color.white);
         add(tf);
         System.out.println("JNLPClassLoaderDeadlock_1 applet finished");
-        System.out.println("*** APPLET FINISHED ***");
     }
 
     public static void main(String[] args) {
diff -r d5bcc8f80d90 -r 72f45c87b008 tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java
--- a/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java	Wed Nov 27 14:20:25 2013 +0100
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/srcs/JNLPClassLoaderDeadlock_2.java	Wed Nov 27 16:37:38 2013 -0500
@@ -78,6 +78,5 @@
             }
         }
         System.out.println("JNLPClassLoaderDeadlock_2 applet finished");
-        System.out.println("*** APPLET FINISHED ***");
     }
 }
diff -r d5bcc8f80d90 -r 72f45c87b008 tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java
--- a/tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java	Wed Nov 27 14:20:25 2013 +0100
+++ b/tests/reproducers/custom/JNLPClassLoaderDeadlock/testcases/JNLPClassLoaderDeadlockTest.java	Wed Nov 27 16:37:38 2013 -0500
@@ -43,7 +43,7 @@
 import net.sourceforge.jnlp.annotations.TestInBrowsers;
 import net.sourceforge.jnlp.browsertesting.BrowserTest;
 import net.sourceforge.jnlp.browsertesting.Browsers;
-import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener;
+import net.sourceforge.jnlp.closinglisteners.RulesFolowingClosingListener;
 
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
@@ -55,7 +55,10 @@
     @TestInBrowsers(testIn={Browsers.one})
     @Bug(id="RH976833")
     public void testClassLoaderDeadlock() throws Exception {
-        ProcessResult pr = server.executeBrowser("JNLPClassLoaderDeadlock.html", AutoClose.CLOSE_ON_CORRECT_END);
+        RulesFolowingClosingListener listener = new RulesFolowingClosingListener();
+        listener.addContainsRule("JNLPClassLoaderDeadlock_1 applet finished");
+        listener.addContainsRule("JNLPClassLoaderDeadlock_2 applet finished");
+        ProcessResult pr = server.executeBrowser("JNLPClassLoaderDeadlock.html", listener, null);
         assertTrue("First applet should have initialized",
                 pr.stdout.contains("JNLPClassLoaderDeadlock_1 applet initialized"));
         assertTrue("Second applet should have initialized",