harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [13/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/plaf/basic/BasicInternalFrameUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicInternalFrameUITest.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/BasicInternalFrameUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicInternalFrameUITest.java Sat Jun  5 08:34:57 2010
@@ -39,7 +39,6 @@ import javax.swing.UIManager;
 import javax.swing.event.MouseInputAdapter;
 import javax.swing.event.MouseInputListener;
 import javax.swing.plaf.ComponentUI;
-import tests.support.Support_Excludes;
 
 public class BasicInternalFrameUITest extends SwingTestCase {
 
@@ -88,10 +87,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void createInternalFrameListener()
      */
     public void testCreateInternalFrameListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // cannot test createInternalFrameListener() directly, because
         // it only sets BasicInternalFrameUI.internalFrameListener field
         // which is private
@@ -109,10 +104,6 @@ public class BasicInternalFrameUITest ex
      *   void uninstallComponents()
      */
     public void testInstallUninstallComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.frame = frame;
         ui.installComponents();
         assertTrue("titlePane installed", belongs(ui.titlePane, frame.getComponents()));
@@ -127,10 +118,6 @@ public class BasicInternalFrameUITest ex
      * Class is under test for void installDefaults()
      */
     public void testInstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setBackground(null);
         frame.setBorder(null);
         frame.setFrameIcon(null);
@@ -149,10 +136,6 @@ public class BasicInternalFrameUITest ex
      * Class is under test for void uninstallDefaults()
      */
     public void testUninstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         // test general uninstallDefaults()
         ui.uninstallDefaults();
@@ -173,10 +156,6 @@ public class BasicInternalFrameUITest ex
      * Class is under test for void installKeyboardActions()
      */
     public void testInstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         UIManager.getDefaults().put("InternalFrame.windowBindings",
                 new Object[] { "shift ESCAPE", "showSystemMenu" });
         frame.setUI(ui);
@@ -195,10 +174,6 @@ public class BasicInternalFrameUITest ex
      * Class is under test for void uninstallKeyboardActions()
      */
     public void testUninstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         UIManager.getDefaults().put("InternalFrame.windowBindings",
                 new Object[] { "shift ESCAPE", "showSystemMenu" });
         frame.setUI(ui);
@@ -219,10 +194,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void installListeners()
      */
     public void testInstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JFrame f = new JFrame();
         f.setSize(50, 100);
         f.getContentPane().add(frame);
@@ -255,10 +226,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void uninstallListeners()
      */
     public void testUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JFrame f = new JFrame();
         f.setSize(50, 100);
         f.getContentPane().add(frame);
@@ -288,10 +255,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void setupMenuCloseKey()
      */
     public void testSetupMenuCloseKey() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // the function does nothing, just check that it doesn't crash
         ui.setupMenuCloseKey();
     }
@@ -300,10 +263,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void setupMenuOpenKey()
      */
     public void testSetupMenuOpenKey() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         assertNull("inputMap not installed", SwingUtilities.getUIInputMap(frame,
                 JComponent.WHEN_IN_FOCUSED_WINDOW));
@@ -335,10 +294,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void BasicInternalFrameUI(JInternalFrame)
      */
     public void testBasicInternalFrameUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui = new BasicInternalFrameUI(frame);
         assertTrue("frame is not set", ui.frame != frame);
         assertTrue("ui is not installed", frame.getUI() != ui);
@@ -348,10 +303,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for MouseInputAdapter createBorderListener(JInternalFrame)
      */
     public void testCreateBorderListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MouseInputAdapter listener1 = ui.createBorderListener(frame);
         assertTrue("not null", listener1 != null);
         assertTrue("instanceof BorderListener",
@@ -364,10 +315,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for JComponent createWestPane(JInternalFrame)
      */
     public void testCreateWestPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         assertNull("null", ui.createWestPane(frame));
         assertNull("null", ui.createWestPane(null));
@@ -377,10 +324,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for JComponent createSouthPane(JInternalFrame)
      */
     public void testCreateSouthPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         assertNull("null", ui.createSouthPane(frame));
         assertNull("null", ui.createSouthPane(null));
@@ -390,10 +333,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for JComponent createNorthPane(JInternalFrame)
      */
     public void testCreateNorthPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComponent comp = ui.createNorthPane(frame);
         assertTrue("title pane", comp instanceof BasicInternalFrameTitlePane);
         assertFalse("doesn't belong", belongs(comp, frame.getComponents()));
@@ -426,10 +365,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for JComponent createEastPane(JInternalFrame)
      */
     public void testCreateEastPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         assertNull("null", ui.createEastPane(frame));
         assertNull("null", ui.createEastPane(null));
@@ -439,10 +374,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void replacePane(JComponent, JComponent)
      */
     public void testReplacePane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JComponent comp = new JButton("OK");
         // ordinary replace
@@ -470,10 +401,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for Dimension getPreferredSize(JComponent)
      */
     public void testGetPreferredSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setPreferredSize(new Dimension(200, 200));
         Dimension standardSize = new Dimension(100, 100);
         // ui is not installed into the frame
@@ -492,10 +419,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for Dimension getMinimumSize(JComponent)
      */
     public void testGetMinimumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setMinimumSize(new Dimension(200, 200));
         Dimension standardSize = new Dimension(0, 0);
         // ui is not installed into the frame
@@ -514,10 +437,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for Dimension getMaximumSize(JComponent)
      */
     public void testGetMaximumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(frame);
         // ui is installed into the frame
         Dimension size = ui.getMaximumSize(frame);
@@ -532,10 +451,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for MouseInputListener createGlassPaneDispatcher()
      */
     public void testCreateGlassPaneDispatcher() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MouseInputListener listener1 = ui.createGlassPaneDispatcher();
         assertTrue("not null", listener1 != null);
         assertNotSame(listener1, ui.glassPaneDispatcher);
@@ -545,10 +460,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void minimizeFrame(JInternalFrame)
      */
     public void testMinimizeFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Dimension size = new Dimension(10, 20);
         frame.setUI(ui);
         frame.setSize(size);
@@ -571,10 +482,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void maximizeFrame(JInternalFrame)
      */
     public void testMaximizeFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JDesktopPane desktop = new JDesktopPane();
         desktop.setSize(new Dimension(100, 200));
@@ -587,10 +494,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void iconifyFrame(JInternalFrame)
      */
     public void testIconifyFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JDesktopPane desktop = new JDesktopPane();
         desktop.setSize(new Dimension(100, 200));
@@ -603,10 +506,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void deiconifyFrame(JInternalFrame)
      */
     public void testDeiconifyFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JDesktopPane desktop = new JDesktopPane();
         desktop.setSize(new Dimension(100, 200));
@@ -627,10 +526,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void activateFrame(JInternalFrame)
      */
     public void testActivateFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JDesktopPane desktop = new JDesktopPane();
         desktop.setSize(new Dimension(100, 200));
@@ -644,10 +539,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void deactivateFrame(JInternalFrame)
      */
     public void testDeactivateFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JDesktopPane desktop = new JDesktopPane();
         desktop.setSize(new Dimension(100, 200));
@@ -662,10 +553,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void closeFrame(JInternalFrame)
      */
     public void testCloseFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JDesktopPane desktop = new JDesktopPane();
         desktop.setSize(new Dimension(100, 200));
@@ -681,10 +568,6 @@ public class BasicInternalFrameUITest ex
      *     JComponent getWestPane()
      */
     public void testSetGetWestPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JButton comp = new JButton("ok");
         // null by default
@@ -705,10 +588,6 @@ public class BasicInternalFrameUITest ex
      *     JComponent getSouthPane()
      */
     public void testSetGetSouthPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JButton comp = new JButton("ok");
         // null by default
@@ -729,10 +608,6 @@ public class BasicInternalFrameUITest ex
      *     JComponent getNorthPane()
      */
     public void testSetGetNorthPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JComponent comp = new JButton("ok");
         // not null by default
@@ -753,10 +628,6 @@ public class BasicInternalFrameUITest ex
      *     JComponent getEastPane()
      */
     public void testSetGetEastPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         JButton comp = new JButton("ok");
         // null by default
@@ -775,10 +646,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for ComponentUI createUI(JComponent)
      */
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicInternalFrameUI.createUI(frame);
         ComponentUI ui2 = BasicInternalFrameUI.createUI(frame);
         assertTrue("not null", ui1 != null);
@@ -789,10 +656,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void installUI(JComponent)
      */
     public void testInstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setBorder(null);
         ui.installUI(frame);
         // we'll check only some key points
@@ -807,10 +670,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void uninstallUI(JComponent)
      */
     public void testUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(frame);
         ui.uninstallUI(frame);
         // we'll check only some key points
@@ -824,10 +683,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void installMouseHandlers(JComponent)
      */
     public void testInstallMouseHandlers() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.borderListener = ui.createBorderListener(frame);
         // install to frame
         ui.installMouseHandlers(frame);
@@ -853,10 +708,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for void deinstallMouseHandlers(JComponent)
      */
     public void testDeinstallMouseHandlers() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.borderListener = ui.createBorderListener(frame);
         ui.installMouseHandlers(frame);
         ui.titlePane = new BasicInternalFrameTitlePane(frame);
@@ -879,10 +730,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for DesktopManager getDesktopManager()
      */
     public void testGetDesktopManager() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         // no desktop pane, the default desktop manager is created
         DesktopManager manager1 = ui.getDesktopManager();
@@ -904,10 +751,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for DesktopManager createDesktopManager()
      */
     public void testCreateDesktopManager() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DesktopManager manager1 = ui.createDesktopManager();
         assertTrue("not null", manager1 != null);
         DesktopManager manager2 = ui.createDesktopManager();
@@ -918,10 +761,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for PropertyChangeListener createPropertyChangeListener()
      */
     public void testCreatePropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         PropertyChangeListener listener1 = ui.createPropertyChangeListener();
         assertTrue("not null", listener1 != null);
         PropertyChangeListener listener2 = ui.createPropertyChangeListener();
@@ -933,10 +772,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for ComponentListener createComponentListener()
      */
     public void testCreateComponentListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentListener listener1 = ui.createComponentListener();
         assertTrue("not null", listener1 != null);
         assertNotSame(listener1, ui.componentListener);
@@ -946,10 +781,6 @@ public class BasicInternalFrameUITest ex
      * Class under test for LayoutManager createLayoutManager()
      */
     public void testCreateLayoutManager() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         LayoutManager layout = ui.createLayoutManager();
         assertTrue("not null", layout != null);
         if (isHarmony()) {
@@ -965,10 +796,6 @@ public class BasicInternalFrameUITest ex
      *     boolean isKeyBindingRegistered()
      */
     public void testSetIsKeyBindingRegistered() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         assertFalse("false by default", ui.isKeyBindingRegistered());
         ui.setKeyBindingRegistered(true);
@@ -983,10 +810,6 @@ public class BasicInternalFrameUITest ex
      *     boolean isKeyBindingActive()
      */
     public void testSetIsKeyBindingActive() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame.setUI(ui);
         assertFalse("false by default", ui.isKeyBindingActive());
         ui.setKeyBindingActive(true);
@@ -996,42 +819,22 @@ public class BasicInternalFrameUITest ex
     }
 
     public void testBorderListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // the documentation is empty
     }
 
     public void testBasicInternalFrameListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // the documentation is empty
     }
 
     public void testComponentHandler() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // the documentation is empty
     }
 
     public void testGlassPaneDispatcher() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // the documentation is empty
     }
 
     public void testInternalFramePropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // the documentation is empty
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicListUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicListUITest.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/BasicListUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicListUITest.java Sat Jun  5 08:34:57 2010
@@ -38,7 +38,6 @@ import javax.swing.border.Border;
 import javax.swing.plaf.BorderUIResource;
 import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.FontUIResource;
