diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/jnlp_tests/simple/CheckServices/resources/CheckPluginServices.html | 46 | ||||
| -rw-r--r-- | tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java | 37 |
3 files changed, 81 insertions, 10 deletions
@@ -1,3 +1,11 @@ +2012-06-13 Danesh Dadachanji <[email protected]> + + Update CheckServices reproducer to handle browser testcase. + * tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java: + Added browser test and annotation, refactored asserts into helper method. + * tests/jnlp_tests/simple/CheckServices/resources/CheckPluginServices.html: + New browser test file that runs applet using jnlp_href. + 2012-06-13 Jiri Vanek <[email protected]> * tests/junit-runner/JunitLikeXmlOutputListener.java: diff --git a/tests/jnlp_tests/simple/CheckServices/resources/CheckPluginServices.html b/tests/jnlp_tests/simple/CheckServices/resources/CheckPluginServices.html new file mode 100644 index 0000000..0cdb0b7 --- /dev/null +++ b/tests/jnlp_tests/simple/CheckServices/resources/CheckPluginServices.html @@ -0,0 +1,46 @@ +<!-- + +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> + <applet code="CheckServices" width="800" height="600"> + <param name="jnlp_href" value="CheckServices.jnlp"> + </applet> + </body> +</html> + diff --git a/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java b/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java index f2c71af..7257984 100644 --- a/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java +++ b/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java @@ -36,7 +36,10 @@ 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 org.junit.Assert; import org.junit.Test; @@ -45,26 +48,40 @@ public class CheckServicesTests { private static ServerAccess server = new ServerAccess(); - @Test - public void CheckServices() throws Exception { - ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/CheckServices.jnlp"); + public void evaluateApplet(ProcessResult pr) { String s0 = "Codebase for applet was found in constructor"; - Assert.assertTrue("CheckServices stdout should contain `" + s0 + "' bud didn't.", pr.stdout.contains(s0)); + Assert.assertTrue("CheckServices stdout should contain `" + s0 + "' but didn't.", pr.stdout.contains(s0)); String s1 = "Codebase for applet was found in init()"; - Assert.assertTrue("CheckServices stdout should contain `" + s1 + "' bud didn't.", pr.stdout.contains(s1)); + Assert.assertTrue("CheckServices stdout should contain `" + s1 + "' but didn't.", pr.stdout.contains(s1)); String s2 = "Codebase for applet was found in start()"; - Assert.assertTrue("CheckServices stdout should contain `" + s2 + "' bud didn't.", pr.stdout.contains(s2)); + Assert.assertTrue("CheckServices stdout should contain `" + s2 + "' but didn't.", pr.stdout.contains(s2)); /* FIXME: Once the awt robot can close the applet window (i.e. send * a stop event), stdout should be checked for these asserts. String s3 = "Codebase for applet was found in stop()"; - Assert.assertTrue("CheckServices stdout should contain `" + s3 + "' bud didn't.", pr.stdout.contains(s3)); + Assert.assertTrue("CheckServices stdout should contain `" + s3 + "' but didn't.", pr.stdout.contains(s3)); String s4 = "Codebase for applet was found in destroy()"; - Assert.assertTrue("CheckServices stdout should contain `" + s4 + "' bud didn't.", pr.stdout.contains(s4)); + Assert.assertTrue("CheckServices stdout should contain `" + s4 + "' but didn't.", pr.stdout.contains(s4)); */ String s5 = "Exception occurred with null codebase in"; - Assert.assertFalse("CheckServices stderr should not contain `" + s5 + "' bud did.", pr.stdout.contains(s5)); + Assert.assertFalse("CheckServices stderr should not contain `" + s5 + "' but did.", pr.stdout.contains(s5)); String s6 = "Applet killing itself after 2000 ms of life"; - Assert.assertTrue("CheckServices stdout should contain `" + s6 + "' bud didn't.", pr.stdout.contains(s6)); + Assert.assertTrue("CheckServices stdout should contain `" + s6 + "' but didn't.", pr.stdout.contains(s6)); + } + + @Test + @NeedsDisplay + public void CheckWebstartServices() throws Exception { + ProcessResult pr = server.executeJavaws(null, "/CheckServices.jnlp"); + evaluateApplet(pr); + Assert.assertFalse(pr.wasTerminated); Assert.assertEquals((Integer)0, pr.returnValue); } + + @Test + @NeedsDisplay + public void CheckPluginJNLPHServices() throws Exception { + ProcessResult pr = server.executeBrowser(null, "/CheckPluginServices.html"); + evaluateApplet(pr); + Assert.assertTrue(pr.wasTerminated); + } } |