Index: modules/swing/src/test/api/java/common/javax/swing/JComponentRTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/JComponentRTest.java (revision 475639) +++ modules/swing/src/test/api/java/common/javax/swing/JComponentRTest.java (working copy) @@ -22,7 +22,7 @@ import java.awt.event.ActionListener; -public class JComponentRTest extends BasicSwingTestCase { +public class JComponentRTest extends SwingTestCase { public void testComponentInstantiation() throws Exception { Object result = (ActionListener)new JComboBox(); result = JPanel.class; @@ -37,4 +37,19 @@ JComponent c = new JComponent() {}; c.resetKeyboardActions(); } + + public void testSetBounds() throws Throwable { + final Marker marker = new Marker(); + final JComponent button = new JButton("JButton") { + @Override + public void revalidate() { + marker.setOccurred(); + super.revalidate(); + } + }; + marker.reset(); + + button.setSize(50, 500); + assertFalse(marker.isOccurred()); + } } Index: modules/swing/src/test/api/java/common/javax/swing/JInternalFrameTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/JInternalFrameTest.java (revision 475639) +++ modules/swing/src/test/api/java/common/javax/swing/JInternalFrameTest.java (working copy) @@ -47,6 +47,7 @@ import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicInternalFrameUI; +@SuppressWarnings("serial") public class JInternalFrameTest extends SwingTestCase { /* * This class is used to test that some methods were called. @@ -56,11 +57,13 @@ public static boolean setRootPaneCalled = false; public static boolean disposeCalled = false; + @Override public JRootPane createRootPane() { createRootPaneCalled = true; return super.createRootPane(); } + @Override public void setRootPane(final JRootPane root) { setRootPaneCalled = true; super.setRootPane(root); @@ -72,6 +75,7 @@ disposeCalled = false; } + @Override public void dispose() { disposeCalled = true; super.dispose(); @@ -177,6 +181,7 @@ /* * @see TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); frame = new JInternalFrame(); @@ -186,6 +191,7 @@ /* * @see TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { if (rootFrame != null) { rootFrame.dispose(); @@ -1691,4 +1697,28 @@ l.closedFired()); } } + + public void testSetBounds() throws Exception { + final Marker validateMarker = new Marker(); + final Marker revalidateMarker = new Marker(); + final JComponent frame = new JInternalFrame() { + @Override + public void validate() { + validateMarker.setOccurred(); + super.validate(); + } + + @Override + public void revalidate() { + revalidateMarker.setOccurred(); + super.revalidate(); + } + }; + validateMarker.reset(); + revalidateMarker.reset(); + + frame.setBounds(0, 0, 50, 500); + assertFalse(revalidateMarker.isOccurred()); + assertTrue(validateMarker.isOccurred()); + } }