-import tests.support.Support_Excludes;
 
 public class BasicListUITest extends SwingTestCase {
     private JList list;
@@ -84,10 +83,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testBasicListUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, ui.cellHeight);
         assertEquals(-1, ui.cellWidth);
         assertNull(ui.cellHeights);
@@ -97,10 +92,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testBasicListUI_FocusListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.focusListener);
         int listenersCount = list.getFocusListeners().length;
         ui.installUI(list);
@@ -115,17 +106,9 @@ public class BasicListUITest extends Swi
     }
 
     public void testBasicListUI_ListDataHandler() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testConvertRowToY() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertEquals(-1, ui.convertRowToY(0));
         assertEquals(-1, ui.convertRowToY(-1));
@@ -139,10 +122,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testConvertYToRow() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertEquals(-1, ui.convertYToRow(0));
         list.setListData(new Object[] { "a", "b" });
@@ -155,70 +134,42 @@ public class BasicListUITest extends Swi
     }
 
     public void testCreateFocusListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createFocusListener() instanceof BasicListUI.FocusHandler);
         }
     }
 
     public void testCreateListDataListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createListDataListener() instanceof BasicListUI.ListDataHandler);
         }
     }
 
     public void testCreateListSelectionListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createListSelectionListener() instanceof BasicListUI.ListSelectionHandler);
         }
     }
 
     public void testCreateMouseInputListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createMouseInputListener() instanceof BasicListUI.MouseInputHandler);
         }
     }
 
     public void testCreatePropertyChangeListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertTrue(ui.createPropertyChangeListener() instanceof BasicListUI.PropertyChangeHandler);
         }
     }
 
     public void testCreateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicListUI newUI1 = (BasicListUI) BasicListUI.createUI(list);
         BasicListUI newUI2 = (BasicListUI) BasicListUI.createUI(list);
         assertNotSame(newUI1, newUI2);
     }
 
     public void testGetCellBounds() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertNull(ui.getCellBounds(list, 0, 0));
         assertNull(ui.getCellBounds(list, -1, -1));
