harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [14/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/BasicTabbedPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTabbedPaneUITest.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/BasicTabbedPaneUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTabbedPaneUITest.java Sat Jun  5 08:34:57 2010
@@ -40,7 +40,6 @@ import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class BasicTabbedPaneUITest extends SwingTestCase {
     private JTabbedPane tabbed;
@@ -89,10 +88,6 @@ public class BasicTabbedPaneUITest exten
      * Class under test for ComponentUI createUI(JComponent)
      */
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicTabbedPaneUI.createUI(tabbed);
         assertTrue(ui1 instanceof BasicTabbedPaneUI);
         ComponentUI ui2 = BasicTabbedPaneUI.createUI(tabbed);
@@ -100,10 +95,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testRotateInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Insets insets = new Insets(1, 2, 3, 4);
         Insets rotated = new Insets(0, 0, 0, 0);
         BasicTabbedPaneUI.rotateInsets(insets, rotated, SwingConstants.LEFT);
@@ -115,28 +106,16 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testBasicTabbedPaneUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // does nothing
     }
 
     public void testAssureRectsCreated() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.assureRectsCreated(5);
         assertEquals(5, ui.rects.length);
         assertNotNull(ui.rects[4]);
     }
 
     public void testCalculateMaxTabHeight() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int tabPlacement = tabbed.getTabPlacement();
         int fontHeight = tabbed.getFontMetrics(tabbed.getFont()).getHeight();
         int height1 = ui.calculateTabHeight(tabPlacement, 0, fontHeight);
@@ -145,10 +124,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testCalculateMaxTabWidth() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int tabPlacement = tabbed.getTabPlacement();
         FontMetrics fm = tabbed.getFontMetrics(tabbed.getFont());
         int w1 = ui.calculateTabWidth(tabPlacement, 0, fm);
@@ -157,10 +132,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testCalculateTabAreaHeight() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int tabPlacement = SwingConstants.TOP;
         assertEquals(14, ui.calculateTabAreaHeight(tabPlacement, 1, 10));
         assertEquals(22, ui.calculateTabAreaHeight(tabPlacement, 2, 10));
@@ -168,10 +139,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testCalculateTabAreaWidth() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int tabPlacement = SwingConstants.LEFT;
         assertEquals(14, ui.calculateTabAreaWidth(tabPlacement, 1, 10));
         assertEquals(22, ui.calculateTabAreaWidth(tabPlacement, 2, 10));
@@ -179,10 +146,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testCalculateTabHeight() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -193,10 +156,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testCalculateTabWidth() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final FontMetrics fm = tabbed.getFontMetrics(tabbed.getFont());
         final int tabIndex = 0;
         final int textWidth = fm.stringWidth(tabbed.getTitleAt(tabIndex));
@@ -205,53 +164,29 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testCreateChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createChangeListener() instanceof BasicTabbedPaneUI.TabSelectionHandler);
     }
 
     public void testCreateFocusListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createFocusListener() instanceof BasicTabbedPaneUI.FocusHandler);
     }
 
     public void testCreateLayoutManager() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createLayoutManager() instanceof BasicTabbedPaneUI.TabbedPaneLayout);
         tabbed.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
         assertFalse(ui.createLayoutManager().getClass() == BasicTabbedPaneUI.TabbedPaneLayout.class);
     }
 
     public void testCreateMouseListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createMouseListener() instanceof BasicTabbedPaneUI.MouseHandler);
     }
 
     public void testCreatePropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         PropertyChangeListener l = ui.createPropertyChangeListener();
         assertTrue(l instanceof BasicTabbedPaneUI.PropertyChangeHandler);
     }
 
     public void testCreateScrollButton() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JButton b = ui.createScrollButton(SwingConstants.NORTH);
         assertTrue(b instanceof UIResource);
         assertFalse(b.isFocusable());
@@ -272,20 +207,12 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testExpandTabRunsArray() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int oldLength = ui.tabRuns.length;
         ui.expandTabRunsArray();
         assertTrue(ui.tabRuns.length > oldLength);
     }
 
     public void testGetContentBorderInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(ui.contentBorderInsets, ui.getContentBorderInsets(SwingConstants.TOP));
         assertSame(ui.contentBorderInsets, ui.getContentBorderInsets(SwingConstants.TOP));
         assertEquals(ui.contentBorderInsets, ui.getContentBorderInsets(SwingConstants.LEFT));
@@ -294,10 +221,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetFocusIndex() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         showTabPane();
         Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .getFocusOwner();
@@ -306,20 +229,12 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetFontMetrics() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed = new JTabbedPane();
         tabbed.setUI(ui);
         assertSame(tabbed.getFontMetrics(tabbed.getFont()), ui.getFontMetrics());
     }
 
     public void testGetIconForTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed.setEnabledAt(0, true);
         assertSame(tabbed.getIconAt(0), ui.getIconForTab(0));
         tabbed.setEnabledAt(0, false);
@@ -329,44 +244,24 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetMaximumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getMaximumSize(tabbed));
     }
 
     public void testGetMinimumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getMinimumSize(tabbed));
     }
 
     public void testGetNextTabIndex() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(1, ui.getNextTabIndex(0));
         assertEquals(0, ui.getNextTabIndex(tabbed.getTabCount() - 1));
     }
 
     public void testGetPreviousTabIndex() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(tabbed.getTabCount() - 1, ui.getPreviousTabIndex(0));
         assertEquals(0, ui.getPreviousTabIndex(1));
     }
 
     public void testGetNextTabIndexInRun() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create2TabRuns();
         int tabCount = tabbed.getTabCount();
         assertEquals(1, ui.getNextTabIndexInRun(tabCount, 0));
@@ -375,20 +270,12 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetNextTabRun() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create3TabRuns();
         assertEquals(1, ui.getNextTabRun(0));
         assertEquals(0, ui.getNextTabRun(2));
     }
 
     public void testGetPreviousTabIndexInRun() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create2TabRuns();
         int tabCount = tabbed.getTabCount();
         assertEquals(1, ui.getPreviousTabIndexInRun(tabCount, 0));
