harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r496644 - in /harmony/enhanced/classlib/trunk/modules: awt/src/test/api/java/common/java/awt/print/ swing/src/main/java/common/javax/swing/plaf/basic/ swing/src/test/api/java/common/javax/swing/plaf/basic/
Date Tue, 16 Jan 2007 09:50:37 GMT
Author: hindessm
Date: Tue Jan 16 01:50:36 2007
New Revision: 496644

URL: http://svn.apache.org/viewvc?view=rev&rev=496644
Log:
Applying patches from "[#HARMONY-2903] [classlib][swing]
j.s.plaf.basic.BasicOptionPaneUI.getIconForType() doesn't throw NPE".

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/print/BookTest.java
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicOptionPaneUI.java
    harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUITest.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/print/BookTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/print/BookTest.java?view=diff&rev=496644&r1=496643&r2=496644
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/print/BookTest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/test/api/java/common/java/awt/print/BookTest.java
Tue Jan 16 01:50:36 2007
@@ -43,6 +43,71 @@
 
         try {
             d.setPage(1, p, pf);
+            fail("IndexOutOfBoundsException was not thrown"); //$NON-NLS-1$
+        } catch (IndexOutOfBoundsException ex) {
+            // expected
+        }
+
+        try {
+            d.setPage(1, null, pf);
+            fail("NullPointerException was not thrown"); //$NON-NLS-1$
+        } catch (NullPointerException ex) {
+            // expected
+        }
+
+        try {
+            d.setPage(1, p, null);
+            fail("NullPointerException was not thrown"); //$NON-NLS-1$
+        } catch (NullPointerException ex) {
+            // expected
+        }
+    }
+}
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package java.awt.print;
+
+import java.awt.Graphics;
+
+import junit.framework.TestCase;
+
+public class BookTest extends TestCase {
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(BookTest.class);
+    }
+
+    /**
+     * Test method for
+     * {@link java.awt.print.Book#setPage(int, java.awt.print.Printable, java.awt.print.PageFormat)}.
+     */
+    public void testSetPage() {
+        // Regression test for HARMONY-2433
+        final Book d = new Book();
+        final PageFormat pf = new PageFormat();
+        final Printable p = new Printable() {
+            public int print(Graphics g, PageFormat pf, int i) {
+                return PAGE_EXISTS;
+            }
+        };
+
+        try {
+            d.setPage(1, p, pf);
             fail("IndexOutOfBoundsException was not thrown");
         } catch (IndexOutOfBoundsException ex) {
             // expected

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicOptionPaneUI.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicOptionPaneUI.java?view=diff&rev=496644&r1=496643&r2=496644
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicOptionPaneUI.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/basic/BasicOptionPaneUI.java
Tue Jan 16 01:50:36 2007
@@ -563,6 +563,10 @@
     }
 
     protected Icon getIconForType(final int messageType) {
+        if (optionPane == null) {
+            throw new NullPointerException("optionPane is null");
+        }
+
         if (defaultIcons == null) {
             installIcons();
         }

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUITest.java?view=diff&rev=496644&r1=496643&r2=496644
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUITest.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUITest.java
Tue Jan 16 01:50:36 2007
@@ -545,6 +545,8 @@
     }
 
     public void testGetIconForType() throws InterruptedException {
+        paneUI.optionPane = new JOptionPane();
+        paneUI.optionPane.setUI(paneUI);
         Icon icon11 = new IconUIResource(new ImageIcon(new BufferedImage(10, 20,
                 BufferedImage.TYPE_INT_RGB)));
         Icon icon21 = new IconUIResource(new ImageIcon(new BufferedImage(30, 40,
@@ -576,6 +578,15 @@
                 .getIconForType(JOptionPane.QUESTION_MESSAGE));
         assertSame("icons are shared", icon42, paneUI
                 .getIconForType(JOptionPane.WARNING_MESSAGE));
+    }
+
+    public void testGetIconForType_Null() throws InterruptedException {
+        try { // Regression test for HARMONY-2903
+            new BasicOptionPaneUI().getIconForType(0);
+            fail("NullPointerException should have been thrown");
+        } catch (NullPointerException e) {
+            // Expected
+        }
     }
 
     public void testGetMaxCharactersPerLineCount() {



Mime
View raw message