@@ -240,10 +191,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testGetCellBounds_Null() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testExceptionalCase(new NullPointerCase() {
             @Override
             public void exceptionalAction() throws Exception {
@@ -259,28 +206,16 @@ public class BasicListUITest extends Swi
     }
 
     public void testGetMaximumSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertEquals(ui.getPreferredSize(list), ui.getMaximumSize(list));
     }
 
     public void testGetMinimumSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertEquals(ui.getPreferredSize(list), ui.getMinimumSize(list));
     }
 
     public void testGetPreferredSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         list.setSize(100, 100);
         assertEquals(new Dimension(0, 0), ui.getPreferredSize(list));
@@ -299,10 +234,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testGetRowHeight() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, ui.getRowHeight(-1));
         ui.installUI(list);
         assertEquals(-1, ui.getRowHeight(0));
@@ -319,10 +250,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testIndexToLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertNull(ui.indexToLocation(list, -1));
         assertNull(ui.indexToLocation(list, 0));
@@ -341,10 +268,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testInstallDefaults() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         UIManager.getDefaults().put("List.background", new ColorUIResource(Color.red));
         UIManager.getDefaults().put("List.foreground", new ColorUIResource(Color.yellow));
         Font font = new FontUIResource(list.getFont().deriveFont(100f));
@@ -363,10 +286,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testUninstallDefaults() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         UIManager.getDefaults().put("List.background", new ColorUIResource(Color.red));
         UIManager.getDefaults().put("List.foreground", new ColorUIResource(Color.yellow));
         Font font = new FontUIResource(list.getFont().deriveFont(100f));
@@ -396,29 +315,17 @@ public class BasicListUITest extends Swi
     }
 
     public void testInstallKeyboardActions() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         list.setUI(ui);
         assertNotNull(SwingUtilities.getUIInputMap(list, JComponent.WHEN_FOCUSED));
     }
 
     public void testUninstallKeyboardActions() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         list.setUI(ui);
         ui.uninstallKeyboardActions();
         assertNull(SwingUtilities.getUIInputMap(list, JComponent.WHEN_FOCUSED));
     }
 
     public void testInstallListeners() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         list.setUI(ui);
         assertNotNull(ui.focusListener);
         assertTrue(list.getFocusListeners().length > 0);
@@ -431,10 +338,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testUninstallListeners() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         list.setUI(ui);
         int focusListenersCount = list.getFocusListeners().length;
         int mouseListenersCount = list.getMouseListeners().length;
@@ -452,10 +355,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testInstallUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertNotNull(list.getBackground());
         assertNotNull(SwingUtilities.getUIInputMap(list, JComponent.WHEN_FOCUSED));
@@ -465,10 +364,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testUninstallUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         list.setUI(ui);
         ui.uninstallUI(list);
         if (isHarmony()) {
@@ -479,10 +374,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testLocationToIndex() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertEquals(-1, ui.locationToIndex(list, new Point(3, 3)));
         list.setListData(new Object[] { "aa", "bb" });
@@ -508,10 +399,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testMaybeUpdateLayoutState() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertTrue(ui.updateLayoutStateNeeded != 0);
         ui.maybeUpdateLayoutState();
@@ -520,25 +407,13 @@ public class BasicListUITest extends Swi
 
     //TODO
     public void testPaint() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     //TODO
     public void testPaintCell() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testUpdateLayoutState() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         assertEquals(-1, ui.cellHeight);
         assertEquals(-1, ui.cellWidth);
@@ -564,10 +439,6 @@ public class BasicListUITest extends Swi
     }
 
     public void testSelectNextPreviousIndex() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(list);
         list.setListData(new Object[] { "1", "2", "3" });
         assertTrue(list.isSelectionEmpty());