@@ -397,28 +284,16 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetPreviousTabRun() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create3TabRuns();
         assertEquals(2, ui.getPreviousTabRun(0));
         assertEquals(0, ui.getPreviousTabRun(1));
     }
 
     public void testGetRunForTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, ui.getRunForTab(tabbed.getTabCount(), 1));
     }
 
     public void testGetSelectedTabPadInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Insets rotatedInsets = new Insets(0, 0, 0, 0);
         BasicTabbedPaneUI.rotateInsets(ui.selectedTabPadInsets, rotatedInsets,
                 SwingConstants.LEFT);
@@ -428,10 +303,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabAreaInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.tabAreaInsets = new Insets(1, 2, 3, 4);
         assertEquals(ui.tabAreaInsets, ui.getTabAreaInsets(SwingConstants.TOP));
         assertEquals(new Insets(2, 1, 4, 3), ui.getTabAreaInsets(SwingConstants.LEFT));
@@ -441,10 +312,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabBoundsintRectangle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed.setSize(220, 100);
         tabbed.doLayout();
         Rectangle r = new Rectangle();
@@ -458,10 +325,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabBoundsJTabbedPaneint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed.setSize(220, 100);
         tabbed.doLayout();
         Rectangle r1 = ui.getTabBounds(tabbed, 0);
@@ -471,10 +334,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed.setSelectedIndex(0);
         assertSame(ui.tabInsets, ui.getTabInsets(SwingConstants.LEFT, 0));
         tabbed.setSelectedIndex(1);
@@ -485,10 +344,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabLabelShiftX() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -505,10 +360,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabLabelShiftY() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, ui.getTabLabelShiftY(SwingConstants.TOP, 0, true));
         assertEquals(1, ui.getTabLabelShiftY(SwingConstants.LEFT, 0, true));
         assertEquals(1, ui.getTabLabelShiftY(SwingConstants.RIGHT, 0, true));
@@ -523,10 +374,6 @@ public class BasicTabbedPaneUITest exten
      * Class under test for int getTabRunCount(JTabbedPane)
      */
     public void testGetTabRunCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create2TabRuns();
         assertEquals(2, ui.getTabRunCount(tabbed));
         tabbed.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
@@ -534,10 +381,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabRunIndent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, ui.getTabRunIndent(SwingConstants.LEFT, 0));
         assertEquals(0, ui.getTabRunIndent(SwingConstants.TOP, 1));
         assertEquals(0, ui.getTabRunIndent(SwingConstants.BOTTOM, 1));
@@ -545,36 +388,20 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabRunOffset() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // the documentation is empty
     }
 
     public void testGetTabRunOverlay() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(ui.tabRunOverlay, ui.getTabRunOverlay(SwingConstants.LEFT));
         assertEquals(ui.tabRunOverlay, ui.getTabRunOverlay(SwingConstants.TOP));
     }
 
     public void testGetTextViewForTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getTextViewForTab(0));
         //TODO HTML styled text is not supported
     }
 
     public void testSetGetVisibleComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(tabbed.getSelectedComponent(), ui.getVisibleComponent());
         assertTrue(ui.getVisibleComponent().isVisible());
         JComponent comp = new JLabel("label");
@@ -590,10 +417,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testInstallUninstallComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int count = tabbed.getComponentCount();
         ui.uninstallComponents();
         assertEquals(count, tabbed.getComponentCount());
@@ -611,10 +434,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testInstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed.setBackgroundAt(0, null);
         tabbed.setBackground(null);
         tabbed.setForeground(null);
@@ -629,18 +448,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testUninstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // nothing to test
     }
 
     public void testInstallUninstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallKeyboardActions();
         ui.installKeyboardActions();
         assertSame(UIManager.get("TabbedPane.focusInputMap"), SwingUtilities.getUIInputMap(
@@ -656,10 +467,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testInstallUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallListeners();
         ui.installListeners();
         assertTrue(Arrays.asList(tabbed.getPropertyChangeListeners()).contains(
@@ -676,10 +483,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testInstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
         ui.uninstallListeners();
         ui.uninstallComponents();
@@ -701,10 +504,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
         int compCount = tabbed.getComponentCount();
         ui.uninstallUI(tabbed);
@@ -717,27 +516,15 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testLastTabInRun() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int lastTabIndex = tabbed.getTabCount() - 1;
         assertEquals(lastTabIndex, ui.lastTabInRun(tabbed.getTabCount(), 0));
     }
 
     public void testLayoutLabel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // no documentation
     }
 
     public void testNavigateSelectedTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create2TabRuns();
         tabbed.setSelectedIndex(0);
         ui.navigateSelectedTab(SwingConstants.EAST);
@@ -756,10 +543,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testPaintGraphicsJComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicTabbedPaneUI localBasicTabbedPaneUI = new BasicTabbedPaneUI(); 
         localBasicTabbedPaneUI.installUI(new JTabbedPane());
         try { 
@@ -771,106 +554,54 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testPaintContentBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintContentBorderBottomEdge() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintContentBorderLeftEdge() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintContentBorderRightEdge() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintContentBorderTopEdge() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintFocusIndicator() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintTabArea() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintTabBackground() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintTabBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testPaintText() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testSelectAdjacentRunTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create3TabRuns();
         tabbed.setSelectedIndex(0);
         int tabRunOffset = ui.getTabRunOffset(tabbed.getTabPlacement(), tabbed.getTabCount(),
@@ -880,10 +611,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSelectNextTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create2TabRuns();
         int initIndex = 0;
         tabbed.setSelectedIndex(initIndex);
@@ -892,10 +619,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSelectPreviousTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create2TabRuns();
         int initIndex = 0;
         tabbed.setSelectedIndex(initIndex);
@@ -904,10 +627,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSelectNextTabInRun() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create2TabRuns();
         int initIndex = 0;
         tabbed.setSelectedIndex(initIndex);
@@ -917,10 +636,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSelectPreviousTabInRun() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         create2TabRuns();
         int initIndex = 0;
         tabbed.setSelectedIndex(initIndex);
@@ -930,10 +645,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSetGetRolloverTab() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, ui.getRolloverTab());
         ui.setRolloverTab(1);
         assertEquals(1, ui.getRolloverTab());
@@ -942,10 +653,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testShouldPadTabRun() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.shouldPadTabRun(tabbed.getTabPlacement(), 0));
         create2TabRuns();
         assertTrue(ui.shouldPadTabRun(tabbed.getTabPlacement(), 0));
@@ -954,10 +661,6 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testShouldRotateTabRuns() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.shouldRotateTabRuns(tabbed.getTabPlacement()));
     }
 
