/hg/icedtea-web: 2 new changesets
adomurad at icedtea.classpath.org
adomurad at icedtea.classpath.org
Mon Jun 4 12:11:19 PDT 2012
changeset 895354cdd140 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=895354cdd140
author: Adam Domurad <adomurad at redhat.com>
date: Mon Jun 04 14:45:25 2012 -0400
Added reproducer for applets taking last param
changeset a78024e7139f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a78024e7139f
author: Adam Domurad <adomurad at redhat.com>
date: Mon Jun 04 15:10:20 2012 -0400
Added patch so that applet-tags take last param.
Our plugin had previously took the first param, except for a few special param's like archive.
With this patch the last param is taken consistently.
diffstat:
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 3 -
tests/jnlp_tests/simple/AppletTakesLastParam/resources/appletTakesLastParam.html | 44 ++++++
tests/jnlp_tests/simple/AppletTakesLastParam/resources/appletTakesLastParam.jnlp | 63 +++++++++
tests/jnlp_tests/simple/AppletTakesLastParam/srcs/AppletTakesLastParam.java | 63 +++++++++
tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java | 66 ++++++++++
5 files changed, 236 insertions(+), 3 deletions(-)
diffs (265 lines):
diff -r e619314cd84d -r a78024e7139f plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jun 04 13:59:44 2012 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Jun 04 15:10:20 2012 -0400
@@ -1923,9 +1923,6 @@
Hashtable<String, String> t = scanTag(c, in);
String att = t.get("name");
- if (atts.containsKey(att))
- continue;
-
if (att == null) {
statusMsgStream.println(requiresNameWarning);
} else {
diff -r e619314cd84d -r a78024e7139f tests/jnlp_tests/simple/AppletTakesLastParam/resources/appletTakesLastParam.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/AppletTakesLastParam/resources/appletTakesLastParam.html Mon Jun 04 15:10:20 2012 -0400
@@ -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="AppletTakesLastParam.class" archive="AppletTakesLastParam.jar">
+ <param name="param" value="value1">
+ <param name="param" value="value2">
+</applet></p>
+</body>
+</html>
diff -r e619314cd84d -r a78024e7139f tests/jnlp_tests/simple/AppletTakesLastParam/resources/appletTakesLastParam.jnlp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/AppletTakesLastParam/resources/appletTakesLastParam.jnlp Mon Jun 04 15:10:20 2012 -0400
@@ -0,0 +1,63 @@
+<!--
+
+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.
+
+ -->
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="1.0" href="appletTakesLastParam.jnlp" codebase=".">
+ <information>
+ <title>AppletTakesLastParam</title>
+ <vendor>IcedTea</vendor>
+ <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
+ <description>AppletTakesLastParam</description>
+ <offline/>
+ </information>
+ <resources>
+ <j2se version="1.4+"/>
+ <jar href="AppletTakesLastParam.jar"/>
+ </resources>
+ <applet-desc
+ documentBase="."
+ name="AppletTakesLastParam"
+ main-class="AppletTakesLastParam"
+ width="100"
+ height="100">
+ <param name="param" value="value1"/>
+ <param name="param" value="value2"/>
+ </applet-desc>
+</jnlp>
+
+
+</applet-desc>
diff -r e619314cd84d -r a78024e7139f tests/jnlp_tests/simple/AppletTakesLastParam/srcs/AppletTakesLastParam.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/AppletTakesLastParam/srcs/AppletTakesLastParam.java Mon Jun 04 15:10:20 2012 -0400
@@ -0,0 +1,63 @@
+
+import java.applet.Applet;
+
+/* AppletTest.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.
+ */
+public class AppletTakesLastParam extends Applet {
+
+ private class Killer extends Thread {
+
+ public int n = 2000;
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(n);
+ System.out.println("Applet killing itself after " + n + " ms");
+ System.exit(0);
+ } catch (Exception ex) {
+ }
+ }
+ }
+ private Killer killer = new Killer();
+
+ @Override
+ public void init() {
+ System.out.println(getParameter("param"));
+ killer.start();
+ }
+}
diff -r e619314cd84d -r a78024e7139f tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/jnlp_tests/simple/AppletTakesLastParam/testcases/AppletTakesLastParamTests.java Mon Jun 04 15:10:20 2012 -0400
@@ -0,0 +1,66 @@
+/* AppletTestTests.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.ServerAccess;
+import net.sourceforge.jnlp.ServerAccess.ProcessResult;
+import org.junit.Assert;
+
+import org.junit.Test;
+
+public class AppletTakesLastParamTests {
+
+ private static ServerAccess server = new ServerAccess();
+
+ @Test
+ public void AppletTest() throws Exception {
+ ServerAccess.ProcessResult pr = server.executeJavaws(null, "/appletTakesLastParam.jnlp");
+ evaluateApplet(pr);
+ }
+
+ private void evaluateApplet(ProcessResult pr) {
+ String s0 = "value1";
+ Assert.assertTrue("AppletTakesLastParam stdout should not contain " + s0 + " but did.", !pr.stdout.contains(s0));
+ String s1 = "value2";
+ Assert.assertTrue("AppletTakesLastParam stdout should contain " + s1 + " but did not.", pr.stdout.contains(s1));
+ }
+
+ @Test
+ public void AppletInFirefoxTest() throws Exception {
+ ServerAccess.ProcessResult pr = server.executeBrowser("/appletTakesLastParam.html");
+ evaluateApplet(pr);
+ }
+}
More information about the distro-pkg-dev
mailing list