@@ -636,10 +507,6 @@ public class BasicListUITest extends Swi
      * Regression test for HARMONY-2653 
      * */
     public void testRGetPreferredSize() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try { 
             BasicListUI bl = new BasicListUI(); 
             bl.getPreferredSize(new JFileChooser() ); 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuItemUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuItemUITest.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/BasicMenuItemUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuItemUITest.java Sat Jun  5 08:34:57 2010
@@ -46,7 +46,6 @@ import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.InsetsUIResource;
-import tests.support.Support_Excludes;
 
 public class BasicMenuItemUITest extends SwingTestCase {
     protected String prefix;
@@ -80,10 +79,6 @@ public class BasicMenuItemUITest extends
      */
     @SuppressWarnings("deprecation")
     public void testPaint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JFrame frame = new JFrame();
         JMenuItem item = new JMenuItem();
         item.setUI(menuItemUI);
@@ -97,10 +92,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.getPreferredSize(JComponent)'
      */
     public void testGetSizes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenuItem item = new JMenuItem() {
             private static final long serialVersionUID = 1L;
 
@@ -148,10 +139,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.uninstallUI(JComponent)'
      */
     public void testInstallUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenuItem item = new JMenuItem();
         menuItemUI.installUI(item);
         assertNotNull(item.getBorder());
@@ -176,10 +163,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.createUI(JComponent)'
      */
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicMenuItemUI.createUI(null);
         ComponentUI ui2 = BasicMenuItemUI.createUI(null);
         assertTrue(ui1 instanceof BasicMenuItemUI);
@@ -190,10 +173,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.installDefaults()'
      */
     public void testInstallUninstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenuItem item = new JMenuItem();
         item.setUI(menuItemUI);
         UIManager.getDefaults().put(prefix + "background", new ColorUIResource(Color.red));
@@ -263,10 +242,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.getPropertyPrefix()'
      */
     public void testGetPropertyPrefix() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("MenuItem", menuItemUI.getPropertyPrefix());
     }
 
@@ -274,10 +249,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.installListeners()'
      */
     public void testInstallUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenuItem item = new JMenuItem();
         menuItemUI = (BasicMenuItemUI) item.getUI();
         menuItemUI.uninstallListeners();
@@ -311,10 +282,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.installKeyboardActions()'
      */
     public void testInstallUninstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenuItem item = new JMenuItem();
         item.setUI(menuItemUI);
         menuItemUI.uninstallKeyboardActions();
@@ -336,10 +303,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.createMouseInputListener(JComponent)'
      */
     public void testCreateMouseInputListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(menuItemUI.createMouseInputListener(null));
     }
 
@@ -347,10 +310,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.createMenuDragMouseListener(JComponent)'
      */
     public void testCreateMenuDragMouseListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(menuItemUI.createMenuDragMouseListener(null));
     }
 
@@ -358,10 +317,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.createMenuKeyListener(JComponent)'
      */
     public void testCreateMenuKeyListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertNull(menuItemUI.createMenuKeyListener(null));
         } else {
@@ -373,10 +328,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.getPreferredMenuItemSize(JComponent, Icon, Icon, int)'
      */
     public void testGetPreferredMenuItemSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon1 = null;
         Icon icon2 = new ImageIcon(new BufferedImage(10, 20, BufferedImage.TYPE_INT_RGB));
         Icon icon3 = new ImageIcon(new BufferedImage(100, 20, BufferedImage.TYPE_INT_RGB));
@@ -418,10 +369,6 @@ public class BasicMenuItemUITest extends
      */
     @SuppressWarnings("deprecation")
     public void testGetPath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JFrame frame = new JFrame();
         JMenuBar menuBar = new JMenuBar();
         JMenu menu = new JMenu("menu");
@@ -463,10 +410,6 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.doClick(MenuSelectionManager)'
      */
     public void testDoClick() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         class MyJMenuItem extends 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/BasicMenuUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUITest.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/BasicMenuUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUITest.java Sat Jun  5 08:34:57 2010
@@ -39,7 +39,6 @@ import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.InsetsUIResource;
-import tests.support.Support_Excludes;
 
 public class BasicMenuUITest extends SwingTestCase {
     protected BasicMenuUI menuUI;
@@ -68,10 +67,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.getMaximumSize(JComponent)'
      */
     public void testGetMaximumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenuBar bar = new JMenuBar();
         JMenu menu1 = new JMenu();
         menu1.setUI(menuUI);
@@ -100,10 +95,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createUI(JComponent)'
      */
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicMenuUI.createUI(null);
         ComponentUI ui2 = BasicMenuUI.createUI(null);
         assertTrue(ui1 instanceof BasicMenuUI);
@@ -114,10 +105,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.getPropertyPrefix()'
      */
     public void testGetPropertyPrefix() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("Menu", menuUI.getPropertyPrefix());
     }
 
@@ -125,10 +112,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.installDefaults()'
      */
     public void testInstallUninstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenu menu = new JMenu();
         UIManager.getDefaults().put("Menu.background", new ColorUIResource(Color.red));
         UIManager.getDefaults().put("Menu.foreground", new ColorUIResource(Color.yellow));
@@ -194,10 +177,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.installListeners()'
      */
     public void testInstallUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenu menu = new JMenu();
         menuUI = (BasicMenuUI) menu.getUI();
         menuUI.uninstallListeners();
@@ -243,10 +222,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.installKeyboardActions()'
      */
     public void testInstallUninstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenu menu = new JMenu();
         menu.setUI(menuUI);
         menuUI.uninstallKeyboardActions();
@@ -271,10 +246,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createMouseInputListener(JComponent)'
      */
     public void testCreateMouseInputListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(menuUI.createMouseInputListener(null));
     }
 