@@ -965,10 +668,6 @@ public class BasicTabbedPaneUITest exten
      * Class under test for int tabForCoordinate(JTabbedPane, int, int)
      */
     public void testTabForCoordinate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tabbed.setSize(40, 30);
         tabbed.doLayout();
         Rectangle tabBounds = ui.getTabBounds(tabbed, 0);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextAreaUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextAreaUITest.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/BasicTextAreaUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextAreaUITest.java Sat Jun  5 08:34:57 2010
@@ -31,7 +31,6 @@ import javax.swing.text.Element;
 import javax.swing.text.PlainView;
 import javax.swing.text.WrappedPlainView;
 import junit.framework.AssertionFailedError;
-import tests.support.Support_Excludes;
 
 public class BasicTextAreaUITest extends SwingTestCase {
     JFrame jf;
@@ -85,10 +84,6 @@ public class BasicTextAreaUITest extends
 
     // TODO add test for bidirectional text (after creation PlainViewi18n)
     public void testCreateElement() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Document doc = jta.getDocument();
         Element elem = doc.getDefaultRootElement();
         BasicTextUI ui = (BasicTextUI) jta.getUI();
@@ -110,19 +105,11 @@ public class BasicTextAreaUITest extends
     }
 
     public void testGetPropertyPrefix() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("TextArea", ((BasicTextAreaUI) jta.getUI()).getPropertyPrefix());
         assertEquals("TextArea", ((BasicTextAreaUI) bidiJta.getUI()).getPropertyPrefix());
     }
 
     public void testPropertyChange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TextAreaUI ui = (TextAreaUI) jta.getUI();
         ui.flagModelChanged = false;
         jta.setLineWrap(true);
@@ -139,10 +126,6 @@ public class BasicTextAreaUITest extends
     }
 
     public void testCreateUIJComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JTextArea jta = new JTextArea();
         ComponentUI ui = BasicTextAreaUI.createUI(jta);
         assertTrue(ui instanceof BasicTextAreaUI);
@@ -150,23 +133,11 @@ public class BasicTextAreaUITest extends
     }
 
     public void testGetPrefferedSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetMinimumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testInstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextFieldUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextFieldUITest.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/BasicTextFieldUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextFieldUITest.java Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.text.Element;
 import javax.swing.text.FieldView;
 import javax.swing.text.View;
-import tests.support.Support_Excludes;
 
 public class BasicTextFieldUITest extends SwingTestCase {
     JFrame jf;
@@ -67,10 +66,6 @@ public class BasicTextFieldUITest extend
     }
 
     public void testCreateElement() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element element = jtf.getDocument().getDefaultRootElement();
         View view = ui.create(element);
         assertTrue(view instanceof FieldView);
@@ -86,39 +81,19 @@ public class BasicTextFieldUITest extend
     }
 
     public void testGetPropertyPrefix() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("TextField", ui.getPropertyPrefix());
     }
 
     public void testInstallUIJComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testPropertyChange() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testBasicTextFieldUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testCreateUIJComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI componentUI = BasicTextFieldUI.createUI(null);
         assertTrue(componentUI instanceof BasicTextFieldUI);
         assertNotSame(BasicTextFieldUI.createUI(jtf), componentUI);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextPaneUITest.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/BasicTextPaneUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTextPaneUITest.java Sat Jun  5 08:34:57 2010
@@ -33,7 +33,6 @@ import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
 import javax.swing.text.StyledDocument;
-import tests.support.Support_Excludes;
 
 public class BasicTextPaneUITest extends SwingTestCase {
     JTextPane textPane;
@@ -80,10 +79,6 @@ public class BasicTextPaneUITest extends
     }
 
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicTextPaneUI.createUI(textPane);
         assertTrue(ui1 instanceof BasicTextPaneUI);
         ui1 = BasicTextPaneUI.createUI(new JTextField());
@@ -95,18 +90,10 @@ public class BasicTextPaneUITest extends
     }
 
     public void testGetPropertyPrefix() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("TextPane", ui.getPropertyPrefix());
     }
 
     public void testPropertyChange() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Style style = textPane.getStyle(StyleContext.DEFAULT_STYLE);
         //Font
         assertFalse(25 == ((Integer) style.getAttribute(StyleConstants.FontSize)).intValue());
@@ -143,10 +130,6 @@ public class BasicTextPaneUITest extends
     }
 
     public void testProPertyChange_FontFamilyName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Style style = textPane.getStyle(StyleContext.DEFAULT_STYLE);
         textPane.setFont(font);
         assertFalse(font.getFamily().equals(style.getAttribute(StyleConstants.FontFamily)));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicToolBarUI$DragWindowTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicToolBarUI%24DragWindowTest.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/BasicToolBarUI$DragWindowTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicToolBarUI$DragWindowTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import javax.swing.JFrame;
 import javax.swing.JToolBar;
 import javax.swing.SwingConstants;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class BasicToolBarUI$DragWindowTest extends SwingTestCase {
     private JToolBar toolBar;
@@ -57,47 +56,27 @@ public class BasicToolBarUI$DragWindowTe
     }
 
     public void testGetInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Insets(1, 1, 1, 1), dragWindow.getInsets());
     }
 
     public void testSetGetBorderColor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dragWindow.setBorderColor(Color.red);
         assertSame(Color.red, dragWindow.getBorderColor());
     }
 
     public void testSetGetOffset() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Point offset = new Point(1, 2);
         dragWindow.setOffset(offset);
         assertSame(offset, dragWindow.getOffset());
     }
 
     public void testSetOrientation() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dragWindow.setSize(1, 2);
         dragWindow.setOrientation(SwingConstants.VERTICAL);
         assertEquals(new Dimension(1, 2), dragWindow.getSize());
     }
 
     public void testPaint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicToolBarUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicToolBarUITest.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/BasicToolBarUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicToolBarUITest.java Sat Jun  5 08:34:57 2010
