Index: src/test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java =================================================================== --- src/test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java (revision 496381) +++ src/test/api/java/common/javax/swing/plaf/basic/BasicMenuUITest.java (working copy) @@ -30,6 +30,7 @@ import javax.swing.ImageIcon; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JOptionPane; import javax.swing.SwingTestCase; import javax.swing.SwingUtilities; import javax.swing.UIManager; @@ -77,6 +78,18 @@ menu1.setPreferredSize(new Dimension(1000, 1000)); assertEquals(1000, menuUI.getMaximumSize(menu1).width); assertEquals(Short.MAX_VALUE, menuUI.getMaximumSize(menu1).height); + testExceptionalCase(new NullPointerCase() { + @Override + public void exceptionalAction() throws Exception { + menuUI.getMaximumSize(null); + } + }); + testExceptionalCase(new NullPointerCase() { + @Override // Regression for HARMONY-2663 + public void exceptionalAction() throws Exception { + menuUI.getMaximumSize(new JOptionPane()); + } + }); } /*