@@ -282,10 +253,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createMenuDragMouseListener(JComponent)'
      */
     public void testCreateMenuDragMouseListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(menuUI.createMenuDragMouseListener(null));
         if (isHarmony()) {
             assertSame(menuUI.createMenuDragMouseListener(null), menuUI
@@ -297,10 +264,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createMenuKeyListener(JComponent)'
      */
     public void testCreateMenuKeyListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertNull(menuUI.createMenuKeyListener(null));
             assertSame(menuUI.createMenuKeyListener(null), menuUI.createMenuKeyListener(null));
@@ -313,10 +276,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.BasicMenuUI()'
      */
     public void testBasicMenuUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(menuUI.changeListener);
         assertNull(menuUI.menuListener);
         assertNull(menuUI.propertyChangeListener);
@@ -326,10 +285,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createChangeListener(JComponent)'
      */
     public void testCreateChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(menuUI.createChangeListener(null));
         assertNull(menuUI.createChangeListener(new JMenu()));
     }
@@ -338,10 +293,6 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createMenuListener(JComponent)'
      */
     public void testCreateMenuListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -354,18 +305,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createPropertyChangeListener(JComponent)'
      */
     public void testCreatePropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(menuUI.createPropertyChangeListener(null));
     }
 
     public void testInstallUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JMenu item = new JMenu();
         menuUI.installUI(item);
         assertNotNull(item.getBorder());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUI_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUI_MultithreadedTest.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/BasicMenuUI_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUI_MultithreadedTest.java Sat Jun  5 08:34:57 2010
@@ -32,7 +32,6 @@ import javax.swing.SwingUtilities;
 import javax.swing.SwingWaitTestCase;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
-import tests.support.Support_Excludes;
 
 public class BasicMenuUI_MultithreadedTest extends BasicSwingTestCase {
     protected BasicMenuUI menuUI;
@@ -71,10 +70,6 @@ public class BasicMenuUI_MultithreadedTe
      */
     @SuppressWarnings("deprecation")
     public void testSetupPostTimer() throws InterruptedException, InvocationTargetException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final MenuSelectionManager manager = MenuSelectionManager.defaultManager();
         JFrame frame = new JFrame();
         JMenuBar menuBar = new JMenuBar();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicOptionPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicOptionPaneUITest.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/BasicOptionPaneUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicOptionPaneUITest.java Sat Jun  5 08:34:57 2010
@@ -57,7 +57,6 @@ import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.IconUIResource;
 import javax.swing.plaf.OptionPaneUI;
 import javax.swing.plaf.basic.BasicOptionPaneUI.ButtonAreaLayout;
-import tests.support.Support_Excludes;
 
 public class BasicOptionPaneUITest extends SwingTestCase {
     protected BasicOptionPaneUI paneUI;
@@ -101,10 +100,6 @@ public class BasicOptionPaneUITest exten
     };
 
     public void testGetPreferredSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane pane = new JOptionPane() {
             private static final long serialVersionUID = 1L;
 
@@ -143,10 +138,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testInstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane pane = new JOptionPane();
         pane.removeAll();
         pane.setLayout(null);
@@ -159,10 +150,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane pane = new JOptionPane();
         pane.setUI(paneUI);
         paneUI.uninstallUI(pane);
@@ -171,10 +158,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue("created UI is not null", null != BasicOptionPaneUI
                 .createUI(new JOptionPane()));
         assertTrue("created UI is of the proper class",
@@ -184,18 +167,10 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testSelectInitialValue() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //TODO Implement selectInitialValue().
     }
 
     public void testContainsCustomComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         OptionPaneUI ui = null;
         JOptionPane optionPane = null;
         optionPane = new JOptionPane();
@@ -225,10 +200,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testInstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane pane = new JOptionPane();
         UIManager.put("OptionPane.background", new ColorUIResource(Color.red));
         UIManager.put("OptionPane.foreground", new ColorUIResource(Color.yellow));
@@ -250,10 +221,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testUninstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane pane = new JOptionPane();
         pane.setUI(paneUI);
         assertNotNull(pane.getBackground());
@@ -270,10 +237,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testInstallComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane pane = new JOptionPane();
         pane.removeAll();
         paneUI.optionPane = pane;
@@ -293,10 +256,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testUninstallComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane pane = new JOptionPane();
         assertEquals(2, pane.getComponentCount());
         paneUI.optionPane = pane;
@@ -309,10 +268,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testCreateLayoutManager() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         LayoutManager layout1 = paneUI.createLayoutManager();
         LayoutManager layout2 = paneUI.createLayoutManager();
         assertTrue("LayoutManager is not null", layout1 != null);
@@ -322,19 +277,11 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testInstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         paneUI.optionPane = new JOptionPane();
         assertEquals(1, paneUI.optionPane.getPropertyChangeListeners().length);
     }
 
     public void testUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         paneUI.optionPane = new JOptionPane();
         paneUI.optionPane.setUI(paneUI);
         assertEquals(1, paneUI.optionPane.getPropertyChangeListeners().length);
@@ -346,27 +293,15 @@ public class BasicOptionPaneUITest exten
 
     // Regression for HARMONY-2901
     public void testUninstallListenersNull() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(paneUI.optionPane);
         paneUI.uninstallListeners(); // no exception is expected
     }
 
     public void testCreatePropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(paneUI.createPropertyChangeListener());
     }
 
     public void testInstallUninstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         paneUI.optionPane = new JOptionPane();
         Object[] keys = null;
         paneUI.uninstallKeyboardActions();
@@ -399,18 +334,10 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testGetMinimumOptionPaneSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Dimension(262, 90), paneUI.getMinimumOptionPaneSize());
     }
 
     public void testCreateMessageArea() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane pane = new JOptionPane();
         String message = "message message message message";
         pane.setUI(paneUI);
@@ -467,10 +394,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testAddMessageComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Container messageContainer = new JPanel();
         paneUI.optionPane = new JOptionPane();
         Component child = null, parent = null;
@@ -567,10 +490,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testGetMessage() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Object message = new JButton();
         paneUI.optionPane = new JOptionPane();
         paneUI.optionPane.setMessage(message);
@@ -578,10 +497,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testAddIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JPanel panel = new JPanel();
         paneUI.optionPane = new JOptionPane();
         paneUI.optionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
@@ -611,10 +526,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testGetIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = null;
         assertNull(paneUI.getIcon());
         JOptionPane optionPane = new JOptionPane();
