harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [12/20] - in /harmony/enhanced/java/branches/mrh: classlib/make/ classlib/modules/accessibility/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/auth/make/ classli...
Date Sat, 05 Jun 2010 08:35:05 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java Sat Jun  5 08:34:57 2010
@@ -31,7 +31,6 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingTestCase;
 import javax.swing.UIManager;
-import tests.support.Support_Excludes;
 
 public class TitledBorderTest extends SwingTestCase {
     protected JComponent panel;
@@ -58,10 +57,6 @@ public class TitledBorderTest extends Sw
      * Class under test for void TitledBorder(Border, String, int, int, Font, Color)
      */
     public void testTitledBorderBorderStringintintFontColor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Color color1 = Color.GREEN;
         Color color2 = null;
         Font font1 = new Font(null, Font.TRUETYPE_FONT, 30);
@@ -99,10 +94,6 @@ public class TitledBorderTest extends Sw
      * Class under test for void TitledBorder(Border, String, int, int, Font)
      */
     public void testTitledBorderBorderStringintintFont() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Font font1 = new Font(null, Font.TRUETYPE_FONT, 30);
         Font font2 = null;
         String string1 = "string1";
@@ -139,10 +130,6 @@ public class TitledBorderTest extends Sw
      * Class under test for void TitledBorder(Border, String, int, int)
      */
     public void testTitledBorderBorderStringintint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String string1 = "string1";
         String string2 = null;
         Border border3 = new EmptyBorder(1, 1, 1, 1);
@@ -178,10 +165,6 @@ public class TitledBorderTest extends Sw
      * Class under test for void TitledBorder(Border, String)
      */
     public void testTitledBorderBorderString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String string1 = "string1";
         String string2 = null;
         Border border3 = new EmptyBorder(1, 1, 1, 1);
@@ -215,10 +198,6 @@ public class TitledBorderTest extends Sw
      * Class under test for void TitledBorder(Border)
      */
     public void testTitledBorderBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Border border3 = new EmptyBorder(1, 1, 1, 1);
         Border border4 = null;
         TitledBorder border1 = new TitledBorder(border3);
@@ -250,10 +229,6 @@ public class TitledBorderTest extends Sw
      * Class under test for void TitledBorder(String)
      */
     public void testTitledBorderString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String string1 = "string1";
         String string2 = null;
         TitledBorder border1 = new TitledBorder(string1);
@@ -286,10 +261,6 @@ public class TitledBorderTest extends Sw
      * Class under test for Insets getBorderInsets(Component, Insets)
      */
     public void testGetBorderInsetsComponentInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Insets insets = new Insets(0, 0, 0, 0);
         Font font1 = new Font(null, Font.BOLD, 10);
         Font font2 = new Font(null, Font.ITALIC, 20);
@@ -322,10 +293,6 @@ public class TitledBorderTest extends Sw
      * Class under test for Insets getBorderInsets(Component)
      */
     public void testGetBorderInsetsComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Font font1 = new Font(null, Font.BOLD, 10);
         Font font2 = new Font(null, Font.ITALIC, 20);
         Border border1 = new EmptyBorder(10, 10, 10, 10);
@@ -372,10 +339,6 @@ public class TitledBorderTest extends Sw
     }
 
     public void testPaintBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //        int numJust = 6;
         //        int numPos = 7;
         //        String title = "Title";
@@ -398,10 +361,6 @@ public class TitledBorderTest extends Sw
     }
 
     public void testIsBorderOpaque() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Border border1 = new TitledBorder("Text");
         Border border2 = new TitledBorder(new LineBorder(Color.WHITE));
         Border border3 = new TitledBorder(new LineBorder(Color.WHITE), "Text");
@@ -411,10 +370,6 @@ public class TitledBorderTest extends Sw
     }
 
     public void testGetFont() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         class PublicTitledBorder extends TitledBorder {
             private static final long serialVersionUID = 1L;
 
@@ -446,10 +401,6 @@ public class TitledBorderTest extends Sw
     }
 
     public void testGetMinimumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Font font1 = new Font(null, Font.BOLD, 10);
         Font font2 = new Font(null, Font.ITALIC, 20);
         Border border1 = new EmptyBorder(10, 10, 10, 10);
@@ -481,17 +432,9 @@ public class TitledBorderTest extends Sw
      * This method is being tested in testGetBorder()
      */
     public void testSetBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TitledBorder titledBorder = new TitledBorder("hello, border!!");
         Border border1 = new EmptyBorder(1, 1, 1, 1);
         Border border2 = new EmptyBorder(2, 2, 2, 2);
@@ -513,17 +456,9 @@ public class TitledBorderTest extends Sw
      * This method is being tested in testGetTitle()
      */
     public void testSetTitle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetTitle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TitledBorder titledBorder = new TitledBorder("hello, border!!");
         String string1 = "string1";
         String string2 = "string2";
@@ -543,17 +478,9 @@ public class TitledBorderTest extends Sw
      * This method is being tested in testGetTitleFont()
      */
     public void testSetTitleFont() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetTitleFont() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TitledBorder titledBorder = new TitledBorder("hello, border!!");
         Font newFont1 = new Font(null, Font.BOLD, 10);
         Font newFont2 = new Font(null, Font.ITALIC, 20);
@@ -575,17 +502,9 @@ public class TitledBorderTest extends Sw
      * This method is being tested in testGetTitleColor()
      */
     public void testSetTitleColor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetTitleColor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TitledBorder titledBorder = new TitledBorder("hello, border!!");
         Color color1 = Color.RED;
         Color color2 = Color.YELLOW;
@@ -607,17 +526,9 @@ public class TitledBorderTest extends Sw
      * This method is being tested in testGetTitlePosition()
      */
     public void testSetTitlePosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetTitlePosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TitledBorder titledBorder = new TitledBorder("hello, border!!");
         int pos1 = 0;
         int pos2 = 3;
