Silenced deployment.properties and zero size applet exceptions with tests

7 files changed, 183 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 13b2f9f..b889a87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,20 @@
 2013-06-06  Jiri Vanek  <[email protected]>
+
+	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  <[email protected]>
 	Jacob Wisor  <[email protected]>
 
 	Enhanced manifest
diff --git a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
index 61061d2..e4d1040 100644
--- a/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
+++ b/netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java
@@ -427,7 +427,9 @@ public final class DeploymentConfiguration {
                 jrePath = jreSetting.getValue();
             }
         } catch (Exception ex) {
-            ex.printStackTrace();
+            if (JNLPRuntime.isDebug()){
+                ex.printStackTrace();
+            }
         }
 
         File jreFile;
@@ -530,6 +532,9 @@ public final class DeploymentConfiguration {
         try {
             return parsePropertiesFile(file);
         } catch (IOException e) {
+            if (JNLPRuntime.isDebug()){
+                e.printStackTrace();
+            }
             return null;
         }
     }
diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
index b66f52b..7742035 100644
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
@@ -1547,7 +1547,9 @@ public class PluginAppletViewer extends XEmbeddedFrame
 
         // 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 --git a/tests/reproducers/simple/AppletTest/resources/appletZeroH.html b/tests/reproducers/simple/AppletTest/resources/appletZeroH.html
new file mode 100644
index 0000000..b3f6a0f
--- /dev/null
+++ b/tests/reproducers/simple/AppletTest/resources/appletZeroH.html
@@ -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 --git a/tests/reproducers/simple/AppletTest/resources/appletZeroW.html b/tests/reproducers/simple/AppletTest/resources/appletZeroW.html
new file mode 100644
index 0000000..e97fe0b
--- /dev/null
+++ b/tests/reproducers/simple/AppletTest/resources/appletZeroW.html
@@ -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 --git a/tests/reproducers/simple/AppletTest/resources/appletZeroWH.html b/tests/reproducers/simple/AppletTest/resources/appletZeroWH.html
new file mode 100644
index 0000000..aaec64c
--- /dev/null
+++ b/tests/reproducers/simple/AppletTest/resources/appletZeroWH.html
@@ -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 --git a/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java b/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java
index a51021f..75e19f4 100644
--- a/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java
+++ b/tests/reproducers/simple/AppletTest/testcases/AppletTestTests.java
@@ -1,4 +1,4 @@
-/* AppletTestTests.java
+/* 
 Copyright (C) 2011 Red Hat, Inc.
 
 This file is part of IcedTea.
@@ -154,4 +154,29 @@ public class AppletTestTests extends BrowserTest {
             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);
+    }
 }