@@ -633,10 +544,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testGetIconForType() throws InterruptedException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         paneUI.optionPane = new JOptionPane();
         paneUI.optionPane.setUI(paneUI);
         Icon icon11 = new IconUIResource(new ImageIcon(new BufferedImage(10, 20,
@@ -673,10 +580,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testGetIconForType_Null() throws InterruptedException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try { // Regression test for HARMONY-2903
             new BasicOptionPaneUI().getIconForType(0);
             fail("NullPointerException should have been thrown");
@@ -686,10 +589,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testGetMaxCharactersPerLineCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         paneUI.optionPane = new JOptionPane();
         paneUI.optionPane.setUI(paneUI);
         assertEquals(Integer.MAX_VALUE, paneUI.getMaxCharactersPerLineCount());
@@ -697,10 +596,6 @@ public class BasicOptionPaneUITest exten
 
     // Regression for HARMONY-2902
     public void testGetMaxCharactersPerLineCount_OptionPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker marker = new Marker();
         paneUI.optionPane = new JOptionPane() {
             private static final long serialVersionUID = 1L;
@@ -719,10 +614,6 @@ public class BasicOptionPaneUITest exten
 
     // Regression for HARMONY-2902
     public void testGetMaxCharactersPerLineCount_Null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(paneUI.optionPane);
         testExceptionalCase(new NullPointerCase() {
             @Override
@@ -733,10 +624,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testBurstStringInto() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String message = "message ";
         JPanel panel = new JPanel();
         paneUI.burstStringInto(panel, message, 2);
@@ -766,10 +653,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testCreateSeparator() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(paneUI.createSeparator());
     }
 
@@ -783,10 +666,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testCreateButtonArea() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Container buttonArea = null;
         paneUI.optionPane = new JOptionPane();
         JButton button;
@@ -878,10 +757,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testAddButtonComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Object option1 = new JRadioButton("Tarara");
         Object option2 = new Integer(100);
         Object option3 = "Eminem must tsum menimE";
@@ -904,10 +779,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testCreateButtonActionListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ActionListener listener1 = paneUI.createButtonActionListener(0);
         ActionListener listener2 = paneUI.createButtonActionListener(1);
         assertTrue("listener is not null", listener1 != null);
@@ -919,10 +790,6 @@ public class BasicOptionPaneUITest exten
     }
 
     public void testGetButtons() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Object[] buttons = null;
         paneUI.optionPane = new JOptionPane();
         paneUI.installDefaults();
@@ -959,27 +826,15 @@ public class BasicOptionPaneUITest exten
 
     // Regression for HARMONY-2901
     public void testGetButtonsNull() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(paneUI.optionPane);
         assertNull(paneUI.getButtons());
     }
 
     public void testGetSizeButtonsToSameWidth() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(paneUI.getSizeButtonsToSameWidth());
     }
 
     public void testGetInitialValueIndex() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JOptionPane optionPane = new JOptionPane("Message", JOptionPane.ERROR_MESSAGE,
                 JOptionPane.CLOSED_OPTION, null, new Object[] { "1", "2", "3" }, "1");
         paneUI = (BasicOptionPaneUI) optionPane.getUI();
@@ -1008,19 +863,11 @@ public class BasicOptionPaneUITest exten
 
     // Regression for HARMONY-2901
     public void testGetInitialValueIndexNull() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(paneUI.optionPane);
         assertEquals(-1, paneUI.getInitialValueIndex());
     }
 
     public void testResetInputValue() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //TODO Implement resetInputValue().
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicProgressBarUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicProgressBarUITest.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/BasicProgressBarUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicProgressBarUITest.java Sat Jun  5 08:34:57 2010
@@ -24,7 +24,6 @@ import java.util.Arrays;
 import javax.swing.BasicSwingTestCase;
 import javax.swing.JProgressBar;
 import javax.swing.UIManager;
-import tests.support.Support_Excludes;
 
 public class BasicProgressBarUITest extends BasicSwingTestCase {
     private BasicProgressBarUI ui;
@@ -50,10 +49,6 @@ public class BasicProgressBarUITest exte
     }
 
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicProgressBarUI ui = (BasicProgressBarUI) BasicProgressBarUI.createUI(progressBar);
         assertNotNull(ui);
         assertNull(ui.changeListener);
@@ -61,10 +56,6 @@ public class BasicProgressBarUITest exte
     }
 
     public void testInstallUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(progressBar.getBorder());
         ui.installUI(progressBar);
         assertSame(ui.progressBar, progressBar);
@@ -83,10 +74,6 @@ public class BasicProgressBarUITest exte
     }
 
     public void testInstallUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.progressBar = progressBar;
         ui.installListeners();
         assertTrue(Arrays.asList(progressBar.getChangeListeners()).contains(ui.changeListener));
@@ -96,10 +83,6 @@ public class BasicProgressBarUITest exte
     }
 
     public void testGetSelectionBackForeGround() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(progressBar);
         assertEquals(UIManager.getColor("ProgressBar.selectionBackground"), ui
                 .getSelectionBackground());
@@ -108,10 +91,6 @@ public class BasicProgressBarUITest exte
     }
 
     public void testSetGetCellLengthSpacing() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(progressBar);
         assertEquals(UIManager.getInt("ProgressBar.cellLength"), ui.getCellLength());
         assertEquals(UIManager.getInt("ProgressBar.cellSpacing"), ui.getCellSpacing());
@@ -135,10 +114,6 @@ public class BasicProgressBarUITest exte
     }
 
     public void testGetPreferredSizes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(progressBar);
         Dimension inner = ui.getPreferredInnerHorizontal();
         assertSame(inner, ui.getPreferredInnerHorizontal());
@@ -153,10 +128,6 @@ public class BasicProgressBarUITest exte
     }
 
     public void testAnimation() throws ArithmeticException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(progressBar);
         progressBar.setIndeterminate(true);
         assertEquals(0, ui.getAnimationIndex());
@@ -175,10 +146,6 @@ public class BasicProgressBarUITest exte
      * Regression test for HARMONY-2701 
      * */
     public void testGetBoxLength() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testBasicProgressBarUI pb = new testBasicProgressBarUI(); 
         assertEquals(0, pb.getBoxLength(0, 1)); 
     } 