@@ -650,17 +561,9 @@ public class TitledBorderTest extends Sw
      * This method is being tested in testGetTitleJustification()
      */
     public void testSetTitleJustification() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetTitleJustification() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TitledBorder titledBorder = new TitledBorder("hello, border!!");
         int just1 = 0;
         int just2 = 3;
@@ -693,10 +596,6 @@ public class TitledBorderTest extends Sw
     }
 
     public void testReadWriteObject() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Border border3 = new LineBorder(Color.red, 33, false);
         String title4 = "new LineBorder(Color.yellow, 47, true);";
         TitledBorder border1 = new TitledBorder(border3);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java Sat Jun  5 08:34:57 2010
@@ -30,7 +30,6 @@ import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.JSpinner;
 import javax.swing.UIManager;
-import tests.support.Support_Excludes;
 
 public class ColorChooserComponentFactoryTest extends BasicSwingTestCase {
     private JColorChooser colorChooser;
@@ -46,10 +45,6 @@ public class ColorChooserComponentFactor
     }
 
     public void testSwatchPanel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AbstractColorChooserPanel swatchPanel = ColorChooserComponentFactory
                 .getDefaultChooserPanels()[0];
         UIManager.put("ColorChooser.swatchesSwatchSize", new Dimension(25, 25));
@@ -59,10 +54,6 @@ public class ColorChooserComponentFactor
     }
 
     public void testRGBPanel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AbstractColorChooserPanel rgbPanel = ColorChooserComponentFactory
                 .getDefaultChooserPanels()[2];
         assertEquals("RGB", rgbPanel.getDisplayName());
@@ -123,10 +114,6 @@ public class ColorChooserComponentFactor
     }
 
     public void testHSBPanel() throws InterruptedException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AbstractColorChooserPanel hsbPanel = ColorChooserComponentFactory
                 .getDefaultChooserPanels()[1];
         assertEquals("HSB", hsbPanel.getDisplayName());
@@ -178,10 +165,6 @@ public class ColorChooserComponentFactor
     }
 
     public void testPreviewPanel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComponent panel = ColorChooserComponentFactory.getPreviewPanel();
         assertTrue(panel instanceof JPanel);
         assertEquals(colorChooser.getPreviewPanel().getForeground(), Color.GREEN);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import tests.support.Support_Excludes;
 
 public class AncestorEventTest extends BasicSwingTestCase {
     protected static class TestAncestorListener extends EventsController implements
@@ -121,10 +120,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorEvent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int id = 123;
         JComponent source = new JPanel();
         AncestorEvent event = new AncestorEvent(source, id, null, null);
@@ -133,37 +128,21 @@ public class AncestorEventTest extends B
     }
 
     public void testGetComponent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AncestorEvent event = new AncestorEvent(component, 0, null, null);
         assertEquals(component, event.getComponent());
     }
 
     public void testGetAncestor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AncestorEvent event = new AncestorEvent(component, 0, ancestor, null);
         assertEquals(ancestor, event.getAncestor());
     }
 
     public void testGetAncestorParent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AncestorEvent event = new AncestorEvent(component, 0, null, ancestor);
         assertEquals(ancestor, event.getAncestorParent());
     }
 
     public void testAncestorAddedEventWhenAncestorVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         ancestor.setVisible(false);
         component.setVisible(true);
@@ -176,10 +155,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorAddedEventWhenComponentVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         ancestor.setVisible(true);
         component.setVisible(false);
@@ -192,10 +167,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorAddedEventWhenInvisibleComponentAncestorVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         ancestor.setVisible(false);
         component.setVisible(false);
@@ -207,10 +178,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorAddedEventWhenInvisibleAncestorComponentVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         ancestor.setVisible(false);
         component.setVisible(false);
@@ -222,10 +189,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorAddedEventWhenComponentAdded() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         ancestor.remove(component);
         waitForIdle();
@@ -241,10 +204,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorAddedEventWhenAncestorAdded() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         waitForIdle();
         assertTrue(listener.getNumEvents() >= 3);
@@ -258,10 +217,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorMovedEventWhenAncestorInvisibleAncestorMoved() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         ancestor.setBounds(10, 10, 10, 10);
         ancestor.setVisible(false);
@@ -278,10 +233,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorMovedEventWhenComponentInvisibleAncestorMoved() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         ancestor.setBounds(10, 10, 10, 10);
         component.setVisible(false);
@@ -297,10 +248,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorMovedEventWhenAncestorInvisibleComponentMoved() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         component.setBounds(10, 10, 10, 10);
         ancestor.setVisible(false);
@@ -317,10 +264,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorMovedEventWhenComponentInvisibleComponentMoved() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         component.setBounds(10, 10, 10, 10);
         component.setVisible(false);
@@ -337,10 +280,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorMovedEventWhenAncestorMoved() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         ancestor.setBounds(10, 10, 10, 10);
         waitForIdle();
@@ -356,10 +295,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorMovedEventWhenComponentMoved() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         component.setSize(200, 200);
         waitForIdle();
         assertEquals(0, listener.getNumEvents());
@@ -374,10 +309,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorRemovedEventWhenComponentInvisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         waitForIdle();
         listener.reset();
@@ -388,10 +319,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorRemovedEventWhenComponentRemoved() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         waitForIdle();
         listener.reset();
@@ -402,10 +329,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorRemovedEventWhenAncestorInvisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         waitForIdle();
         listener.reset();
@@ -416,10 +339,6 @@ public class AncestorEventTest extends B
     }
 
     public void testAncestorRemovedEventWhenAncestorRemoved() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = createVisibleFrameWithAncestor();
         waitForIdle();
         listener.reset();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java Sat Jun  5 08:34:57 2010
