/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Thu Jun 6 08:13:53 PDT 2013
changeset 229f9b1f594a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=229f9b1f594a
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jun 06 16:39:44 2013 +0200
Enhanced manifest
* netx.manifest.in: added Implementation-URL, Implementation-Vendor,
Specification-Title, Specification-URL, Specification-Vendor and
Specification-Version entries
changeset 3e8df126cba2 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=3e8df126cba2
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jun 06 16:57:14 2013 +0200
Silenced deployment.properties and zero size applet exceptions with tests
changeset e8341834febd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e8341834febd
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Jun 06 17:07:28 2013 +0200
Made all tests running wit junit4.10 and higher
* tests/junit-runner/CommandLine.java: (runMain) is no longer overriding
and (runMainAndExit) is now calling System.exit rather then system.exit
diffstat:
ChangeLog | 30 ++++++
netx.manifest.in | 6 +
netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java | 7 +-
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 4 +-
tests/junit-runner/CommandLine.java | 3 +-
tests/reproducers/simple/AppletTest/resources/appletZeroH.html | 44 ++++++++++
tests/reproducers/simple/AppletTest/resources/appletZeroW.html | 44 ++++++++++
tests/reproducers/simple/AppletTest/resources/appletZeroWH.html | 44 ++++++++++
tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java | 27 +++++-
9 files changed, 204 insertions(+), 5 deletions(-)
diffs (285 lines):
diff -r 83e496086fea -r e8341834febd ChangeLog
--- a/ChangeLog Wed Jun 05 15:12:01 2013 -0400
+++ b/ChangeLog Thu Jun 06 17:07:28 2013 +0200
@@ -1,3 +1,33 @@
+2013-06-06 Jiri Vanek <jvanek at redhat.com>
+
+ Made all tests running wit junit4.10 and higher
+ * tests/junit-runner/CommandLine.java: (runMain) is no longer overriding
+ and (runMainAndExit) is now calling System.exit rather then system.exit
+
+2013-06-06 Jiri Vanek <jvanek at redhat.com>
+
+ Silenced deployment.properties and zero size applet exceptions with tests
+ * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java:
+ (findSystemConfigFile) and (loadProperties) now prints already cough exception
+ only in debug mode
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: (paint)
+ now paints into 1 x 1 applet instead of 0 x 0 in case of 0 x 0 applet
+ * tests/reproducers/simple/AppletTest/resources/appletZeroH.html: new file
+ * tests/reproducers/simple/AppletTest/resources/appletZeroW.html: new file
+ * tests/reproducers/simple/AppletTest/resources/appletZeroWH.html: new file
+ - testing launchers with zero as width, height or both
+ * tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java:
+ added launchers and evaluations for three new htmls - (appletZeroWH)
+ (appletZeroW) (appletZeroH)
+
+2013-06-06 Jiri Vanek <jvanek at redhat.com>
+ Jacob Wisor <gitne at excite.co.jp>
+
+ Enhanced manifest
+ * netx.manifest.in: added Implementation-URL, Implementation-Vendor,
+ Specification-Title, Specification-URL, Specification-Vendor and
+ Specification-Version entries
+
2013-06-05 Adam Domurad <adomurad at redhat.com>
Fix PR1465
diff -r 83e496086fea -r e8341834febd netx.manifest.in
--- a/netx.manifest.in Wed Jun 05 15:12:01 2013 -0400
+++ b/netx.manifest.in Thu Jun 06 17:07:28 2013 +0200
@@ -1,2 +1,8 @@
Implementation-Title: @PACKAGE_NAME@
Implementation-Version: @FULL_VERSION@
+Implementation-URL: @PACKAGE_URL@
+Implementation-Vendor: IcedTea
+Specification-Title: JSR56: Java Network Launching Protocol and API
+Specification-URL: http://jcp.org/aboutJava/communityprocess/mrel/jsr056
+Specification-Vendor: Java Community Process
+Specification-Version: 6.0
diff -r 83e496086fea -r e8341834febd netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Wed Jun 05 15:12:01 2013 -0400
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java Thu Jun 06 17:07:28 2013 +0200
@@ -427,7 +427,9 @@
jrePath = jreSetting.getValue();
}
} catch (Exception ex) {
- ex.printStackTrace();
+ if (JNLPRuntime.isDebug()){
+ ex.printStackTrace();
+ }
}
File jreFile;
@@ -530,6 +532,9 @@
try {
return parsePropertiesFile(file);
} catch (IOException e) {
+ if (JNLPRuntime.isDebug()){
+ e.printStackTrace();
+ }
return null;
}
}
diff -r 83e496086fea -r e8341834febd plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Jun 05 15:12:01 2013 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Jun 06 17:07:28 2013 +0200
@@ -1547,7 +1547,9 @@
// If the image or the graphics don't exist, create new ones
if (bufFrameImg == null || bufFrameImgGraphics == null) {
- bufFrameImg = createImage(getWidth(), getHeight());
+ // although invisible applets do not have right to paint
+ // we rather paint to 1x1 to be sure all callbacks will be completed
+ bufFrameImg = createImage(Math.max(1, getWidth()), Math.max(1, getHeight()));
bufFrameImgGraphics = bufFrameImg.getGraphics();
}
diff -r 83e496086fea -r e8341834febd tests/junit-runner/CommandLine.java
--- a/tests/junit-runner/CommandLine.java Wed Jun 05 15:12:01 2013 -0400
+++ b/tests/junit-runner/CommandLine.java Thu Jun 06 17:07:28 2013 +0200
@@ -26,10 +26,9 @@
public static void runMainAndExit(JUnitSystem system, String... args) {
new CommandLine().runMain(system, args);
- system.exit(0);
+ System.exit(0);
}
- @Override
public Result runMain(JUnitSystem system, String... args) {
List<Class<?>> classes = new ArrayList<Class<?>>();
List<Failure> missingClasses = new ArrayList<Failure>();
diff -r 83e496086fea -r e8341834febd tests/reproducers/simple/AppletTest/resources/appletZeroH.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/AppletTest/resources/appletZeroH.html Thu Jun 06 17:07:28 2013 +0200
@@ -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="AppletTest.class" archive="AppletTest.jar" codebase="." width="800" height="0">
+ <param name="key1" value="value1">
+ <param name="key2" value="#value2">
+</applet></p>
+</body>
+</html>
diff -r 83e496086fea -r e8341834febd tests/reproducers/simple/AppletTest/resources/appletZeroW.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/AppletTest/resources/appletZeroW.html Thu Jun 06 17:07:28 2013 +0200
@@ -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="AppletTest.class" archive="AppletTest.jar" codebase="." width="0" height="600">
+ <param name="key1" value="value1">
+ <param name="key2" value="#value2">
+</applet></p>
+</body>
+</html>
diff -r 83e496086fea -r e8341834febd tests/reproducers/simple/AppletTest/resources/appletZeroWH.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/AppletTest/resources/appletZeroWH.html Thu Jun 06 17:07:28 2013 +0200
@@ -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="AppletTest.class" archive="AppletTest.jar" codebase="." width="0" height="0">
+ <param name="key1" value="value1">
+ <param name="key2" value="#value2">
+</applet></p>
+</body>
+</html>
diff -r 83e496086fea -r e8341834febd tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java
--- a/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java Wed Jun 05 15:12:01 2013 -0400
+++ b/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java Thu Jun 06 17:07:28 2013 +0200
@@ -1,4 +1,4 @@
-/* AppletTestTests.java
+/*
Copyright (C) 2011 Red Hat, Inc.
This file is part of IcedTea.
@@ -154,4 +154,29 @@
ServerAccess.PROCESS_TIMEOUT = 20 * 1000; //back to normal
}
}
+
+
+ @Test
+ @TestInBrowsers(testIn = {Browsers.one})
+ @NeedsDisplay
+ public void appletZeroWH() throws Exception {
+ ProcessResult pr = server.executeBrowser("/appletZeroWH.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl());
+ evaluateApplet(pr, false);
+ }
+
+ @Test
+ @TestInBrowsers(testIn = {Browsers.one})
+ @NeedsDisplay
+ public void appletZeroW() throws Exception {
+ ProcessResult pr = server.executeBrowser("/appletZeroW.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl());
+ evaluateApplet(pr, false);
+ }
+
+ @Test
+ @TestInBrowsers(testIn = {Browsers.one})
+ @NeedsDisplay
+ public void appletZeroH() throws Exception {
+ ProcessResult pr = server.executeBrowser("/appletZeroH.html", new CountingClosingListenerImpl(), new CountingClosingListenerImpl());
+ evaluateApplet(pr, false);
+ }
}
More information about the distro-pkg-dev
mailing list