@@ -187,10 +154,6 @@ public class BasicProgressBarUITest exte
      * Regression test for HARMONY-2701 
      * */
     public void testGetBoxLength2() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testBasicProgressBarUI pb = new testBasicProgressBarUI(); 
         assertEquals(8, pb.getBoxLength(50, 1)); 
     }  
@@ -202,10 +165,6 @@ public class BasicProgressBarUITest exte
     }
 
     public void testStartStop() throws NullPointerException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicProgressBarUIExt pb = new BasicProgressBarUIExt();
         pb.startAnimationTimer(); 
 
@@ -224,10 +183,6 @@ public class BasicProgressBarUITest exte
     }
     
     public void testHarmony2698Regression() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         class testBasicProgressBarUI extends BasicProgressBarUI { 
             public Dimension getPreferredInnerVertical() { 
                 return super.getPreferredInnerVertical(); 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.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/BasicRadioButtonMenuItemUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.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 BasicRadioButtonMenuItemUITest extends BasicMenuItemUITest {
     protected BasicRadioButtonMenuItemUI radioUI;
@@ -45,10 +44,6 @@ public class BasicRadioButtonMenuItemUIT
      */
     @Override
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicRadioButtonMenuItemUI.createUI(null);
         ComponentUI ui2 = BasicRadioButtonMenuItemUI.createUI(null);
         assertTrue(ui1 instanceof BasicRadioButtonMenuItemUI);
@@ -60,10 +55,6 @@ public class BasicRadioButtonMenuItemUIT
      */
     @Override
     public void testGetPropertyPrefix() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("RadioButtonMenuItem", menuItemUI.getPropertyPrefix());
     }
 
@@ -72,9 +63,5 @@ public class BasicRadioButtonMenuItemUIT
      * as method has an empty body we wo't test it
      */
     public void testProcessMouseEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRootPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRootPaneUITest.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/BasicRootPaneUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRootPaneUITest.java Sat Jun  5 08:34:57 2010
@@ -30,7 +30,6 @@ import javax.swing.SwingTestCase;
 import javax.swing.SwingUtilities;
 import javax.swing.plaf.ComponentUI;
 import java.util.EventListener;
-import tests.support.Support_Excludes;
 
 public class BasicRootPaneUITest extends SwingTestCase {
     private JRootPane rootPane;
@@ -63,10 +62,6 @@ public class BasicRootPaneUITest extends
      * Class under test for constructor
      */
     public void testBasicRootPaneUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui = new BasicRootPaneUI();
         assertTrue(ui != null);
     }
@@ -93,10 +88,6 @@ public class BasicRootPaneUITest extends
      *     void uninstallUI(JComponent)
      */
     public void testInstallUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(rootPane);
         // check install listeners
         assertTrue(isListenerInstalled(rootPane, ui));
@@ -126,10 +117,6 @@ public class BasicRootPaneUITest extends
      * Class under test for void propertyChange()
      */
     public void testPropertyChange() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JFrame frame = new JFrame();
         rootPane = frame.getRootPane();
         rootPane.setUI(ui);
@@ -156,10 +143,6 @@ public class BasicRootPaneUITest extends
      * Class under test for ComponentUI createUI(JComponent)
      */
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui = BasicRootPaneUI.createUI(rootPane);
         assertTrue(ui != null);
         assertTrue(ui instanceof BasicRootPaneUI);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicSplitPaneDividerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicSplitPaneDividerTest.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/BasicSplitPaneDividerTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicSplitPaneDividerTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import javax.swing.JButton;
 import javax.swing.JSplitPane;
 import javax.swing.SwingTestCase;
 import javax.swing.border.Border;
-import tests.support.Support_Excludes;
 
 public class BasicSplitPaneDividerTest extends SwingTestCase {
     private BasicSplitPaneDivider divider;
@@ -51,10 +50,6 @@ public class BasicSplitPaneDividerTest e
     }
 
     public void testBasicSplitPaneDivider() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(pane.getUI(), divider.splitPaneUI);
         assertEquals(pane, divider.splitPane);
         assertNotNull(divider.mouseHandler);
@@ -68,10 +63,6 @@ public class BasicSplitPaneDividerTest e
     }
 
     public void testGetSetBasicSplitPaneUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JSplitPane newPane = new JSplitPane();
         divider.setBasicSplitPaneUI((BasicSplitPaneUI) newPane.getUI());
         assertEquals(newPane.getUI(), divider.splitPaneUI);
@@ -80,10 +71,6 @@ public class BasicSplitPaneDividerTest e
     }
 
     public void testGetSetDividerSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, divider.getDividerSize());
         divider.setDividerSize(20);
         assertEquals(20, divider.getDividerSize());
@@ -92,10 +79,6 @@ public class BasicSplitPaneDividerTest e
     }
 
     public void testGetSetBorder() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(divider.getBorder());
         Border b = BorderFactory.createEmptyBorder();
         divider.setBorder(b);
@@ -103,30 +86,18 @@ public class BasicSplitPaneDividerTest e
     }
 
     public void testGetInsets() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Insets(0, 0, 0, 0), divider.getInsets());
         divider.setBorder(BorderFactory.createEmptyBorder(5, 10, 15, 20));
         assertEquals(new Insets(5, 10, 15, 20), divider.getInsets());
     }
 
     public void testIsSetMouseOver() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(divider.isMouseOver());
         divider.setMouseOver(true);
         assertTrue(divider.isMouseOver());
     }
 
     public void testGetMinimumMaximumPreferredSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Dimension(0, 1), divider.getPreferredSize());
         assertEquals(new Dimension(0, 1), divider.getMinimumSize());
         assertEquals(new Dimension(Short.MAX_VALUE, Short.MAX_VALUE), divider.getMaximumSize());
@@ -142,17 +113,9 @@ public class BasicSplitPaneDividerTest e
 
     //TODO
     public void testPropertyChange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testOneTouchExpandableChanged() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(pane.isOneTouchExpandable());
         assertNull(divider.leftButton);
         assertNull(divider.rightButton);