@@ -20,7 +20,6 @@
 package javax.swing.plaf.basic;
 
 import javax.swing.plaf.ComponentUI;
-import tests.support.Support_Excludes;
 
 public class BasicCheckBoxMenuItemUITest extends BasicMenuItemUITest {
     protected BasicCheckBoxMenuItemUI checkBoxUI;
@@ -45,10 +44,6 @@ public class BasicCheckBoxMenuItemUITest
      */
     @Override
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicCheckBoxMenuItemUI.createUI(null);
         ComponentUI ui2 = BasicCheckBoxMenuItemUI.createUI(null);
         assertTrue(ui1 instanceof BasicCheckBoxMenuItemUI);
@@ -60,10 +55,6 @@ public class BasicCheckBoxMenuItemUITest
      */
     @Override
     public void testGetPropertyPrefix() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("CheckBoxMenuItem", menuItemUI.getPropertyPrefix());
     }
 
@@ -71,20 +62,12 @@ public class BasicCheckBoxMenuItemUITest
      * Test method for 'javax.swing.plaf.basic.BasicCheckBoxMenuItemUI.processMouseEvent(JMenuItem, MouseEvent, MenuElement[], MenuSelectionManager)'
      */
     public void testProcessMouseEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     /*
      * Test method for 'javax.swing.plaf.basic.BasicCheckBoxMenuItemUI.getMinimumSize(null)/getMaximumSize(null)'
      */
     public void testGetSizes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try { //Regression test for HARMONY-2695
             checkBoxUI.getMinimumSize(null);
             fail("NullPointerException should have been thrown");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java Sat Jun  5 08:34:57 2010
@@ -25,7 +25,6 @@ import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.colorchooser.AbstractColorChooserPanel;
 import javax.swing.colorchooser.DefaultColorSelectionModel;
-import tests.support.Support_Excludes;
 
 public class BasicColorChooserUITest extends BasicSwingTestCase {
     private JColorChooser ch;
@@ -47,30 +46,18 @@ public class BasicColorChooserUITest ext
     }
 
     public void testCreateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(BasicColorChooserUI.createUI(ch));
         assertNotSame(BasicColorChooserUI.createUI(ch), BasicColorChooserUI.createUI(ch));
         assertSame(BasicColorChooserUI.class, BasicColorChooserUI.createUI(ch).getClass());
     }
 
     public void testCreateDefaultChoosers() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createDefaultChoosers());
         assertNotSame(ui.createDefaultChoosers(), ui.createDefaultChoosers());
         assertEquals(3, ui.createDefaultChoosers().length);
     }
 
     public void testCreatePropertychangeListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createPropertyChangeListener());
         if (isHarmony()) {
             assertNotSame(ui.createPropertyChangeListener(), ui.createPropertyChangeListener());
@@ -80,10 +67,6 @@ public class BasicColorChooserUITest ext
     }
 
     public void testInstallUninstallPreviewPanel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(2, ch.getComponentCount());
         assertNotNull(findComponent(ch, JTabbedPane.class, true));
         ch.remove(ch.getComponent(1));
@@ -95,10 +78,6 @@ public class BasicColorChooserUITest ext
     }
 
     public void testUninstallDefaultChoosers() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(2, ch.getComponentCount());
         assertNotNull(findComponent(ch, JTabbedPane.class, true));
         assertEquals(3, ((JTabbedPane) findComponent(ch, JTabbedPane.class, true))
@@ -121,10 +100,6 @@ public class BasicColorChooserUITest ext
     }
 
     public void testInstallUninstallListeners() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallListeners();
         int propChangeListCount = ch.getPropertyChangeListeners().length;
         int changeListcount = ((DefaultColorSelectionModel) ch.getSelectionModel())

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboBoxUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboBoxUITest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboBoxUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboBoxUITest.java Sat Jun  5 08:34:57 2010
@@ -36,7 +36,6 @@ import javax.swing.ListCellRenderer;
 import javax.swing.SwingConstants;
 import javax.swing.SwingTestCase;
 import javax.swing.plaf.ComponentUI;
-import tests.support.Support_Excludes;
 
 public class BasicComboBoxUITest extends SwingTestCase {
     private BasicComboBoxUI ui;
@@ -64,19 +63,11 @@ public class BasicComboBoxUITest extends
     }
 
     public void testBasicComboBoxUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.currentValuePane);
         assertFalse(ui.currentValuePane.isVisible());
     }
 
     public void testCreateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicComboBoxUI.createUI(new JComboBox());
         assertNotNull(ui1);
         ComponentUI ui2 = BasicComboBoxUI.createUI(new JComboBox());
@@ -85,10 +76,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testCreatePopup() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.popup);
         ui.comboBox = comboBox;
         assertNotSame(ui.createPopup(), ui.createPopup());
@@ -96,84 +83,48 @@ public class BasicComboBoxUITest extends
     }
 
     public void testCreateKeyListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createKeyListener() instanceof BasicComboBoxUI.KeyHandler);
         }
     }
 
     public void testCreateFocusListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createFocusListener() instanceof BasicComboBoxUI.FocusHandler);
         }
     }
 
     public void testCreateListDataListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createListDataListener() instanceof BasicComboBoxUI.ListDataHandler);
         }
     }
 
     public void testCreateItemListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.createItemListener());
     }
 
     public void testCreatePropertyChangeListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createPropertyChangeListener() instanceof BasicComboBoxUI.PropertyChangeHandler);
         }
     }
 
     public void testCreateLayoutManager() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createLayoutManager() instanceof BasicComboBoxUI.ComboBoxLayoutManager);
         }
     }
 
     public void testCreateRenderer() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createRenderer() instanceof BasicComboBoxRenderer.UIResource);
     }
 
     public void testCreateEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createEditor().getClass() == BasicComboBoxEditor.UIResource.class);
     }
 
     public void testAddRemoveEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.uninstallComponents();
         assertEquals(0, ui.comboBox.getComponentCount());