@@ -49,7 +49,6 @@ import javax.swing.plaf.BorderUIResource
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.BasicToolBarUI.DragWindow;
-import tests.support.Support_Excludes;
 
 public class BasicToolBarUITest extends SwingTestCase {
     private class TestBasicToolBarUI extends BasicToolBarUI {
@@ -144,10 +143,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testInstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui = new TestBasicToolBarUI();
         ui.installUI(toolBar);
         assertSame(ui.toolBar, toolBar);
@@ -159,10 +154,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallUI(toolBar);
         assertNull(toolBar.getBorder());
         assertFalse(Arrays.asList(toolBar.getContainerListeners()).contains(
@@ -172,10 +163,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testUninstallUIWhenFloating() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         prepareToTestFloating();
         Point p = new Point(1, 2);
         ui.dragTo(p, p);
@@ -188,10 +175,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = BasicToolBarUI.createUI(toolBar);
         assertTrue(ui1 instanceof BasicToolBarUI);
         ComponentUI ui2 = BasicToolBarUI.createUI(toolBar);
@@ -199,20 +182,12 @@ public class BasicToolBarUITest extends 
     }
 
     public void testBasicToolBarUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui = new TestBasicToolBarUI();
         assertEquals(BorderLayout.NORTH, ui.constraintBeforeFloating);
         assertEquals(-1, ui.focusedCompIndex);
     }
 
     public void testCanDock() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JPanel panel = new JPanel();
         panel.add(toolBar);
         panel.setSize(400, 300);
@@ -229,28 +204,16 @@ public class BasicToolBarUITest extends 
     }
 
     public void testCreateDockingListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createDockingListener());
     }
 
     public void testCreateDragWindow() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DragWindow dragWindow = ui.createDragWindow(toolBar);
         assertNotNull(ui.createDragWindow(toolBar));
         assertNotNull(dragWindow.getOwner());
     }
 
     public void testCreateFloatingFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.setName("The toolbar");
         JFrame floatingFrame = ui.createFloatingFrame(toolBar);
         assertEquals("The toolbar", floatingFrame.getTitle());
@@ -260,10 +223,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testCreateFloatingWindow() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.setName("The toolbar");
         RootPaneContainer floatingWindow = ui.createFloatingWindow(toolBar);
         assertTrue(floatingWindow instanceof JDialog);
@@ -274,18 +233,10 @@ public class BasicToolBarUITest extends 
     }
 
     public void testCreateFrameListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createFrameListener() instanceof BasicToolBarUI.FrameListener);
     }
 
     public void testCreateNonRolloverBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createRolloverBorder());
         if (isHarmony()) {
             assertTrue(ui.createRolloverBorder() instanceof UIResource);
@@ -293,18 +244,10 @@ public class BasicToolBarUITest extends 
     }
 
     public void testCreatePropertyListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createPropertyListener());
     }
 
     public void testCreateRolloverBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createRolloverBorder());
         if (isHarmony()) {
             assertTrue(ui.createRolloverBorder() instanceof UIResource);
@@ -312,26 +255,14 @@ public class BasicToolBarUITest extends 
     }
 
     public void testCreateToolBarContListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createToolBarContListener());
     }
 
     public void testCreateToolBarFocusListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createToolBarFocusListener());
     }
 
     public void testDragTo() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         prepareToTestFloating();
         Point origin = new Point(1, 2);
         Point position1 = frame.getLocation();
@@ -354,10 +285,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testFloatAt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         prepareToTestFloating();
         Point origin = new Point(1, 2);
         Point position1 = frame.getLocation();
@@ -376,10 +303,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testSetGetDockingColor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(ui.getDockingColor(), ui.dockingColor);
         Color c = Color.RED;
         ui.setDockingColor(c);
@@ -388,10 +311,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testSetGetFloatingColor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(ui.getFloatingColor(), ui.floatingColor);
         Color c = Color.RED;
         ui.setFloatingColor(c);
@@ -400,10 +319,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testInstallComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.add(b);
         ui.uninstallComponents();
         int compCount = toolBar.getComponentCount();
@@ -412,10 +327,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testUninstallComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.add(b);
         int compCount = toolBar.getComponentCount();
         ui.uninstallComponents();
@@ -423,10 +334,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testInstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui = new TestBasicToolBarUI();
         ui.toolBar = toolBar;
         toolBar.add(b);
@@ -447,10 +354,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testUninstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         b.setBorder(null);
         toolBar.add(b);
         ui.uninstallDefaults();
