From bf89d620ace4a20270fee72285f9c4c9bfa6b345 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Wed, 14 Mar 2012 11:27:16 -0400
Subject: Launch errors are not being printed to terminal
2012-03-14 Omair Majid <omajid@redhat.com>
Print exceptions to terminal when running in gui mode too.
* netx/net/sourceforge/jnlp/AbstractLaunchHandler.java: New file.
* netx/net/sourceforge/jnlp/DefaultLaunchHandler.java: Extend
AbstractLaunchHandler.
(DefaultLaunchHandler): New method.
(printMessage): Moved to parent class.
* netx/net/sourceforge/jnlp/GuiLaunchHandler.java: Extend
AbstractLaunchHandler.
(GuiLauchHandler): New method.
(launchError): Print the error too.
(launchWarning,validationError): Call parent's printMessage.
* netx/net/sourceforge/jnlp/LaunchException.java: Use standard java
exception chaining. This removes compatibility with pre-java 1.3 class
libraries.
(LaunchException(JNLPFile,Exception,String,String,String,String)): Pass
cause to parent so exceptions are chanined properly.
(LaunchException(String,Throwable),LaunchException(Throwable)): Call
parent's constructor.
(printStackTrace(PrintStream),printStackTrace(PrintWriter),getCause):
Removed. Use parent's implementation instead.
(getCauses): Removed.
* netx/net/sourceforge/jnlp/LaunchHandler.java
(validationError): Rename argument to clarify meaing.
* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
(initialize): Redirect output of all handlers to System.err.
* plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
(PluginAppletSecurityContext): Likewise.
* tests/netx/unit/net/sourceforge/jnlp/DefaultLaunchHandlerTest.java,
* tests/netx/unit/net/sourceforge/jnlp/LaunchExceptionTest.java: New
file. Contains tests.
---
.../sourceforge/jnlp/DefaultLaunchHandlerTest.java | 133 +++++++++++++++++++++
.../net/sourceforge/jnlp/LaunchExceptionTest.java | 68 +++++++++++
2 files changed, 201 insertions(+)
create mode 100644 tests/netx/unit/net/sourceforge/jnlp/DefaultLaunchHandlerTest.java
create mode 100644 tests/netx/unit/net/sourceforge/jnlp/LaunchExceptionTest.java
(limited to 'tests')
diff --git a/tests/netx/unit/net/sourceforge/jnlp/DefaultLaunchHandlerTest.java b/tests/netx/unit/net/sourceforge/jnlp/DefaultLaunchHandlerTest.java
new file mode 100644
index 0000000..e5d1e44
--- /dev/null
+++ b/tests/netx/unit/net/sourceforge/jnlp/DefaultLaunchHandlerTest.java
@@ -0,0 +1,133 @@
+/* DefaultLaunchHandlerTest.java
+ Copyright (C) 2012 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; 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. */
+
+package net.sourceforge.jnlp;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import org.junit.Test;
+
+public class DefaultLaunchHandlerTest {
+
+ @Test
+ public void testBasicLaunch() {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DefaultLaunchHandler handler = new DefaultLaunchHandler(new PrintStream(baos));
+
+ // all no-ops with no output
+ handler.launchInitialized(null);
+ handler.launchStarting(null);
+ handler.launchCompleted(null);
+
+ String output = baos.toString();
+ assertEquals("", output);
+ }
+
+ @Test
+ public void testLaunchWarning() {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DefaultLaunchHandler handler = new DefaultLaunchHandler(new PrintStream(baos));
+
+ LaunchException warning = new LaunchException(null, null,
+ "severe", "warning type", "test warning", "this is a test of the warning");
+ boolean continueLaunch = handler.launchWarning(warning);
+
+ assertTrue(continueLaunch);
+ String output = baos.toString();
+ assertEquals("netx: warning type: test warning\n", output);
+ }
+
+ @Test
+ public void testLaunchError() {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DefaultLaunchHandler handler = new DefaultLaunchHandler(new PrintStream(baos));
+
+ LaunchException error = new LaunchException(null, null,
+ "severe", "error type", "test error", "this is a test of the error");
+ handler.launchError(error);
+
+ String output = baos.toString();
+ assertEquals("netx: error type: test error\n", output);
+ }
+
+ @Test
+ public void testLaunchErrorWithCause() {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DefaultLaunchHandler handler = new DefaultLaunchHandler(new PrintStream(baos));
+
+ ParseException parse = new ParseException("no information element");
+ LaunchException error = new LaunchException(null, parse,
+ "severe", "error type", "test error", "this is a test of the error");
+ handler.launchError(error);
+
+ String output = baos.toString();
+ assertEquals("netx: error type: test error (no information element)\n", output);
+ }
+
+ @Test
+ public void testLaunchErrorWithNestedCause() {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DefaultLaunchHandler handler = new DefaultLaunchHandler(new PrintStream(baos));
+
+ ParseException parse = new ParseException("no information element");
+ RuntimeException runtime = new RuntimeException("programmer made a mistake", parse);
+ LaunchException error = new LaunchException(null, runtime,
+ "severe", "error type", "test error", "this is a test of the error");
+ handler.launchError(error);
+
+ String output = baos.toString();
+ assertEquals("netx: error type: test error (programmer made a mistake (no information element))\n", output);
+ }
+
+
+ @Test
+ public void testValidationError() {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ DefaultLaunchHandler handler = new DefaultLaunchHandler(new PrintStream(baos));
+
+ LaunchException error = new LaunchException(null, null,
+ "severe", "validation-error type", "test validation-error", "this is a test of a validation error");
+ handler.validationError(error);
+
+ String output = baos.toString();
+ assertEquals("netx: validation-error type: test validation-error\n", output);
+ }
+}
diff --git a/tests/netx/unit/net/sourceforge/jnlp/LaunchExceptionTest.java b/tests/netx/unit/net/sourceforge/jnlp/LaunchExceptionTest.java
new file mode 100644
index 0000000..3472fdd
--- /dev/null
+++ b/tests/netx/unit/net/sourceforge/jnlp/LaunchExceptionTest.java
@@ -0,0 +1,68 @@
+/* LaunchExceptionTest.java
+ Copyright (C) 2012 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; 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. */
+
+package net.sourceforge.jnlp;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import org.junit.Test;
+
+public class LaunchExceptionTest {
+
+ @Test
+ public void testPrintStackTrace() {
+ NullPointerException cause = new NullPointerException("test");
+ LaunchException exception = new LaunchException(null, cause, "severe", "category", "test exception", "test description");
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ exception.printStackTrace(new PrintStream(baos));
+ String output = baos.toString();
+ assertNotNull(output);
+ assertFalse(output.trim().length() == 0);
+ assertTrue(output.contains("LaunchException: severe: category: test exception test description"));
+ assertTrue(output.contains("NullPointerException: test"));
+ int causedByAt = output.indexOf("Caused by:");
+ assertTrue(causedByAt != -1);
+ causedByAt = output.indexOf("Caused by:", causedByAt+1);
+ assertTrue(causedByAt == -1);
+ }
+}
--
cgit v1.2.3