@@ -188,10 +139,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testCreateArrowButton() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JButton arrowButton = ui.createArrowButton();
         assertTrue(arrowButton instanceof BasicArrowButton);
         assertEquals(SwingConstants.SOUTH, ((BasicArrowButton) arrowButton).getDirection());
@@ -199,10 +146,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testIsPopupVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         createVisibleCombo();
         ui.popup = new BasicComboPopup(comboBox);
         assertFalse(ui.isPopupVisible(comboBox));
@@ -213,10 +156,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testSetPopupVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         createVisibleCombo();
         ui.popup = new BasicComboPopup(comboBox);
         assertFalse(ui.isPopupVisible(comboBox));
@@ -227,10 +166,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testIsFocusTraversable() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         assertTrue(ui.isFocusTraversable(comboBox));
         comboBox.setEditable(true);
@@ -238,10 +173,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testGetPreferredSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.popup = new BasicComboPopup(comboBox);
         ui.listBox = ui.popup.getList();
@@ -253,10 +184,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testGetMinimumSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.installUI(comboBox);
         comboBox.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
@@ -278,10 +205,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testSelectNextPossibleValue() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         assertEquals(-1, comboBox.getSelectedIndex());
         ui.selectNextPossibleValue();
@@ -299,10 +222,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testSelectPreviousPossibleValue() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         assertEquals(-1, comboBox.getSelectedIndex());
         ui.selectPreviousPossibleValue();
@@ -323,10 +242,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testToggleOpenClose() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         createVisibleCombo();
         ui.popup = new BasicComboPopup(comboBox);
         assertFalse(ui.isPopupVisible(comboBox));
@@ -337,10 +252,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testRectangleForCurrentValue() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         Rectangle r1 = ui.rectangleForCurrentValue();
         assertEquals(new Rectangle(0, 0, 0, 0), r1);
@@ -350,10 +261,6 @@ public class BasicComboBoxUITest extends
 
     // Regression test for HARMONY-2896
     public void testGetAccessibleChildrenCount() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = null;
         try {
             ui.getAccessibleChildrenCount(new JComponent() {});
@@ -370,10 +277,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testGetInsets() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         assertEquals(comboBox.getInsets(), ui.getInsets());
         comboBox.setBorder(BorderFactory.createEmptyBorder(1, 2, 3, 4));
@@ -382,10 +285,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testGetDefaultSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.listBox = new BasicComboPopup(comboBox).getList();
         if (isHarmony()) {
@@ -399,10 +298,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testGetDisplaySize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.popup = new BasicComboPopup(comboBox);
         ui.listBox = ui.popup.getList();
@@ -420,10 +315,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testInstallDefaults() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         comboBox.setFont(null);
         comboBox.setForeground(null);
         comboBox.setBackground(null);
@@ -437,10 +328,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testInstallUninstallListeners() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.popup = new BasicComboPopup(comboBox);
         ui.uninstallListeners();
@@ -486,10 +373,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testInstallUninstallComponents() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.popup = new BasicComboPopup(comboBox);
         ui.uninstallComponents();
@@ -514,10 +397,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testInstallUninstallUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.popup = new BasicComboPopup(comboBox);
         ui.uninstallUI(null);
@@ -533,20 +412,12 @@ public class BasicComboBoxUITest extends
     }
 
     public void testPaintCurrentValueBackground() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.paintCurrentValueBackground(createTestGraphics(), new Rectangle(0, 0, 10, 10), true);
     }
 
     // Regression test for HARMONY-2898
     public void testPaintCurrentValueBackground_Null() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = null;
         try {
             ui.paintCurrentValueBackground(createTestGraphics(), new Rectangle(0, 0, 10, 10), true);
@@ -557,10 +428,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testPaintCurrentValue() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.popup = new BasicComboPopup(comboBox);
         ui.listBox = ui.popup.getList();
@@ -568,10 +435,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testPaint() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.popup = new BasicComboPopup(comboBox);
         ui.listBox = ui.popup.getList();
@@ -579,10 +442,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testConfigureUnconfigureEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.comboBox = comboBox;
         ui.editor = new JTextField();
         int focusListenerCount = ui.editor.getFocusListeners().length;
@@ -593,10 +452,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testConfigureUnconfigureArrowButton() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.configureArrowButton();
         ui.unconfigureArrowButton();
         ui.popup = new BasicComboPopup(comboBox);
@@ -614,10 +469,6 @@ public class BasicComboBoxUITest extends
     }
 
     public void testPropertyChangeHandler() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(comboBox);
         Font newFont = comboBox.getFont().deriveFont(30f);
         comboBox.setFont(newFont);
@@ -646,20 +497,12 @@ public class BasicComboBoxUITest extends
     }
 
     public void testRemove_NullEditor() throws Exception{
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression test for Harmony-1749
         BasicComboBoxUI cb = new BasicComboBoxUI();
         cb.removeEditor();
     }
 
     public void testComboBoxLayoutManager() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicComboBoxUI ui = new BasicComboBoxUI();
         BasicComboBoxUI.ComboBoxLayoutManager b = ui.new ComboBoxLayoutManager();
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboPopupTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboPopupTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboPopupTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicComboPopupTest.java Sat Jun  5 08:34:57 2010
@@ -31,7 +31,6 @@ import javax.swing.SwingTestCase;
 import javax.swing.border.LineBorder;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