@@ -460,10 +363,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testInstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallKeyboardActions();
         ui.installKeyboardActions();
         assertSame(UIManager.get("ToolBar.ancestorInputMap"), SwingUtilities.getUIInputMap(
@@ -472,10 +371,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testUninstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallKeyboardActions();
         assertNull(SwingUtilities.getUIInputMap(toolBar,
                 JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT));
@@ -483,10 +378,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testInstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallListeners();
         toolBar.add(b);
         ui.installListeners();
@@ -503,10 +394,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.add(b);
         ui.uninstallListeners();
         assertFalse(Arrays.asList(toolBar.getContainerListeners()).contains(
@@ -522,10 +409,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testInstallNonRolloverBorders() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.add(b);
         toolBar.add(label);
         b.setBorder(null);
@@ -536,10 +419,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testInstallNormalBorders() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Border bBorder = b.getBorder();
         Border labelBorder = label.getBorder();
         toolBar.add(b);
@@ -550,10 +429,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testInstallRolloverBorders() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.add(b);
         toolBar.add(label);
         b.setBorder(null);
@@ -564,10 +439,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testNavigateFocusedComp() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.add(new TestJButton());
         toolBar.add(new TestJButton());
         toolBar.add(new TestJButton());
@@ -583,18 +454,10 @@ public class BasicToolBarUITest extends 
     }
 
     public void testPaintDragWindow() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
     public void testSetBorderToNonRollover() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setBorderToNonRollover(b);
         assertSame(ui.nonRolloverBorder, b.getBorder());
         assertFalse(b.isRolloverEnabled());
@@ -608,10 +471,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testSetBorderToNormal() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Border oldBorder = b.getBorder();
         boolean oldRolloverEnabled = b.isRolloverEnabled();
         ui.setBorderToRollover(b);
@@ -628,10 +487,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testSetBorderToRollover() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         b.setRolloverEnabled(false);
         ui.setBorderToRollover(b);
         assertSame(ui.rolloverBorder, b.getBorder());
@@ -646,10 +501,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testSetIsFloating() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         prepareToTestFloating();
         Point origin = new Point(1, 2);
         Point position1 = frame.getLocation();
@@ -682,10 +533,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testSetFloatingLocation() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         prepareToTestFloating();
         Point origin = new Point(100, 200);
         Point position1 = frame.getLocation();
@@ -703,10 +550,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testSetOrientation() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setOrientation(SwingConstants.VERTICAL);
         assertEquals(SwingConstants.VERTICAL, toolBar.getOrientation());
         ui.setOrientation(SwingConstants.HORIZONTAL);
@@ -714,10 +557,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testSetIsRolloverBorders() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setRolloverBorders(false);
         toolBar.add(b);
         toolBar.add(label);
@@ -734,10 +573,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testDockingListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         createAndShowFrame();
         BasicToolBarUI.DockingListener l = ui.new DockingListener(toolBar);
         MouseEvent e = new MouseEvent(toolBar, MouseEvent.MOUSE_DRAGGED, 0, 0, 0, 0, 0, false);
@@ -752,10 +587,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testFrameListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         prepareToTestFloating();
         WindowListener l = ui.createFrameListener();
         ui.dragTo(new Point(1, 1), new Point(0, 0));
@@ -768,10 +599,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testPropertyListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.setRollover(false);
         toolBar.add(b);
         toolBar.setRollover(true);
@@ -781,10 +608,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testToolBarContListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ContainerListener l = ui.createToolBarContListener();
         Border border = b.getBorder();
         ContainerEvent e = new ContainerEvent(toolBar, ContainerEvent.COMPONENT_ADDED, b);
@@ -796,10 +619,6 @@ public class BasicToolBarUITest extends 
     }
 
     public void testToolBarFocusListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         toolBar.add(b);
         FocusListener l = ui.createToolBarFocusListener();
         FocusEvent e = new FocusEvent(b, FocusEvent.FOCUS_GAINED);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTreeUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTreeUITest.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/BasicTreeUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicTreeUITest.java Sat Jun  5 08:34:57 2010
@@ -57,7 +57,6 @@ import javax.swing.tree.TreeCellEditor;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.VariableHeightLayoutCache;
 import javax.swing.tree.AbstractLayoutCache.NodeDimensions;
-import tests.support.Support_Excludes;
 
 public class BasicTreeUITest extends BasicSwingTestCase {
     private BasicTreeUI ui;
@@ -147,20 +146,12 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testPaint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Graphics g = createTestGraphics();
         g.setClip(0, 0, 100, 100);
         ui.paint(g, tree);
     }
 
     public void testGetPreferredSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.validCachedPreferredSize);
         assertEquals(new Dimension(0, 0), ui.preferredSize);
         assertNotSame(new Dimension(0, 0), ui.getPreferredSize(tree));
@@ -180,10 +171,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testGetMinimumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Dimension(0, 0), ui.getMinimumSize(tree));
         ui.preferredMinSize = new Dimension(100, 100);
         assertEquals(ui.preferredMinSize, ui.getMinimumSize(tree));
@@ -194,10 +181,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testGetMaximumSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(ui.getPreferredSize(null), ui.getMaximumSize(null));
         ui.preferredSize = new Dimension(-100, -100);
         assertEquals(new Dimension(-100, -100), ui.getMaximumSize(tree));
@@ -212,17 +195,9 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testInstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallUI(tree);
         ui.installUI(tree);
         assertNotNull(ui.treeModel);
@@ -230,27 +205,15 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotSame(BasicTreeUI.createUI(tree), BasicTreeUI.createUI(tree));
     }
 
     public void testGetClosestPathForLocation() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(ui.getClosestPathForLocation(tree, 5, 5), ui.treeState.getPathClosestTo(5,
                 5));
     }
 
     public void testGetPathBounds() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tree.setBorder(BorderFactory.createEmptyBorder(5, 12, 15, 20));
         TreePath p1 = new TreePath(new Object[] { root, node2 });
         TreePath p2 = new TreePath(new Object[] { root, node3 });
@@ -265,10 +228,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testGetPathForRow() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath p = new TreePath(new Object[] { root, node2 });
         assertTrue(tree.isRootVisible());
         assertNull(ui.getPathForRow(tree, 7));
@@ -289,10 +248,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testGetRowCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(tree.isRootVisible());
         assertEquals(4, ui.treeState.getRowCount());
         assertEquals(4, ui.getRowCount(new JTree()));
@@ -310,10 +265,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testGetRowForPath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(tree.isRootVisible());
         TreePath p = new TreePath(new Object[] { root, node2 });
         assertEquals(2, ui.getRowForPath(tree, p));
@@ -330,30 +281,18 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testIsEditing() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.isEditing(tree));
         ui.editingComponent = new JLabel();
         assertTrue(ui.isEditing(tree));
     }
 
     public void testGetEditingPath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getEditingPath(tree));
         ui.editingPath = new TreePath(root);
         assertNotNull(ui.getEditingPath(tree));
     }
 
     public void testStartEditingAtPath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.isEditing(tree));
         ui.startEditingAtPath(tree, new TreePath(root));
         assertFalse(ui.isEditing(tree));
@@ -377,10 +316,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testStartEditing() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.isEditing(tree));
         ui.startEditing(new TreePath(root), null);
         assertFalse(ui.isEditing(tree));
@@ -402,10 +337,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCancelEditing() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String initialValue = node1.getUserObject().toString();
         tree.setEditable(true);
         ui.startEditing(new TreePath(root).pathByAddingChild(node1), null);
@@ -421,10 +352,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testStopEditing() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String initialValue = node1.getUserObject().toString();
         tree.setEditable(true);
         ui.startEditing(new TreePath(root).pathByAddingChild(node1), null);
@@ -441,20 +368,12 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetHashColor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(UIManager.getColor("Tree.hash"), ui.getHashColor());
         ui.setHashColor(Color.RED);
         assertEquals(Color.RED, ui.getHashColor());
     }
 
     public void testSetGetLeftChildIndent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(UIManager.getInt("Tree.leftChildIndent"), ui.getLeftChildIndent());
         ui.setLeftChildIndent(20);
         assertEquals(20, ui.getLeftChildIndent());
@@ -463,10 +382,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetRightChildIndent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(UIManager.getInt("Tree.rightChildIndent"), ui.getRightChildIndent());
         ui.setRightChildIndent(20);
         assertEquals(20, ui.getRightChildIndent());
@@ -475,10 +390,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetExpandedIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getExpandedIcon());
         ImageIcon imageIcon = new ImageIcon("icon");
         ui.setExpandedIcon(imageIcon);
@@ -486,10 +397,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetCollapsedIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getCollapsedIcon());
         ImageIcon imageIcon = new ImageIcon("icon");
         ui.setCollapsedIcon(imageIcon);