@@ -163,20 +126,12 @@ public class BasicSplitPaneDividerTest e
     }
 
     public void testCreateLeftOneTouchButton() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JButton left = divider.createLeftOneTouchButton();
         assertNotNull(left);
         assertNotSame(left, divider.createLeftOneTouchButton());
     }
 
     public void testCreateRightOneTouchButton() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JButton right = divider.createRightOneTouchButton();
         assertNotNull(right);
         assertNotSame(right, divider.createRightOneTouchButton());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicSplitPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicSplitPaneUITest.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/BasicSplitPaneUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicSplitPaneUITest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import javax.swing.JComponent;
 import javax.swing.JSplitPane;
 import javax.swing.JViewport;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class BasicSplitPaneUITest extends SwingTestCase {
     private JSplitPane splitPane;
@@ -49,10 +48,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testPreferredLayoutSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         splitPane.setBorder(BorderFactory.createEmptyBorder(5, 6, 7, 8));
         ui.layoutManager.layoutContainer(splitPane);
         int width = splitPane.getInsets().left + splitPane.getInsets().right
@@ -75,10 +70,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testMinLayoutSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         splitPane.setBorder(BorderFactory.createEmptyBorder(5, 6, 7, 8));
         ui.layoutManager.layoutContainer(splitPane);
         int width = splitPane.getInsets().left + splitPane.getInsets().right
@@ -101,20 +92,12 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testCreateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(BasicSplitPaneUI.createUI(splitPane));
         assertFalse(BasicSplitPaneUI.createUI(splitPane) == BasicSplitPaneUI
                 .createUI(splitPane));
     }
 
     public void testCreatePropertyHandler() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createPropertyChangeListener());
         if (isHarmony()) {
             assertFalse(ui.createPropertyChangeListener() == ui.createPropertyChangeListener());
@@ -122,10 +105,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testCreateFocusHandler() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createFocusListener());
         if (isHarmony()) {
             assertFalse(ui.createFocusListener() == ui.createFocusListener());
@@ -133,10 +112,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testSetOrientation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         propertyChangeController = new PropertyChangeController();
         splitPane.addPropertyChangeListener(propertyChangeController);
         ui = (BasicSplitPaneUI) splitPane.getUI();
@@ -154,10 +129,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testSetContinuousLayout() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         propertyChangeController = new PropertyChangeController();
         splitPane.addPropertyChangeListener(propertyChangeController);
         assertFalse(splitPane.isContinuousLayout());
@@ -176,10 +147,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testSetLastDragLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, ui.getLastDragLocation());
         ui.setLastDragLocation(40);
         assertEquals(40, ui.getLastDragLocation());
@@ -187,53 +154,29 @@ public class BasicSplitPaneUITest extend
 
     // Regression for HARMONY-2771
     public void testGetLastDragLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, new BasicSplitPaneUI().getLastDragLocation());
     }
 
     public void testGetDivider() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.getDivider());
         assertNull(new BasicSplitPaneUI().getDivider());
     }
 
     public void testGetSplitPane() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.getSplitPane());
         assertTrue(splitPane == ui.getSplitPane());
         assertNull(new BasicSplitPaneUI().getSplitPane());
     }
 
     public void testCreateDefaultNonContinuousLayoutDivider() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createDefaultNonContinuousLayoutDivider() instanceof Canvas);
     }
 
     public void testCreateDefaultDivider() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createDefaultDivider());
     }
 
     public void testSetNonContinuousLayoutDivider() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Component component = new Component() {
             private static final long serialVersionUID = 1L;
         };
@@ -246,10 +189,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testAddComponentToLayout() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(3, ui.layoutManager.components.length);
         JViewport viewport = new JViewport();
         ui.layoutManager.addLayoutComponent(JSplitPane.BOTTOM, viewport);
@@ -297,10 +236,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testGetComponentPreferredSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(ui.layoutManager.components[0].getPreferredSize().width, ui.layoutManager
                 .getPreferredSizeOfComponent(ui.layoutManager.components[0]));
         splitPane.setOrientation(JSplitPane.VERTICAL_SPLIT);
@@ -309,10 +244,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testGetComponentSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.layoutManager.layoutContainer(splitPane);
         assertEquals(ui.layoutManager.components[0].getSize().width, ui.layoutManager
                 .getSizeOfComponent(ui.layoutManager.components[0]));
@@ -322,10 +253,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testGetAvailableSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         splitPane.setSize(1000, 2000);
         splitPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 15, 20));
         assertEquals(splitPane.getSize().width - 10 - 20, ui.layoutManager.getAvailableSize(
@@ -336,10 +263,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testResetPreferredSizes() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertEquals(0, ui.getDividerLocation(splitPane));
             ui.resetToPreferredSizes(splitPane);
@@ -349,10 +272,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testMinMaxDividerLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         splitPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 15, 20));
         assertEquals(splitPane.getLeftComponent().getPreferredSize().width
                 + splitPane.getInsets().left, ui.getMinimumDividerLocation(splitPane));
@@ -362,10 +281,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testSetDividerLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setDividerLocation(splitPane, 230);
         assertEquals(-1, splitPane.getDividerLocation());
         assertEquals(0, ui.getDividerLocation(splitPane));
@@ -377,10 +292,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testGetDividerLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try { // Regression test for HARMONY-2661
             ui.getDividerLocation(null);
             fail("NullPointerException should have been thrown");
@@ -390,10 +301,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testInitialLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         splitPane.setSize(1000, 2000);
         splitPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 15, 20));
         assertEquals(splitPane.getInsets().left, ui.layoutManager.getInitialLocation(splitPane
@@ -404,10 +311,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testUpdateComponents() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.layoutManager.components[0] = null;
         ui.layoutManager.components[1] = null;
         ui.layoutManager.components[2] = null;
@@ -418,10 +321,6 @@ public class BasicSplitPaneUITest extend
     }
 
     public void testSetComponentToSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JButton b = new JButton();
         b.setSize(new Dimension(20, 30));
         int size = 5;



Mime
View raw message