-import tests.support.Support_Excludes;
 
 public class BasicComboPopupTest extends SwingTestCase {
     private BasicComboPopup popup;
@@ -56,10 +55,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testBasicComboPopup() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(popup.comboBox);
         assertNotNull(popup.list);
         assertNotNull(popup.scroller);
@@ -78,10 +73,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testShowHide() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         createVisibleComboBox();
         popup.show();
         assertTrue(popup.isShowing());
@@ -96,10 +87,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testGetList() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(popup.getList());
         assertEquals(popup.list, popup.getList());
         JList newList = new JList();
@@ -108,10 +95,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testGetMouseListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(popup.mouseListener);
         assertEquals(popup.getMouseListener(), popup.mouseListener);
         if (isHarmony()) {
@@ -120,10 +103,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testGetMouseMotionListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(popup.mouseMotionListener);
         assertEquals(popup.getMouseMotionListener(), popup.mouseMotionListener);
         if (isHarmony()) {
@@ -132,19 +111,11 @@ public class BasicComboPopupTest extends
     }
 
     public void testGetKeyListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(popup.keyListener);
         assertNull(popup.getKeyListener());
     }
 
     public void testUninstallingUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         comboBox = new JComboBox();
         int mouseListenerCount = comboBox.getMouseListeners().length;
         int mouseMotionListenerCount = comboBox.getMouseMotionListeners().length;
@@ -167,10 +138,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testFirePopupMenuWillBecomeVisibleInvisibleCanceled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         PopupMenuController comboController = new PopupMenuController();
         PopupMenuController popupController = new PopupMenuController();
         popup.addPopupMenuListener(popupController);
@@ -197,10 +164,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testCreateMouseListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(popup.createMouseListener().getClass() == BasicComboPopup.InvocationMouseHandler.class);
             assertFalse(popup.createMouseListener() == popup.createMouseListener());
@@ -208,10 +171,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testCreateMouseMotionListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(popup.createMouseMotionListener().getClass() == BasicComboPopup.InvocationMouseMotionHandler.class);
             assertFalse(popup.createMouseMotionListener() == popup.createMouseMotionListener());
@@ -219,36 +178,20 @@ public class BasicComboPopupTest extends
     }
 
     public void testCreateKeyListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(popup.createKeyListener());
     }
 
     public void testCreateListSelectionListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(popup.createListSelectionListener());
         assertNull(popup.listSelectionListener);
     }
 
     public void testCreateListDataListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(popup.createListDataListener());
         assertNull(popup.listDataListener);
     }
 
     public void testCreateListMouseListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(popup.listMouseListener.getClass() == BasicComboPopup.ListMouseHandler.class);
             assertTrue(popup.createListMouseListener().getClass() == BasicComboPopup.ListMouseHandler.class);
@@ -257,10 +200,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testCreateListMouseMotionListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(popup.listMouseMotionListener.getClass() == BasicComboPopup.ListMouseMotionHandler.class);
             assertTrue(popup.createListMouseMotionListener().getClass() == BasicComboPopup.ListMouseMotionHandler.class);
@@ -270,10 +209,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testCreatePropertyChangeListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(popup.propertyChangeListener.getClass() == BasicComboPopup.PropertyChangeHandler.class);
             assertTrue(popup.createPropertyChangeListener().getClass() == BasicComboPopup.PropertyChangeHandler.class);
@@ -283,10 +218,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testCreateItemListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(popup.itemListener.getClass() == BasicComboPopup.ItemHandler.class);
             assertTrue(popup.createItemListener().getClass() == BasicComboPopup.ItemHandler.class);
@@ -295,19 +226,11 @@ public class BasicComboPopupTest extends
     }
 
     public void testCreateList() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotSame(popup.createList(), popup.createList());
         assertNotSame(popup.createList(), popup.list);
     }
 
     public void testConfigureList() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         popup.list = new JList();
         int mouseListenerCount = popup.list.getMouseListeners().length;
         int mouseMotionListenerCount = popup.list.getMouseMotionListeners().length;
@@ -318,38 +241,22 @@ public class BasicComboPopupTest extends
     }
 
     public void testCreateScroller() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(popup.scroller);
         assertNotSame(popup.createScroller(), popup.createScroller());
         assertNotSame(popup.createScroller(), popup.scroller);
     }
 
     public void testConfigureScroller() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         popup.scroller = new JScrollPane();
         popup.configureScroller();
     }
 
     public void testInstallUninstallComboBoxModelListeners() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         popup.installComboBoxModelListeners(null);
         popup.uninstallComboBoxModelListeners(null);
     }
 
     public void testInstallUninstallComboBoxListeners() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int mouseListenerCount = comboBox.getMouseListeners().length;
         int mouseMotionListenerCount = comboBox.getMouseMotionListeners().length;
         int itemListenerCount = comboBox.getItemListeners().length;
@@ -365,10 +272,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testInstallUninstallKeyboardActions() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int count = popup.comboBox.getActionMap().allKeys().length;
         popup.uninstallKeyboardActions();
         assertEquals(count, popup.comboBox.getActionMap().allKeys().length);
@@ -377,10 +280,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testInstallListListeners() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int mouseListenerCount = popup.list.getMouseListeners().length;
         int mouseMotionListenerCount = popup.list.getMouseMotionListeners().length;
         int selectionListenerCount = popup.list.getListSelectionListeners().length;
@@ -391,18 +290,10 @@ public class BasicComboPopupTest extends
     }
 
     public void testIsFocusTraversable() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(popup.isFocusTraversable());
     }
 
     public void testStartStopAutoscrolloing() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(popup.autoscrollTimer);
         assertFalse(popup.isAutoScrolling);
         popup.startAutoScrolling(BasicComboPopup.SCROLL_UP);
@@ -418,10 +309,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testAutoScrollUpDown() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             createVisibleComboBox();
             popup.show();