@@ -497,20 +404,12 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetIsLargeModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.isLargeModel());
         ui.setLargeModel(true);
         assertTrue(ui.isLargeModel());
     }
 
     public void testSetGetRowHeight() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(UIManager.getInt("Tree.rowHeight"), ui.getRowHeight());
         tree.setRowHeight(20);
         assertEquals(20, ui.getRowHeight());
@@ -519,10 +418,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetCellRenderer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.getCellRenderer() instanceof DefaultTreeCellRenderer);
         DefaultTreeCellRenderer r = new DefaultTreeCellRenderer();
         tree.setCellRenderer(r);
@@ -544,10 +439,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.getModel() instanceof DefaultTreeModel);
         DefaultTreeModel m = new DefaultTreeModel(new DefaultMutableTreeNode("root"));
         ui.setModel(m);
@@ -556,10 +447,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetIsRootVisible() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.isRootVisible());
         tree.setRootVisible(false);
         assertFalse(ui.isRootVisible());
@@ -570,10 +457,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetShowsRootHandles() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.getShowsRootHandles());
         tree.setShowsRootHandles(true);
         assertTrue(ui.getShowsRootHandles());
@@ -584,10 +467,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetCellEditor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.getCellEditor());
         DefaultTreeCellEditor editor = new DefaultTreeCellEditor(tree,
                 new DefaultTreeCellRenderer());
@@ -598,10 +477,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetIsEditable() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.isEditable());
         assertNull(ui.getCellEditor());
         tree.setEditable(true);
@@ -616,10 +491,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSetGetSelectionModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.getSelectionModel() instanceof DefaultTreeSelectionModel);
         DefaultTreeSelectionModel m = new DefaultTreeSelectionModel();
         ui.setSelectionModel(m);
@@ -628,10 +499,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testPrepareForUIInstallUninstall() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui = new BasicTreeUI();
         ui.tree = tree;
         ui.prepareForUIInstall();
@@ -641,10 +508,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCompleteUIInstallUninstall() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, ui.drawingCache.size());
         assertEquals(tree.getModel(), ui.treeModel);
         ui.completeUIUninstall();
@@ -653,10 +516,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testInstallUninstallDefaults() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.collapsedIcon);
         assertNull(ui.expandedIcon);
         assertNull(ui.preferredMinSize);
@@ -688,10 +547,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testInstallUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -731,10 +586,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testInstallUninstallKeyboardActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installKeyboardActions();
         assertNotNull(SwingUtilities.getUIInputMap(tree, JComponent.WHEN_FOCUSED));
         assertNotNull(SwingUtilities.getUIInputMap(tree,
@@ -746,10 +597,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testInstallUninstallComponents() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallComponents();
         assertEquals(0, tree.getComponentCount());
         ui.installComponents();
@@ -763,10 +610,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateNodeDimensions() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tree.setRowHeight(40);
         ui.setLeftChildIndent(10);
         ui.setRightChildIndent(20);
@@ -795,10 +638,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateNodeDimensionsRTL() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tree.setRowHeight(40);
         tree.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
         NodeDimensions n = ui.createNodeDimensions();
@@ -829,10 +668,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreatePropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createPropertyChangeListener());
         if (isHarmony()) {
             assertTrue(ui.createPropertyChangeListener() instanceof BasicTreeUI.PropertyChangeHandler);
@@ -841,10 +676,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateMouseListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createMouseListener());
         if (isHarmony()) {
             assertTrue(ui.createMouseListener() instanceof BasicTreeUI.MouseHandler);
@@ -853,10 +684,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateFocusListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createFocusListener());
         if (isHarmony()) {
             assertTrue(ui.createFocusListener() instanceof BasicTreeUI.FocusHandler);
@@ -865,10 +692,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateKeyListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createKeyListener());
         if (isHarmony()) {
             assertTrue(ui.createKeyListener() instanceof BasicTreeUI.KeyHandler);
@@ -877,10 +700,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateSelectionModelPropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createSelectionModelPropertyChangeListener());
         if (isHarmony()) {
             assertTrue(ui.createSelectionModelPropertyChangeListener() instanceof BasicTreeUI.SelectionModelPropertyChangeHandler);
@@ -890,10 +709,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateTreeSelectionListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createTreeSelectionListener());
         if (isHarmony()) {
             assertTrue(ui.createTreeSelectionListener() instanceof BasicTreeUI.TreeSelectionHandler);
@@ -902,10 +717,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateCellEditorListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createCellEditorListener());
         if (isHarmony()) {
             assertTrue(ui.createCellEditorListener() instanceof BasicTreeUI.CellEditorHandler);
@@ -914,20 +725,12 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateComponentListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createComponentListener());
         assertTrue(ui.createComponentListener() instanceof BasicTreeUI.ComponentHandler);
         assertNotSame(ui.createComponentListener(), ui.createComponentListener());
     }
 
     public void testCreateTreeExpansionListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createTreeExpansionListener());
         if (isHarmony()) {
             assertTrue(ui.createTreeExpansionListener() instanceof BasicTreeUI.TreeExpansionHandler);
@@ -936,10 +739,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateLayoutCache() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tree.setRowHeight(0);
         assertNotNull(ui.createLayoutCache());
         assertNotSame(ui.createLayoutCache(), ui.createLayoutCache());
@@ -958,37 +757,21 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCreateCellRendererPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createCellRendererPane());
         assertNotSame(ui.createCellRendererPane(), ui.createCellRendererPane());
     }
 
     public void testCreateDefaultCellEditor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createDefaultCellEditor() instanceof DefaultTreeCellEditor);
         assertNotSame(ui.createDefaultCellEditor(), ui.createDefaultCellEditor());
     }
 
     public void testCreateDefaultCellRenderer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createDefaultCellRenderer() instanceof DefaultTreeCellRenderer);
         assertNotSame(ui.createDefaultCellRenderer(), ui.createDefaultCellRenderer());
     }
 
     public void testCreateTreeModelListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createTreeModelListener());
         if (isHarmony()) {
             assertTrue(ui.createTreeModelListener() instanceof BasicTreeUI.TreeModelHandler);
@@ -997,10 +780,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testShouldPaintExpandControl() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath rootPath = new TreePath(root);
         assertFalse(ui.shouldPaintExpandControl(rootPath, -10, false, false, false));
         assertFalse(ui.shouldPaintExpandControl(rootPath, 10, false, false, false));
@@ -1026,26 +805,14 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testGetVerticalLegBuffer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, ui.getVerticalLegBuffer());
     }
 
     public void testGetHorizontalLegBuffer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, ui.getHorizontalLegBuffer());
     }
 
     public void testGetRowX() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, ui.getRowX(-10, 0));
         assertEquals(ui.totalChildIndent, ui.getRowX(-10, 1));
         ui.totalChildIndent = 15;
