From c3957858a80df0fedcce83e79cfdaec37efe9d7c Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 11 Jul 2012 16:18:58 +0200 Subject: try to close browser before kill it --- .../testcases/AppletTestSignedTests.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'tests/reproducers/signed') diff --git a/tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java b/tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java index d3d87ba..8c9e2e7 100644 --- a/tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java +++ b/tests/reproducers/signed/AppletTestSigned/testcases/AppletTestSignedTests.java @@ -38,8 +38,8 @@ exception statement from your version. import java.util.Arrays; import java.util.Collections; import java.util.List; +import net.sourceforge.jnlp.ProcessResult; 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; @@ -53,13 +53,13 @@ public class AppletTestSignedTests extends BrowserTest { @Test public void AppletTestSignedTest() throws Exception { - ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/AppletTestSigned.jnlp"); - evaluateSignedApplet(pr); + ProcessResult pr = server.executeJavawsHeadless(l, "/AppletTestSigned.jnlp"); + evaluateSignedApplet(pr, true); Assert.assertFalse(pr.wasTerminated); Assert.assertEquals((Integer) 0, pr.returnValue); } - private void evaluateSignedApplet(ProcessResult pr) { + private void evaluateSignedApplet(ProcessResult pr, boolean javawsApplet) { String s3 = "AppletTestSigned was initialised"; Assert.assertTrue("AppletTestSigned stdout should contain " + s3 + " but didn't", pr.stdout.contains(s3)); String s0 = "AppletTestSigned was started"; @@ -68,14 +68,18 @@ public class AppletTestSignedTests extends BrowserTest { Assert.assertTrue("AppletTestSigned stdout should contain " + s1 + " but didn't", pr.stdout.contains(s1)); String s2 = "value2"; Assert.assertTrue("AppletTestSigned stdout should contain " + s2 + " but didn't", pr.stdout.contains(s2)); - String s4 = "AppletTestSigned was stopped"; - Assert.assertFalse("AppletTestSigned stdout shouldn't contain " + s4 + " but did", pr.stdout.contains(s4)); - String s5 = "AppletTestSigned will be destroyed"; - Assert.assertFalse("AppletTestSigned stdout shouldn't contain " + s5 + " but did", pr.stdout.contains(s5)); String ss = "xception"; Assert.assertFalse("AppletTestSigned stderr should not contain " + ss + " but did", pr.stderr.contains(ss)); String s7 = "AppletTestSigned killing himself after 2000 ms of life"; Assert.assertTrue("AppletTestSigned stdout should contain " + s7 + " but didn't", pr.stdout.contains(s7)); + if (!javawsApplet) { + /*this is working correctly in most browser, but not in all. temporarily disabling + String s4 = "AppletTestSigned was stopped"; + Assert.assertTrue("AppletTestSigned stdout shouldt contain " + s4 + " but did", pr.stdout.contains(s4)); + String s5 = "AppletTestSigned will be destroyed"; + Assert.assertTrue("AppletTestSigned stdout shouldt contain " + s5 + " but did", pr.stdout.contains(s5)); + */ + } } @Test @@ -83,8 +87,8 @@ public class AppletTestSignedTests extends BrowserTest { public void AppletTestSignedFirefoxTest() throws Exception { ServerAccess.PROCESS_TIMEOUT = 30 * 1000; try { - ServerAccess.ProcessResult pr = server.executeBrowser("/AppletTestSigned.html"); - evaluateSignedApplet(pr); + ProcessResult pr = server.executeBrowser("/AppletTestSigned.html"); + evaluateSignedApplet(pr, false); Assert.assertTrue(pr.wasTerminated); //Assert.assertEquals((Integer) 0, pr.returnValue); due to destroy is null } finally { -- cgit v1.2.3