@@ -440,20 +327,12 @@ public class BasicComboPopupTest extends
     }
 
     public void testGetAccessibleContext() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(popup.getAccessibleContext());
         //        Is not clear how it should be
         //        assertEquals(popup.comboBox, popup.getAccessibleContext().getAccessibleParent());
     }
 
     public void testTogglePopup() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         createVisibleComboBox();
         assertFalse(popup.isShowing());
         popup.togglePopup();
@@ -463,10 +342,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testConvertMouseEvent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MouseEvent original = createMouseEvent(0, 0);
         assertNotSame(original, popup.convertMouseEvent(original));
         comboBox.setLocation(0, 0);
@@ -482,10 +357,6 @@ public class BasicComboPopupTest extends
     }
 
     public void testGetPopupHeightForRowCount() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         popup = new BasicComboPopup(new JComboBox());
         assertEquals(100, popup.getPopupHeightForRowCount(0));
         assertEquals(100, popup.getPopupHeightForRowCount(1));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicDesktopPaneUIActionsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicDesktopPaneUIActionsTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicDesktopPaneUIActionsTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicDesktopPaneUIActionsTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import javax.swing.JDesktopPane;
 import javax.swing.JFrame;
 import javax.swing.JInternalFrame;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class BasicDesktopPaneUIActionsTest extends SwingTestCase {
     private JFrame frame;
@@ -66,10 +65,6 @@ public class BasicDesktopPaneUIActionsTe
     }
 
     public void testNavigateAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -101,40 +96,24 @@ public class BasicDesktopPaneUIActionsTe
     }
 
     public void testCloseAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AbstractAction action = ui.new CloseAction();
         action.actionPerformed(null);
         assertTrue(desktop.getSelectedFrame().isClosed());
     }
 
     public void testMaximizeAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AbstractAction action = ui.new MaximizeAction();
         action.actionPerformed(null);
         assertTrue(desktop.getSelectedFrame().isMaximum());
     }
 
     public void testMinimizeAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AbstractAction action = ui.new MinimizeAction();
         action.actionPerformed(null);
         assertTrue(desktop.getSelectedFrame().isIcon());
     }
 
     public void testOpenAction() throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AbstractAction action = ui.new OpenAction();
         desktop.getSelectedFrame().setMaximum(true);
         action.actionPerformed(null);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicEditorPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicEditorPaneUITest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicEditorPaneUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicEditorPaneUITest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import javax.swing.JTextField;
 import javax.swing.SwingTestCase;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.text.DefaultEditorKit;
-import tests.support.Support_Excludes;
 
 public class BasicEditorPaneUITest extends SwingTestCase {
     JEditorPane jep;
@@ -55,10 +54,6 @@ public class BasicEditorPaneUITest exten
     }
 
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicEditorPaneUI.createUI(jep);
         ComponentUI ui2 = BasicEditorPaneUI.createUI(jep);
         assertTrue(ui1 instanceof BasicEditorPaneUI);
@@ -70,10 +65,6 @@ public class BasicEditorPaneUITest exten
     }
 
     public void testGetEditorKit() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(jep.getEditorKit(), ui.getEditorKit(jep));
         jep.setContentType("text/html");
         assertEquals(jep.getEditorKit(), ui.getEditorKit(jep));
@@ -89,10 +80,6 @@ public class BasicEditorPaneUITest exten
     }
 
     public void testGetPropertyPrefix() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("EditorPane", ui.getPropertyPrefix());
     }
 
@@ -114,10 +101,6 @@ public class BasicEditorPaneUITest exten
     }
 
     public void testPropertyChange() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action a1[] = jep.getActions();
         Object a2[] = jep.getActionMap().getParent().getParent().allKeys();
         checkNames(a1, a2);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicFileChooserUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicFileChooserUITest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicFileChooserUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicFileChooserUITest.java Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ import javax.swing.JFileChooser;
 import javax.swing.JPanel;
 import javax.swing.SwingTestCase;
 import javax.swing.UIManager;
-import tests.support.Support_Excludes;
 
 public class BasicFileChooserUITest extends SwingTestCase {
     private BasicFileChooserUI ui;
@@ -46,10 +45,6 @@ public class BasicFileChooserUITest exte
     }
 
     public void testGetAcceptAllFileFilter() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         assertNotNull(ui.getAcceptAllFileFilter(fc));
         assertEquals(UIManager.getString("FileChooser.acceptAllFileFilterText"), ui
@@ -58,10 +53,6 @@ public class BasicFileChooserUITest exte
     }
 
     public void testGetApproveButtonText() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         assertEquals(UIManager.get("FileChooser.openDialogTitleText"), ui.getDialogTitle(fc));
         assertEquals(UIManager.get("FileChooser.openButtonText"), ui.getApproveButtonText(fc));
@@ -84,10 +75,6 @@ public class BasicFileChooserUITest exte
     }
 
     public void testGetApproveButtonToolTipText() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {     
             javax.swing.plaf.basic.BasicFileChooserUI b = 
                 new javax.swing.plaf.basic.BasicFileChooserUI(new JFileChooser("")); 
@@ -99,19 +86,11 @@ public class BasicFileChooserUITest exte
     }
 
     public void testGetModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         assertNotNull(ui.getModel());
     }
 
     public void testBasicFileView() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicFileChooserUI.BasicFileView fileView = new BasicFileChooserUI(fc).new BasicFileView();
         assertNotNull(fileView);
         assertEquals(0, fileView.iconCache.size());
@@ -133,27 +112,15 @@ public class BasicFileChooserUITest exte
     }
 
     public void testCreatePropertyChangeListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.createPropertyChangeListener(fc));
     }
 
     public void testGetApproveButton() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         assertNull(ui.getApproveButton(fc));
     }
 
     public void testGetDialogTitle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getDialogTitle(fc));
         ui.installUI(fc);
         fc.setDialogTitle("my");