@@ -1067,19 +834,11 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testUpdateLayoutCacheExpandedNodes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.treeModel = null;
         ui.updateLayoutCacheExpandedNodes();
     }
 
     public void testUpdateExpandedDescendants() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath pathToExpand = new TreePath(tree.getModel().getRoot())
                 .pathByAddingChild(node1);
         tree.expandPath(pathToExpand);
@@ -1092,10 +851,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testGetLastChildPath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath rootPath = new TreePath(root);
         TreePath lastChildPath = rootPath.pathByAddingChild(tree.getModel().getChild(root,
                 tree.getModel().getChildCount(root) - 1));
@@ -1105,10 +860,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testUpdateDepthOffset() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.depthOffset = -100;
         ui.updateDepthOffset();
         assertEquals(0, ui.depthOffset);
@@ -1123,10 +874,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testUpdateCellEditor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultTreeCellEditor e1 = new DefaultTreeCellEditor(tree,
                 new DefaultTreeCellRenderer());
         tree.setCellEditor(e1);
@@ -1164,10 +911,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testUpdateRenderer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultTreeCellRenderer r1 = new DefaultTreeCellRenderer();
         tree.setCellRenderer(r1);
         assertSame(r1, tree.getCellRenderer());
@@ -1190,10 +933,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testConfigureLayoutCache() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath expandedPath = new TreePath(tree.getModel().getRoot())
                 .pathByAddingChild(node1);
         tree.expandPath(expandedPath);
@@ -1208,10 +947,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testUpdateSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.preferredSize = new Dimension(100, 100);
         ui.preferredMinSize = new Dimension(200, 200);
         ui.validCachedPreferredSize = true;
@@ -1222,10 +957,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testUpdateCachedPreferredSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Dimension originalSize = ui.getPreferredSize(tree);
         ui.preferredSize = new Dimension(100, 100);
         assertTrue(ui.validCachedPreferredSize);
@@ -1238,10 +969,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testPathWasExpanded() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath rootPath = new TreePath(root);
         TreePath path1 = rootPath.pathByAddingChild(node1);
         assertFalse(ui.treeState.isExpanded(path1));
@@ -1251,10 +978,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testPathWasCollapsed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath rootPath = new TreePath(root);
         TreePath path1 = rootPath.pathByAddingChild(node1);
         tree.expandPath(path1);
@@ -1264,10 +987,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testGetSetPreferredMinSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.preferredMinSize);
         assertNull(ui.getPreferredMinSize());
         Dimension prefMinSize = new Dimension(10, 10);
@@ -1277,10 +996,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCompleteEditing() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker stopMarker = new Marker();
         final Marker cancelMarker = new Marker();
         final Marker valueMarker = new Marker();
@@ -1336,10 +1051,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testCheckForClickInExpandControl() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath path1 = new TreePath(root).pathByAddingChild(node1);
         assertFalse(tree.isExpanded(path1));
         assertTrue(ui.isLocationInExpandControl(path1, 8, 20));
@@ -1350,10 +1061,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testIsLocationInExpandControl() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath rootPath = new TreePath(root);
         TreePath path1 = rootPath.pathByAddingChild(node1);
         assertFalse(ui.isLocationInExpandControl(rootPath, 0, 5));
@@ -1424,10 +1131,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testHandleExpandControlClick() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath path1 = new TreePath(root).pathByAddingChild(node1);
         assertFalse(tree.isExpanded(path1));
         ui.handleExpandControlClick(path1, -10, -10);
@@ -1437,10 +1140,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testToggleExpandState() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath path1 = new TreePath(root).pathByAddingChild(node1);
         assertFalse(tree.isExpanded(path1));
         ui.toggleExpandState(path1);
@@ -1450,10 +1149,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testIsToggleSelectionEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.isToggleSelectionEvent(new MouseEvent(tree, MouseEvent.MOUSE_PRESSED, 0,
                 InputEvent.CTRL_DOWN_MASK, 0, 0, 1, false, MouseEvent.BUTTON1)));
         assertTrue(ui.isToggleSelectionEvent(new MouseEvent(tree, MouseEvent.MOUSE_PRESSED, 0,
@@ -1467,10 +1162,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testIsMultiSelectEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.isMultiSelectEvent(new MouseEvent(tree, MouseEvent.MOUSE_PRESSED, 0,
                 InputEvent.SHIFT_DOWN_MASK, 0, 0, 1, false, MouseEvent.BUTTON1)));
         assertTrue(ui.isMultiSelectEvent(new MouseEvent(tree, MouseEvent.MOUSE_PRESSED, 0,
@@ -1484,10 +1175,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testIsToggleEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.isToggleEvent(new MouseEvent(tree, MouseEvent.MOUSE_PRESSED, 0, 0, 0, 0,
                 2, false, MouseEvent.BUTTON1)));
         assertFalse(ui.isToggleEvent(new MouseEvent(tree, MouseEvent.MOUSE_PRESSED, 0, 0, 0, 0,
@@ -1505,10 +1192,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testSelectPathForEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TreePath rootPath = new TreePath(root);
         TreePath path1 = rootPath.pathByAddingChild(node1);
         TreePath path11 = path1.pathByAddingChild(node11);
@@ -1552,10 +1235,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testIsLeaf() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(ui.isLeaf(0));
         assertFalse(ui.isLeaf(1));
         tree.expandRow(1);
@@ -1563,10 +1242,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testKeyHandler() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicTreeUI.KeyHandler handler = ui.new KeyHandler();
         assertFalse(handler.isKeyDown);
         assertNull(handler.repeatKeyAction);
@@ -1614,10 +1289,6 @@ public class BasicTreeUITest extends Bas
     }
 
     public void testComponentHandler() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JScrollPane pane = new JScrollPane(tree);
         assertFalse(hasListener(tree.getComponentListeners(),
                 BasicTreeUI.ComponentHandler.class));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxIconTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxIconTest.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/metal/MetalComboBoxIconTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxIconTest.java Sat Jun  5 08:34:57 2010
@@ -21,7 +21,6 @@ package javax.swing.plaf.metal;
 
 import javax.swing.JLabel;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class MetalComboBoxIconTest extends SwingTestCase {
     private MetalComboBoxIcon icon;
@@ -41,26 +40,14 @@ public class MetalComboBoxIconTest exten
     }
 
     public void testGetIconHeight() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(5, icon.getIconHeight());
     }
 
     public void testGetIconWidth() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(10, icon.getIconWidth());
     }
 
     public void testPaintIcon() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         icon.paintIcon(new JLabel(), createTestGraphics(), 0, 0);
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxUITest.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/metal/MetalComboBoxUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxUITest.java Sat Jun  5 08:34:57 2010
@@ -36,7 +36,6 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicComboBoxRenderer;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
-import tests.support.Support_Excludes;
 
 public class MetalComboBoxUITest extends SwingTestCase {
     private TestUI ui;
@@ -60,19 +59,11 @@ public class MetalComboBoxUITest extends
     }
 
     public void testMetalComboBoxUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.getCurrentValuePane());
         assertFalse(ui.getCurrentValuePane().isVisible());
     }
 
     public void testCreateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = MetalComboBoxUI.createUI(comboBox);
         assertTrue(ui1.getClass() == MetalComboBoxUI.class);
         ComponentUI ui2 = MetalComboBoxUI.createUI(comboBox);
@@ -80,27 +71,15 @@ public class MetalComboBoxUITest extends
     }
 
     public void testPaint() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(comboBox);
         ui.paint(createGraphics(), null);
     }
 
     public void testCreatePropertyChangeListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createPropertyChangeListener().getClass() == MetalComboBoxUI.MetalPropertyChangeListener.class);
     }
 
     public void testConfigureUnconfigureEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setComboBox(comboBox);
         ui.setEditor(new JTextField());
         ui.configureEditor();