@@ -161,20 +128,12 @@ public class BasicFileChooserUITest exte
     }
 
     public void testGetFileView() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         assertNotNull(ui.getFileView(fc));
         assertTrue(ui.getFileView(fc) instanceof BasicFileChooserUI.BasicFileView);
     }
 
     public void testGetSetDirectory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getDirectory());
         ui.installUI(fc);
         assertNull(ui.getDirectory());
@@ -184,30 +143,18 @@ public class BasicFileChooserUITest exte
     }
 
     public void testGetSetDirectoryName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getDirectoryName());
         ui.setDirectoryName("a");
         assertNull(ui.getDirectoryName());
     }
 
     public void testGetSetDirectorySelected() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.isDirectorySelected());
         ui.setDirectorySelected(true);
         assertTrue(ui.isDirectorySelected());
     }
 
     public void testGetAccessoryPanel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getAccessoryPanel());
         ui.installUI(fc);
         assertNotNull(ui.getAccessoryPanel());
@@ -217,30 +164,18 @@ public class BasicFileChooserUITest exte
     }
 
     public void testGetApproveButtonAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         assertNotNull(ui.getApproveSelectionAction());
         assertEquals(ui.getApproveSelectionAction(), ui.getApproveSelectionAction());
     }
 
     public void testGetPreferredSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getPreferredSize(fc));
         ui.installUI(fc);
         assertNull(ui.getPreferredSize(fc));
     }
 
     public void testEnsureFileIsVisible() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {   
             BasicFileChooserUI fc = new BasicFileChooserUI(null);  
             fc.ensureFileIsVisible(new JFileChooser(), new File("a")); 
@@ -251,10 +186,6 @@ public class BasicFileChooserUITest exte
     }
 
     public void testInstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             new BasicFileChooserUI(null) {
                 public void installDefaults(JFileChooser fc) {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicGraphicsUtilsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicGraphicsUtilsTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicGraphicsUtilsTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicGraphicsUtilsTest.java Sat Jun  5 08:34:57 2010
@@ -34,7 +34,6 @@ import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class BasicGraphicsUtilsTest extends SwingTestCase {
     private JFrame frame;
@@ -77,18 +76,10 @@ public class BasicGraphicsUtilsTest exte
     }
 
     public void testBasicGraphicsUtils() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         new BasicGraphicsUtils();
     }
 
     public void testDrawEtchedRect() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Color color = g.getColor();
         BasicGraphicsUtils.drawEtchedRect(g, x, y, w, h, shadow, darkShadow, highlight,
                 lightHighlight);
@@ -96,36 +87,20 @@ public class BasicGraphicsUtilsTest exte
     }
 
     public void testGetEtchedInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Insets(2, 2, 2, 2), BasicGraphicsUtils.getEtchedInsets());
     }
 
     public void testDrawGroove() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Color color = g.getColor();
         BasicGraphicsUtils.drawGroove(g, x, y, w, h, shadow, highlight);
         assertSame(color, g.getColor());
     }
 
     public void testGetGrooveInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Insets(2, 2, 2, 2), BasicGraphicsUtils.getGrooveInsets());
     }
 
     public void testDrawBezel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Color color = g.getColor();
         BasicGraphicsUtils.drawBezel(g, x, y, w, h, true, true, shadow, darkShadow, highlight,
                 lightHighlight);
@@ -139,10 +114,6 @@ public class BasicGraphicsUtilsTest exte
     }
 
     public void testDrawLoweredBezel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Color color = g.getColor();
         BasicGraphicsUtils.drawLoweredBezel(g, x, y, w, h, shadow, darkShadow, highlight,
                 lightHighlight);
@@ -152,26 +123,14 @@ public class BasicGraphicsUtilsTest exte
     }
 
     public void testDrawString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // TODO: implement
     }
 
     public void testDrawStringUnderlineCharAt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // TODO: implement
     }
 
     public void testDrawDashedRect() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         g = new DebugGraphics(g);
         Color color = g.getColor();
         BasicGraphicsUtils.drawDashedRect(g, x, y, w, h);
@@ -179,10 +138,6 @@ public class BasicGraphicsUtilsTest exte
     }
 
     public void testGetPreferredButtonSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = new ImageIcon(new BufferedImage(10, 20, BufferedImage.TYPE_INT_RGB));
         JMenuItem item = new JMenuItem() {
             private static final long serialVersionUID = 1L;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicInternalFrameTitlePaneTest.java Sat Jun  5 08:34:57 2010
@@ -39,7 +39,6 @@ import javax.swing.UIManager;
 import javax.swing.event.InternalFrameAdapter;
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.plaf.metal.MetalInternalFrameTitlePane;
-import tests.support.Support_Excludes;
 
 public class BasicInternalFrameTitlePaneTest extends SwingTestCase {
     private BasicInternalFrameTitlePane pane;
@@ -116,10 +115,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testAddSubComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = new JInternalFrame("", true, true, true, true);
         pane = new BasicInternalFrameTitlePane(frame);
         assertEquals(4, pane.getComponentCount());
@@ -131,10 +126,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testCreateActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pane.createActions();
         // test created actions
         assertTrue("closeAction != null", pane.closeAction != null);
@@ -158,10 +149,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testCreateButtons() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pane.createButtons();
         // test created buttons
         assertTrue("maxButton != null", pane.maxButton != null);
@@ -173,10 +160,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testEnableActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // iconifyAction test
         frame.setIconifiable(false);
         checkEnabledActions();
@@ -220,10 +203,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testInstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(UIManager.getIcon("InternalFrame.closeIcon"), pane.closeIcon);
         assertSame(UIManager.getIcon("InternalFrame.maximizeIcon"), pane.maxIcon);
         assertSame(UIManager.getIcon("InternalFrame.minimizeIcon"), pane.minIcon);
@@ -240,10 +219,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testInstallUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pane.uninstallListeners();
         assertFalse("listener was uninstalled", belongs(pane.propertyChangeListener, frame
                 .getPropertyChangeListeners()));
@@ -257,10 +232,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testInstallTitlePane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pane.installTitlePane();
         assertSame(UIManager.getIcon("InternalFrame.closeIcon"), pane.closeIcon);
         assertTrue("listener != null", pane.propertyChangeListener != null);
@@ -275,10 +246,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testSetButtonIcons() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkButtonIcons();
         // test icons in Maximum state
         frame.setMaximizable(true);
@@ -309,10 +276,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testShowSystemMenu() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         createAndShowRootFrame();
         pane.showSystemMenu();
         assertTrue("", pane.windowMenu.isPopupMenuVisible());
@@ -326,28 +289,16 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testUninstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // nothing to test
     }
 
     public void testBasicInternalFrameTitlePane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pane = new BasicInternalFrameTitlePane(frame);
         assertTrue("frame is set", pane.frame == frame);
         assertTrue("layout", pane.getLayout() != null);
     }
 
     public void testGetTitle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         createAndShowRootFrame();
         final String title = "Document #1";
         Font font = new Font("Fixed", Font.PLAIN, 10);
@@ -359,38 +310,22 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testCreateSystemMenuBar() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenuBar menuBar = pane.createSystemMenuBar();
         assertEquals(0, menuBar.getMenuCount());
     }
 
     public void testAddSystemMenuItems() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenu menu = new JMenu();
         pane.addSystemMenuItems(menu);
         assertEquals(7, menu.getItemCount());
     }
 
     public void testCreateSystemMenu() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenu menu = pane.createSystemMenu();
         assertEquals(0, menu.getItemCount());
     }
 
     public void testAssembleSystemMenu() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pane.assembleSystemMenu();
         assertTrue("windowMenu != null", pane.windowMenu != null);
         assertEquals("7 items", 7, pane.windowMenu.getItemCount());
@@ -399,10 +334,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testPostClosingEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         class MyInternalFrameAdapter extends InternalFrameAdapter {
             boolean ok = false;
 
@@ -420,10 +351,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testCreatePropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         PropertyChangeListener listener = pane.createPropertyChangeListener();
         assertTrue("!= null", listener != null);
         if (isHarmony()) {
@@ -433,10 +360,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testCreateLayout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         LayoutManager layout = pane.createLayout();
         assertTrue("!= null", layout != null);
         if (isHarmony()) {
@@ -446,10 +369,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testCloseButton() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test with isClosable == false
         pane.closeButton.doClick(0);
         assertFalse("not closed", frame.isClosed());
@@ -460,10 +379,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testIconifyButton() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test with isIconifiable == false
         pane.iconButton.doClick(0);
         assertFalse("not iconified", frame.isIcon());
@@ -488,10 +403,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testMaximizeButton() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test with isMaximizable == false
         pane.maxButton.doClick(0);
         assertFalse("not maximized", frame.isMaximum());
@@ -520,10 +431,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testRestoreAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setMaximizable(true);
         pane.maxButton.doClick(0);
         assertTrue("maximized", frame.isMaximum());
@@ -555,26 +462,14 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testSizeAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // cannot test
     }
 
     public void testMoveAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // cannot test
     }
 
     public void testTitlePaneLayout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         LayoutManager layout = pane.new TitlePaneLayout();
         pane.setSize(200, 31);
         final Rectangle menuBarBounds = new Rectangle(2, 7, 16, 16);
@@ -613,10 +508,6 @@ public class BasicInternalFrameTitlePane
 
     @SuppressWarnings("deprecation")
     public void testSystemMenuBar() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenuBar menuBar = pane.new SystemMenuBar();
         assertTrue("opaque", menuBar.isOpaque());
         assertFalse("isFocusTraversable", menuBar.isFocusTraversable());
@@ -624,10 +515,6 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testPropertyChangeHandler() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test "iconable" property change
         frame.setIconifiable(false);
         frame.setIconifiable(true);
@@ -649,19 +536,11 @@ public class BasicInternalFrameTitlePane
     }
 
     public void testPaintTitleBackground() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     
     public void testConstructor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {     
             new BasicInternalFrameTitlePane((JInternalFrame) null); 
             fail("NPE should be thrown");
@@ -670,10 +549,6 @@ public class BasicInternalFrameTitlePane
         }
     }
     public void testPaintComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
     
@@ -681,10 +556,6 @@ public class BasicInternalFrameTitlePane
      * Regression test for HARMONY-2608
      * */
     public void testMoveActionKey() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicInternalFrameTitlePane.MoveAction m = pane.new MoveAction();
         assertEquals(1, m.getKeys().length);
         String key = (String)m.getKeys()[0];
@@ -696,10 +567,6 @@ public class BasicInternalFrameTitlePane
      * Regression test for HARMONY-2608
      * */
     public void testMoveActionPerformed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicInternalFrameTitlePane.MoveAction m = pane.new MoveAction();
         try {
             m.actionPerformed(null);
@@ -712,10 +579,6 @@ public class BasicInternalFrameTitlePane
      * Regression test for HARMONY-2604
      * */
     public void testSizeActionPerformed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String str = "test string";
         JInternalFrame jf = new JInternalFrame(str);
         MetalInternalFrameTitlePane jp = new MetalInternalFrameTitlePane(jf);
@@ -731,10 +594,6 @@ public class BasicInternalFrameTitlePane
      * Regression test for HARMONY-2588
      * */
     public void testSizeActionKey() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String str = "test string";
         JInternalFrame jf = new JInternalFrame(str);
         MetalInternalFrameTitlePane jp = new MetalInternalFrameTitlePane(jf);



Mime
View raw message