@@ -108,20 +87,12 @@ public class MetalComboBoxUITest extends
 
     //TODO
     public void testLayoutComboBox() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setComboBox(comboBox);
         ui.layoutComboBox(null, (MetalComboBoxUI.MetalComboBoxLayoutManager) ui
                 .createLayoutManager());
     }
 
     public void testGetMinimumSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setComboBox(comboBox);
         ComboPopup popup = new BasicComboPopup(comboBox);
         ui.setPopup(popup);
@@ -144,18 +115,10 @@ public class MetalComboBoxUITest extends
     }
 
     public void testCreateEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createEditor().getClass() == MetalComboBoxEditor.UIResource.class);
     }
 
     public void testCreateArrowButton() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setComboBox(comboBox);
         assertTrue(ui.createArrowButton().getClass() == MetalComboBoxButton.class);
         MetalComboBoxButton arrowButton = (MetalComboBoxButton) ui.createArrowButton();
@@ -174,18 +137,10 @@ public class MetalComboBoxUITest extends
     }
 
     public void testCreateLayoutManager() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createLayoutManager().getClass() == MetalComboBoxUI.MetalComboBoxLayoutManager.class);
     }
 
     public void testCreatePopup() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.setComboBox(comboBox);
         assertTrue(ui.createPopup() instanceof BasicComboPopup);
     }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalFileChooserUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalFileChooserUITest.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/metal/MetalFileChooserUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalFileChooserUITest.java Sat Jun  5 08:34:57 2010
@@ -29,7 +29,6 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class MetalFileChooserUITest extends SwingTestCase {
     private MetalFileChooserUI ui;
@@ -53,18 +52,10 @@ public class MetalFileChooserUITest exte
     }
 
     public void testCreateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotSame(MetalFileChooserUI.createUI(fc), MetalFileChooserUI.createUI(fc));
     }
 
     public void testGetButtonPanel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JPanel buttonPanel = ui.getButtonPanel();
         assertNotNull(buttonPanel);
         assertEquals(0, buttonPanel.getComponentCount());
@@ -72,10 +63,6 @@ public class MetalFileChooserUITest exte
     }
 
     public void testGetBottomPanel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JPanel bottomPanel = ui.getBottomPanel();
         assertNotNull(bottomPanel);
         assertEquals(0, bottomPanel.getComponentCount());
@@ -83,20 +70,12 @@ public class MetalFileChooserUITest exte
     }
 
     public void testGetActionMap() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ActionMap actionMap = ui.getActionMap();
         assertNotNull(actionMap);
         assertNotSame(ui.getActionMap(), ui.getActionMap());
     }
 
     public void testCreateActionMap() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         ActionMap map = ui.createActionMap();
         List<Object> allKeys = Arrays.asList(map.allKeys());
@@ -110,10 +89,6 @@ public class MetalFileChooserUITest exte
     }
 
     public void testCreateList() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         JPanel listPanel = ui.createList(fc);
         assertNotNull(listPanel);
@@ -129,10 +104,6 @@ public class MetalFileChooserUITest exte
 
     // TODO: detail view is not implemented yet
     public void testCreateDetailsView() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         //        JPanel detailsView = ui.createDetailsView(fc);
         //        assertNotNull(detailsView);
@@ -145,54 +116,30 @@ public class MetalFileChooserUITest exte
     }
 
     public void testCreateListSelectionListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createListSelectionListener(null));
         assertNotSame(ui.createListSelectionListener(null), ui
                 .createListSelectionListener(null));
     }
 
     public void testGetPreferredSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.getPreferredSize(fc));
     }
 
     public void testGetMinimumSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.getMinimumSize(fc));
     }
 
     public void testGetMaxiumumSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.getMaximumSize(null));
         assertEquals(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE), ui
                 .getMaximumSize(null));
     }
 
     public void testCreatePropertyChangeListener() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createPropertyChangeListener(null));
     }
 
     public void testGetApproveSelectionButton() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         JButton button = ui.getApproveButton(null);
         assertNotNull(button);
@@ -200,10 +147,6 @@ public class MetalFileChooserUITest exte
     }
 
     public void testGetApproveButton() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.installUI(fc);
         assertNotNull(ui.getApproveButton(fc));
         assertEquals(ui.getApproveButton(fc), ui.getApproveButton(fc));



Mime
View raw message