harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [15/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/metal/MetalIconFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalIconFactoryTest.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/MetalIconFactoryTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalIconFactoryTest.java Sat Jun  5 08:34:57 2010
@@ -22,24 +22,15 @@ package javax.swing.plaf.metal;
 import javax.swing.Icon;
 import javax.swing.SwingTestCase;
 import javax.swing.plaf.UIResource;
-import tests.support.Support_Excludes;
 
 public class MetalIconFactoryTest extends SwingTestCase {
     public void testGetCheckBoxIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getCheckBoxIcon();
         checkIcon(icon, 13, 13);
         assertTrue(MetalIconFactory.getCheckBoxIcon() == MetalIconFactory.getCheckBoxIcon());
     }
 
     public void testGetCheckBoxMenuItemIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getCheckBoxMenuItemIcon();
         checkIcon(icon, 10, 10);
         assertTrue(icon instanceof UIResource);
@@ -48,10 +39,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserDetailViewIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getFileChooserDetailViewIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -60,10 +47,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserHomeFolderIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getFileChooserHomeFolderIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -72,10 +55,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserListViewIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getFileChooserListViewIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -84,10 +63,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserNewFolderIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getFileChooserNewFolderIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -96,10 +71,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserUpFolserIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getFileChooserUpFolderIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -108,10 +79,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetHorizontalSliderThumbIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getHorizontalSliderThumbIcon();
         checkIcon(icon, 16, 15);
         assertTrue(icon instanceof UIResource);
@@ -120,10 +87,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameAltMaximizeIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int size = 10;
         Icon icon = MetalIconFactory.getInternalFrameAltMaximizeIcon(size);
         checkIcon(icon, size, size);
@@ -133,10 +96,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameCloseIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int size = 14;
         Icon icon = MetalIconFactory.getInternalFrameCloseIcon(size);
         checkIcon(icon, size, size);
@@ -146,10 +105,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameDefaultMenuIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getInternalFrameDefaultMenuIcon();
         checkIcon(icon, 16, 16);
         assertTrue(icon instanceof UIResource);
@@ -158,10 +113,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameMaximizeIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int size = 14;
         Icon icon = MetalIconFactory.getInternalFrameMaximizeIcon(size);
         checkIcon(icon, size, size);
@@ -171,10 +122,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameMinimizeIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int size = 15;
         Icon icon = MetalIconFactory.getInternalFrameMinimizeIcon(size);
         checkIcon(icon, size, size);
@@ -184,10 +131,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetMenuArrowIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getMenuArrowIcon();
         checkIcon(icon, 8, 4);
         assertTrue(icon instanceof UIResource);
@@ -195,10 +138,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetMenuItemArrowIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getMenuItemArrowIcon();
         checkIcon(icon, 8, 4);
         assertTrue(icon instanceof UIResource);
@@ -207,18 +146,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetMenuItemCheckIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(MetalIconFactory.getMenuItemCheckIcon());
     }
 
     public void testGetRadioButtonIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getRadioButtonIcon();
         checkIcon(icon, 13, 13);
         assertTrue(icon instanceof UIResource);
@@ -227,10 +158,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetRadioButtonMenuItemIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getRadioButtonMenuItemIcon();
         checkIcon(icon, 10, 10);
         assertTrue(icon instanceof UIResource);
@@ -239,10 +166,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeComputerIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getTreeComputerIcon();
         checkIcon(icon, 16, 16);
         assertTrue(icon instanceof UIResource);
@@ -251,10 +174,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeControlIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MetalIconFactory.TreeControlIcon icon = (MetalIconFactory.TreeControlIcon) MetalIconFactory
                 .getTreeControlIcon(true);
         checkIcon(icon, 18, 18);
@@ -265,10 +184,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeFloppyDriveIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getTreeFloppyDriveIcon();
         checkIcon(icon, 16, 16);
         assertTrue(icon instanceof UIResource);
@@ -277,10 +192,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeFolderIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MetalIconFactory.TreeFolderIcon icon = (MetalIconFactory.TreeFolderIcon) MetalIconFactory
                 .getTreeFolderIcon();
         checkIcon(icon, 18, 16);
@@ -292,10 +203,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeHardDriveIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getTreeHardDriveIcon();
         checkIcon(icon, 16, 16);
         assertTrue(icon instanceof UIResource);
@@ -304,10 +211,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeLeafIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MetalIconFactory.TreeLeafIcon icon = (MetalIconFactory.TreeLeafIcon) MetalIconFactory
                 .getTreeLeafIcon();
         checkIcon(icon, 20, 16);
@@ -318,10 +221,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetVerticalSliderThumbIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = MetalIconFactory.getVerticalSliderThumbIcon();
         checkIcon(icon, 15, 16);
         assertTrue(icon instanceof UIResource);
@@ -330,10 +229,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testPaletteCloseIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MetalIconFactory.PaletteCloseIcon icon = new MetalIconFactory.PaletteCloseIcon();
         if (isHarmony()) {
             checkIcon(icon, 8, 8);
@@ -343,10 +238,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testFolderIcon16() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MetalIconFactory.FolderIcon16 icon = new MetalIconFactory.FolderIcon16();
         checkIcon(icon, 16, 16);
         assertFalse(icon instanceof UIResource);
@@ -355,10 +246,6 @@ public class MetalIconFactoryTest extend
     }
 
     public void testFileIcon16() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MetalIconFactory.FileIcon16 icon = new MetalIconFactory.FileIcon16();
         checkIcon(icon, 16, 16);
         assertFalse(icon instanceof UIResource);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUI%24MetalRootLayoutTest.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/MetalRootPaneUI$MetalRootLayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUI$MetalRootLayoutTest.java Sat Jun  5 08:34:57 2010
@@ -29,7 +29,6 @@ import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JRootPane;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class MetalRootPaneUI$MetalRootLayoutTest extends SwingTestCase {
     private JRootPane rootPane;
@@ -61,30 +60,18 @@ public class MetalRootPaneUI$MetalRootLa
     }
 
     public void testPreferredLayoutSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ((JComponent) frame.getContentPane()).setPreferredSize(new Dimension(200, 300));
         titlePane.setPreferredSize(new Dimension(20, 20));
         assertEquals(new Dimension(230, 340), layout.preferredLayoutSize(rootPane));
     }
 
     public void testMinimumLayoutSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ((JComponent) frame.getContentPane()).setMinimumSize(new Dimension(200, 300));
         titlePane.setMinimumSize(new Dimension(20, 20));
         assertEquals(new Dimension(230, 340), layout.minimumLayoutSize(rootPane));
     }
 
     public void testMaximumLayoutSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ((JComponent) frame.getContentPane()).setMaximumSize(new Dimension(200, 300));
         titlePane.setMaximumSize(new Dimension(30, 400));
         if (isHarmony()) {
@@ -96,10 +83,6 @@ public class MetalRootPaneUI$MetalRootLa
     }
 
     public void testLayoutContainer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Dimension rootPaneDimension = new Dimension(640, 480);
         final Rectangle glassPaneBounds = new Rectangle(10, 5, 610, 460);
         final Rectangle titlePaneBounds = new Rectangle(0, 0, 610, 20);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUIRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUIRTest.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/MetalRootPaneUIRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUIRTest.java Sat Jun  5 08:34:57 2010
@@ -23,7 +23,6 @@ import java.awt.Component;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class MetalRootPaneUIRTest extends SwingTestCase {
     public MetalRootPaneUIRTest(final String name) {
@@ -41,10 +40,6 @@ public class MetalRootPaneUIRTest extend
     }
 
     public void testDialogCloseButton() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JDialog.setDefaultLookAndFeelDecorated(true);
         JDialog d = new JDialog();
         Component[] comps = d.getLayeredPane().getComponents();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUITest.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/MetalRootPaneUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalRootPaneUITest.java Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ import javax.swing.JRootPane;
 import javax.swing.SwingTestCase;
 import javax.swing.border.Border;
 import javax.swing.plaf.ComponentUI;
-import tests.support.Support_Excludes;
 
 public class MetalRootPaneUITest extends SwingTestCase {
     private JRootPane rootPane;
@@ -65,10 +64,6 @@ public class MetalRootPaneUITest extends
      * Class under test for void installUI(JComponent)
      */
     public void testInstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test install with windowDecorationStyle = JRootPane.NONE
         Border saveBorder = rootPane.getBorder();
         LayoutManager saveLayout = rootPane.getLayout();
@@ -97,10 +92,6 @@ public class MetalRootPaneUITest extends
      * Class under test for void uninstallUI(JComponent)
      */
     public void testUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test uninstall with windowDecorationStyle = JRootPane.NONE
         ui.installUI(rootPane);
         Border saveBorder = rootPane.getBorder();
@@ -128,10 +119,6 @@ public class MetalRootPaneUITest extends
      * Class under test for void propertyChange(PropertyChangeEvent)
      */
     public void testPropertyChange() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         rootPane.setUI(ui);
         Border saveBorder = rootPane.getBorder();
         LayoutManager saveLayout = rootPane.getLayout();
@@ -160,10 +147,6 @@ public class MetalRootPaneUITest extends
      * Class under test for ComponentUI createUI(JComponent)
      */
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui = MetalRootPaneUI.createUI(rootPane);
         assertTrue("not null", ui != null);
         assertTrue("instanceof MetalRootPaneUI", ui instanceof MetalRootPaneUI);
@@ -175,10 +158,6 @@ public class MetalRootPaneUITest extends
      * Class under test for MetalRootPaneUI()
      */
     public void testMetalRootPaneUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test that it doesn't crash
         ui = new MetalRootPaneUI();
     }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalToolBarUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalToolBarUITest.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/MetalToolBarUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalToolBarUITest.java Sat Jun  5 08:34:57 2010
@@ -35,7 +35,6 @@ import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.UIResource;
-import tests.support.Support_Excludes;
 
 public class MetalToolBarUITest extends SwingTestCase {
     private class TestMetalToolBarUI extends MetalToolBarUI {
@@ -118,34 +117,18 @@ public class MetalToolBarUITest extends 
     }
 
     public void testUpdate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // painting code, cannot test
     }
 
     public void testUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // nothing to test
     }
 
     public void testInstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // nothing to test
     }
 
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ComponentUI ui1 = MetalToolBarUI.createUI(toolBar);
         assertTrue(ui1 instanceof MetalToolBarUI);
         ComponentUI ui2 = MetalToolBarUI.createUI(toolBar);
@@ -153,18 +136,10 @@ public class MetalToolBarUITest extends 
     }
 
     public void testCreateDockingListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ui.createDockingListener() instanceof MetalToolBarUI.MetalDockingListener);
     }
 
     public void testCreateRolloverBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createRolloverBorder());
         if (isHarmony()) {
             assertTrue(ui.createRolloverBorder() instanceof UIResource);
@@ -172,10 +147,6 @@ public class MetalToolBarUITest extends 
     }
 
     public void testCreateNonRolloverBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(ui.createNonRolloverBorder());
         if (isHarmony()) {
             assertTrue(ui.createNonRolloverBorder() instanceof UIResource);
@@ -183,10 +154,6 @@ public class MetalToolBarUITest extends 
     }
 
     public void testInstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestMetalToolBarUI ui = new TestMetalToolBarUI();
         toolBar.setUI(ui);
         assertTrue(Arrays.asList(toolBar.getContainerListeners()).contains(ui.contListener));
@@ -197,10 +164,6 @@ public class MetalToolBarUITest extends 
     }
 
     public void testUninstallListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestMetalToolBarUI ui = new TestMetalToolBarUI();
         toolBar.setUI(ui);
         ui.uninstallListeners();
@@ -210,10 +173,6 @@ public class MetalToolBarUITest extends 
     }
 
     public void testSetBorderToNonRollover() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestMetalToolBarUI ui = new TestMetalToolBarUI();
         toolBar.setUI(ui);
         ui.setBorderToNonRollover(b);
@@ -229,34 +188,18 @@ public class MetalToolBarUITest extends 
     }
 
     public void testMetalToolBarUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // nothing to test
     }
 
     public void testCreateContainerListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.createContainerListener());
     }
 
     public void testCreateRolloverListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ui.createRolloverListener());
     }
 
     public void testSetDragOffset() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestMetalToolBarUI ui = new TestMetalToolBarUI();
         toolBar.setUI(ui);
         Point offset = new Point(1, 2);
@@ -265,10 +208,6 @@ public class MetalToolBarUITest extends 
     }
 
     public void testMetalDockingListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestMetalToolBarUI ui = new TestMetalToolBarUI();
         toolBar.setUI(ui);
         toolBar.add(b);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalTreeUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalTreeUITest.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/MetalTreeUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalTreeUITest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import javax.swing.SwingTestCase;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.tree.DefaultMutableTreeNode;
-import tests.support.Support_Excludes;
 
 public class MetalTreeUITest extends SwingTestCase {
     private MetalTreeUI ui;
@@ -91,30 +90,18 @@ public class MetalTreeUITest extends Swi
     }
 
     public void testPaint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Graphics g = createTestGraphics();
         g.setClip(0, 0, 10, 10);
         ui.paint(g, tree);
     }
 
     public void testUninstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallUI(tree);
         assertNotNull(ui.getExpandedIcon());
         assertNotNull(ui.getCollapsedIcon());
     }
 
     public void testInstallUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ui.uninstallUI(tree);
         ui.installUI(tree);
         assertNotNull(ui.getExpandedIcon());
@@ -122,26 +109,14 @@ public class MetalTreeUITest extends Swi
     }
 
     public void testCreateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotSame(MetalTreeUI.createUI(tree), MetalTreeUI.createUI(tree));
     }
 
     public void testGetHorizontalLegBuffer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(4, ui.getHorizontalLegBuffer());
     }
 
     public void testIsLocationInExpandControl() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tree.setShowsRootHandles(false);
         tree.expandPath(tree.getPathForRow(1));
         assertFalse(ui.isLocationInExpandControl(0, 0, -26, 25));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_AbstractElement_MASNoLockTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_AbstractElement_MASNoLockTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_AbstractElement_MASNoLockTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/AbstractDocument_AbstractElement_MASNoLockTest.java Sat Jun  5 08:34:57 2010
@@ -21,7 +21,6 @@ package javax.swing.text;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import tests.support.Support_Excludes;
 
 /**
  * Tests AbstractDocument.AbstractElement class - the part which
@@ -69,10 +68,6 @@ public class AbstractDocument_AbstractEl
 
     @Override
     public void testAddAttribute() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             super.testAddAttribute();
             fail("Error should be thrown, the reason " + "being no write lock acquired");
@@ -82,10 +77,6 @@ public class AbstractDocument_AbstractEl
 
     @Override
     public void testAddAttributes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             super.testAddAttributes();
             fail("Error should be thrown, the reason " + "being no write lock acquired");
@@ -95,10 +86,6 @@ public class AbstractDocument_AbstractEl
 
     @Override
     public void testRemoveAttribute() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             super.testRemoveAttribute();
             fail("Error should be thrown, the reason " + "being no write lock acquired");
@@ -108,10 +95,6 @@ public class AbstractDocument_AbstractEl
 
     @Override
     public void testRemoveAttributesAttributeSetDiff() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             super.testRemoveAttributesAttributeSetDiff();
             fail("Error should be thrown, the reason " + "being no write lock acquired");
@@ -121,10 +104,6 @@ public class AbstractDocument_AbstractEl
 
     @Override
     public void testRemoveAttributesAttributeSetSame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             super.testRemoveAttributesAttributeSetSame();
             fail("Error should be thrown, the reason " + "being no write lock acquired");
@@ -134,10 +113,6 @@ public class AbstractDocument_AbstractEl
 
     @Override
     public void testRemoveAttributesEnumeration() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             super.testRemoveAttributesEnumeration();
             fail("Error should be thrown, the reason " + "being no write lock acquired");
@@ -147,10 +122,6 @@ public class AbstractDocument_AbstractEl
 
     @Override
     public void testSetResolveParent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             super.testSetResolveParent();
             fail("Error should be thrown, the reason " + "being no write lock acquired");
@@ -171,10 +142,6 @@ public class AbstractDocument_AbstractEl
      * @throws InterruptedException if sleep is interrupted.
      */
     public void testAddAttributeAnotherThread() throws InterruptedException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         aDocument.writeLock();
         new Thread(new Runnable() {
             public void run() {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/CompositeView_VisualPositionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/CompositeView_VisualPositionTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/CompositeView_VisualPositionTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/CompositeView_VisualPositionTest.java Sat Jun  5 08:34:57 2010
@@ -23,7 +23,6 @@ import java.util.List;
 import javax.swing.text.Position.Bias;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 /**
  * Tests how <code>CompositeView</code> traverses view hierarchy to calculate
@@ -199,10 +198,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_01Edge_NonFlipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = false;
 
         // Forward
@@ -236,10 +231,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_01Edge_Flipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = true;
 
         // Forward
@@ -271,10 +262,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_12Edge_NonFlipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = false;
 
         // Forward
@@ -311,10 +298,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_12Edge_Flipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = true;
 
         // Forward
@@ -348,10 +331,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_0Middle_NonFlipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = false;
 
         // Forward
@@ -383,10 +362,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_0Middle_Flipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = true;
 
         // Forward
@@ -418,10 +393,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_AtBeginning0()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Forward
         assertNextPosition(1, Forward, 0, Forward, View.EAST);
         assertEquals(1, visPosCalled.size());
@@ -451,10 +422,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_AtBeginningMinus1()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, view.getViewIndex(-1, Forward));
 
         // Forward
@@ -484,10 +451,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_AtBeginningMinus2()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, view.getViewIndex(-2, Forward));
         try {
             assertNextPosition(length, Forward, -2, Forward, View.EAST);
@@ -501,10 +464,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_AtEndLength()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(2, view.getViewIndex(length, Forward));
 
         // Forward
@@ -536,10 +495,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Right_AtEndLength1()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, view.getViewIndex(length + 1, Forward));
         try {
             assertNextPosition(length, Forward, length + 1, Forward, View.EAST);
@@ -554,10 +509,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_01Edge_NonFlipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = false;
 
         // Forward
@@ -589,10 +540,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_01Edge_Flipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = true;
 
         // Forward
@@ -624,10 +571,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_12Edge_NonFlipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = false;
 
         // Forward
@@ -661,10 +604,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_12Edge_Flipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = true;
 
         // Forward
@@ -696,10 +635,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_0Middle_NonFlipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = false;
 
         // Forward
@@ -731,10 +666,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_0Middle_Flipped()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boxViewFlip = true;
 
         // Forward
@@ -766,10 +697,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_AtBeginning0()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Forward
         assertNextPosition(-1, null, 0, Forward, View.WEST);
         assertEquals(1, visPosCalled.size());
@@ -799,10 +726,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_AtBeginningMinus1()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Forward
         assertNextPosition(length, Forward, -1, Forward, View.WEST);
         assertEquals(1, visPosCalled.size());
@@ -831,10 +754,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_AtBeginningMinus2()
     throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             assertNextPosition(length, Forward, -2, Forward, View.WEST);
             fail("ArrayIndexOutOfBoundsException is expected");
@@ -847,10 +766,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_AtEndLength()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Forward
         assertNextPosition(length - 1, Forward, length, Forward, View.WEST);
         assertEquals(1, visPosCalled.size());
@@ -880,10 +795,6 @@ public class CompositeView_VisualPositio
     public void testGetNextVisualPositionFrom_Left_AtEndLength1()
         throws BadLocationException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             assertNextPosition(length, Forward, length + 1, Forward, View.WEST);
             fail("ArrayIndexOutOfBoundsException is expected");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaretTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaretTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaretTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaretTest.java Sat Jun  5 08:34:57 2010
@@ -39,7 +39,6 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.TextUI;
 import javax.swing.text.Position.Bias;
-import tests.support.Support_Excludes;
 
 public class DefaultCaretTest extends SwingTestCase {
     JTextArea jta = null;
@@ -208,18 +207,10 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testDefaultCaret() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(dc);
     }
 
     public void testGetComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(jta, dc.getComponent());
     }
 
@@ -229,10 +220,6 @@ public class DefaultCaretTest extends Sw
      * Mark is 0.
      */
     public void testInstall() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int tCompListenersCountCurrent = jta.getListeners(MouseListener.class).length
                 + jta.getListeners(MouseMotionListener.class).length
                 + jta.getListeners(FocusListener.class).length
@@ -252,10 +239,6 @@ public class DefaultCaretTest extends Sw
      * Document listener was removed.
      */
     public void testDeinstall() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int i = jta.getListeners(MouseListener.class).length;
         int j = jta.getListeners(MouseMotionListener.class).length;
         int k = jta.getListeners(FocusListener.class).length;
@@ -275,10 +258,6 @@ public class DefaultCaretTest extends Sw
      * Tests methods IsVisible and SetVisible
      */
     public void testIsVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setVisible(true);
         assertTrue("dc.isVisible()= false after" + " dc.setVisible(true)", dc.isVisible());
         dc.setVisible(false);
@@ -289,10 +268,6 @@ public class DefaultCaretTest extends Sw
      * Tests methods isSelectionVisible and setSelectionVisible
      */
     public void testIsSelectionVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(dc);
         dc.setSelectionVisible(true);
         assertTrue("dc.isSelectionVisible()= false after" + " dc.setSelectionVisible(true)", dc
@@ -303,10 +278,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testEquals() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(dc.equals(new DefaultCaret()));
         assertTrue(dc.equals(dc));
         assertTrue(dc.equals(jta.getCaret()));
@@ -316,10 +287,6 @@ public class DefaultCaretTest extends Sw
      * Tests addChangeListener,removeChangeListener, getChangeListener
      */
     public void testChangeListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             SimpleChangeListener t1 = new SimpleChangeListener();
             SimpleChangeListener t2 = new SimpleChangeListener();
@@ -362,10 +329,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testGetBlinkRate() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, dc.getBlinkRate());
         dc.setBlinkRate(100);
         assertEquals(100, dc.getBlinkRate());
@@ -379,10 +342,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testSetDot() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setDot(8);
         dc.moveDot(10);
         dc.setDot(5);
@@ -391,10 +350,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testMoveDot() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setDot(4);
         dc.moveDot(9);
         assertEquals("tArea", jta.getSelectedText());
@@ -403,10 +358,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testGetDot() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jta.setSelectionStart(11);
         jta.setSelectionEnd(14);
         assertEquals(14, dc.getDot());
@@ -423,10 +374,6 @@ public class DefaultCaretTest extends Sw
      * Tryes to set caret position by Mouse Events (dot = mark)
      */
     public void testPositionCaret() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Position.Bias bias[] = new Position.Bias[1];
         int tmp;
         jta.setText(sLTR + sRTL + sLTR + sRTL + sLTR + sRTL + sLTR + sRTL);
@@ -453,10 +400,6 @@ public class DefaultCaretTest extends Sw
      * Tryes to move caret position by Mouse Events (dot = mark)
      */
     public void testMoveCaret() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.positionCaret(new MouseEvent(jta, MouseEvent.MOUSE_CLICKED, 0, 0, jta.getX() + r1.x,
                 jta.getY() + r1.y, 0, false));
         dc.moveCaret(new MouseEvent(jta, MouseEvent.MOUSE_CLICKED, 0, 0, jta.getX() + r2.x, jta
@@ -477,20 +420,12 @@ public class DefaultCaretTest extends Sw
      * Tests setMagicCaretPosition and getMagicCaretPosition
      */
     public void testSetMagicCaretPosition() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setMagicCaretPosition(p);
         assertTrue(dc.getMagicCaretPosition().equals(p));
     }
 
     // TODO: may be add other listeners (not ChangeListener)
     public void testGetListeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         EventListener[] EvLList = null;
         SimpleChangeListener ChL1 = new SimpleChangeListener();
         SimpleChangeListener ChL2 = new SimpleChangeListener();
@@ -514,10 +449,6 @@ public class DefaultCaretTest extends Sw
      * was invoked ejta.scrollRectToVisible then ejta.flag would become 1.
      */
     public void testAdjustVisibility() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             r = jta.modelToView(8);
             if (r == null) {
@@ -536,19 +467,11 @@ public class DefaultCaretTest extends Sw
 
     // Regression for HARMONY-2780
     public void testAdjustVisibilityNull() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         new DefaultCaret().adjustVisibility(null);
         // No exception is expected
     }
 
     public void testFireStateChanged() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SimpleChangeListenerForFire CHL1 = new SimpleChangeListenerForFire("L1");
         SimpleChangeListenerForFire CHL2 = new SimpleChangeListenerForFire("L2");
         SimpleChangeListenerForFire CHL3 = new SimpleChangeListenerForFire("L3");
@@ -567,10 +490,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testGetSelectionPainter() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Highlighter.Highlight[] h = jta.getHighlighter().getHighlights();
         pnt = dc.getSelectionPainter();
         assertNotNull("DefaultCaret.getSelectionPainter()=null", pnt);
@@ -603,10 +522,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testFocusGained() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jta.setEditable(true);
         dc.focusGained(new FocusEvent(jta, FocusEvent.FOCUS_GAINED));
         assertTrue(dc.isVisible());
@@ -621,19 +536,11 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testFocusLost() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.focusLost(new FocusEvent(jta, FocusEvent.FOCUS_LOST));
         assertFalse(dc.isVisible());
     }
 
     public void testMouseDragged() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.mousePressed(new MouseEvent(jta, MouseEvent.MOUSE_PRESSED, 0,
                 InputEvent.BUTTON1_MASK, jta.getX() + r1.x, jta.getY() + r1.y, 0, false,
                 MouseEvent.BUTTON1));
@@ -664,10 +571,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testMouseClicked() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.mouseClicked(new MouseEvent(jta, MouseEvent.MOUSE_CLICKED, 0,
                 InputEvent.BUTTON1_DOWN_MASK, jta.getX() + r1.x, jta.getY() + r1.y, 2, false,
                 MouseEvent.BUTTON1));
@@ -680,10 +583,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testMousePressed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.mousePressed(new MouseEvent(jta, MouseEvent.MOUSE_PRESSED, 0,
                 InputEvent.SHIFT_DOWN_MASK, jta.getX() + r3.x, jta.getY() + r3.y, 0, false,
                 MouseEvent.BUTTON1));
@@ -691,10 +590,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testDocInsChange_DotEqMark() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             dc.setDot(5);
             jta.getDocument().insertString(3, "insert", null);
@@ -719,10 +614,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testDocInsChange_DotNotEqMark() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             dc.setDot(11);
             dc.moveDot(6);
@@ -752,10 +643,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testDocRemoveChange_DotEqMark() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setDot(5);
         try {
             jta.getDocument().remove(3, 1);
@@ -800,10 +687,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testDocRemoveChange_DotNotEqMark() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setDot(11);
         dc.moveDot(6);
         try {
@@ -837,10 +720,6 @@ public class DefaultCaretTest extends Sw
      *
      */
     public void testDocNeverUpdate() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);
         dc.setDot(6);
         try {
@@ -871,10 +750,6 @@ public class DefaultCaretTest extends Sw
      *
      */
     public void testConstants() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(DefaultCaret.ALWAYS_UPDATE, 2);
         assertEquals(DefaultCaret.NEVER_UPDATE, 1);
         assertEquals(DefaultCaret.UPDATE_WHEN_ON_EDT, 0);
@@ -885,10 +760,6 @@ public class DefaultCaretTest extends Sw
      *
      */
     public void testSetGetUpdatePolicy() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setUpdatePolicy(0);
         assertEquals(0, dc.getUpdatePolicy());
         dc.setUpdatePolicy(1);
@@ -909,10 +780,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testCaretColor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //TODO Runnable
         jta.setSelectionColor(c1);
         jta.setCaretColor(c2);
@@ -926,10 +793,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testInvokeFireStateChanged() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         CHL = new SimpleChangeListener();
         dc.addChangeListener(CHL);
         dc.setDot(5);
@@ -961,10 +824,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void testToString() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setDot(4);
         dc.moveDot(9);
         assertEquals("Dot=(9, Forward) Mark=(4, Forward)", dc.toString());
@@ -1016,10 +875,6 @@ public class DefaultCaretTest extends Sw
      * assertTrue(dc.getAsynchronousMovement()); }
      */
     public void testNavigationFilter() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(jta.getNavigationFilter());
         filter = new SimpleNavigationFilter();
         jta.setNavigationFilter(filter);
@@ -1031,10 +886,6 @@ public class DefaultCaretTest extends Sw
 
     //TODO
     public void testIsActive() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setVisible(true);
         assertTrue(dc.isActive());
         dc.setVisible(false);
@@ -1042,10 +893,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void test3820() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultCaret dc = new DefaultCaret();
         assertEquals(0, dc.getChangeListeners().length);
         dc.addChangeListener(null);
@@ -1053,10 +900,6 @@ public class DefaultCaretTest extends Sw
     }
 
     public void test4208() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dc.setSelectionVisible(false);
         jta.selectAll();
         assertEquals(0, jta.getHighlighter().getHighlights().length);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_BidiTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_BidiTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_BidiTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_BidiTest.java Sat Jun  5 08:34:57 2010
@@ -22,7 +22,6 @@ package javax.swing.text;
 import javax.swing.JFrame;
 import javax.swing.JTextArea;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class DefaultCaret_BidiTest extends SwingTestCase {
     AbstractDocument ad;
@@ -114,10 +113,6 @@ public class DefaultCaret_BidiTest exten
     }
 
     public void testBidiInsert() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         insertCase(0, sLTR, 2, Position.Bias.Forward, 3, Position.Bias.Forward);
         insertCase(1, sLTR, 2, Position.Bias.Forward, 3, Position.Bias.Forward);
         insertCase(2, sLTR, 2, Position.Bias.Forward, 3, Position.Bias.Backward);//b=f
@@ -157,10 +152,6 @@ public class DefaultCaret_BidiTest exten
     }
 
     public void testBidiRemove() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String s1 = sLTR + sRTL + sLTR + sRTL + sLTR + sRTL + sLTR + sRTL + sLTR;
         String s2 = sRTL + sRTL + sLTR + sLTR + sRTL + sRTL + sLTR + sLTR + sRTL;
         //s1 = sLTR + sRTL + sLTR + sRTL + sLTR + sRTL + sLTR + sRTL +
@@ -198,10 +189,6 @@ public class DefaultCaret_BidiTest exten
     }
 
     public void testBidiSetDot() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         setDotCase(0, Position.Bias.Forward, "Forward)");
         setDotCase(1, Position.Bias.Backward, "Backward)");
         setDotCase(2, Position.Bias.Forward, "Forward)");
@@ -210,10 +197,6 @@ public class DefaultCaret_BidiTest exten
     }
 
     public void testBidiMoveDot() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jta.setText(sLTR + sRTL + sLTR + sRTL + sLTR);
         dc.setDot(1, Position.Bias.Backward);
         dotTest(1, Position.Bias.Backward, "Dot=(1, Backward) Mark=(1, Backward)");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_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/text/DefaultCaret_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultCaret_MultithreadedTest.java Sat Jun  5 08:34:57 2010
@@ -24,7 +24,6 @@ import javax.swing.JFrame;
 import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWaitTestCase;
-import tests.support.Support_Excludes;
 
 public class DefaultCaret_MultithreadedTest extends BasicSwingTestCase {
     AbstractDocument ad;
@@ -75,10 +74,6 @@ public class DefaultCaret_MultithreadedT
     };
 
     public void testAsyncUpdate() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         waitForIdle();
         SwingWaitTestCase.isRealized(jf);
         ad.writeLock();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKitRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKitRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKitRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKitRTest.java Sat Jun  5 08:34:57 2010
@@ -36,7 +36,6 @@ import javax.swing.JTextArea;
 import javax.swing.JViewport;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
-import tests.support.Support_Excludes;
 
 public class DefaultEditorKitRTest extends BasicSwingTestCase {
     protected DefaultEditorKit kit = null;
@@ -112,10 +111,6 @@ public class DefaultEditorKitRTest exten
     }
 
     public void testInsertContentActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = getAction(DefaultEditorKit.insertContentAction);
         JTextArea c = getInitedComponent(2, 7, "0123456789");
         performAction(new JTextArea(), action, "command\ncontent");
@@ -130,10 +125,6 @@ public class DefaultEditorKitRTest exten
     }
 
     public void testReadInputStreamDocumentint() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker readerMarker = new Marker();
         DefaultEditorKit kit = new DefaultEditorKit() {
             private static final long serialVersionUID = 1L;
@@ -149,10 +140,6 @@ public class DefaultEditorKitRTest exten
     }
 
     public void testWriteOutputStreamDocumentintint() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker writeMarker = new Marker();
         DefaultEditorKit kit = new DefaultEditorKit() {
             private static final long serialVersionUID = 1L;
@@ -168,10 +155,6 @@ public class DefaultEditorKitRTest exten
     }
 
     public void testInsertContentActionPerformed_NullEvent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final TextAction action = (TextAction) getAction(DefaultEditorKit.insertContentAction);
         final JTextArea c = getInitedComponent(2, 7, "0123456789");
         assertNotNull(c);
@@ -190,10 +173,6 @@ public class DefaultEditorKitRTest exten
     }
 
     public void testRead() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String str1 = "Windows line-end\r\nUnix-style\nMacOS\rUnknown\n\r";
         String str2 = "Windows line-end\nUnix-style\nMacOS\nUnknown\n\n";
         InputStream reader = new ByteArrayInputStream(str1.getBytes());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKit_Actions_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/text/DefaultEditorKit_Actions_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java Sat Jun  5 08:34:57 2010
@@ -47,7 +47,6 @@ import javax.swing.JTextArea;
 import javax.swing.JViewport;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
-import tests.support.Support_Excludes;
 
 public class DefaultEditorKit_Actions_MultithreadedTest extends BasicSwingTestCase {
     protected DefaultEditorKit kit = null;
@@ -192,10 +191,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testUnselectActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.unselectAction);
         JTextArea c = getInitedComponent(10, 15, text);
@@ -205,10 +200,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testToggleComponentOrientationPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.toggleComponentOrientationAction);
         JTextArea c = getInitedComponent(10, 15, text);
@@ -220,10 +211,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testDumpModelActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         PrintStream oldErr = System.err;
         System.setErr(new PrintStream(out));
@@ -243,10 +230,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testPageActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "01\n23\n45\n677777777777777777777777777777777777777777777777777\n89\n0-\nqwe\nrty\nasd\n\n\n\n\nzxc\nvbn";
         Action action = getAction("selection-page-right");
         JTextArea c = getInitedComponent(3, 7, text);
@@ -277,10 +260,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testVerticalPageActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "111111111111111\n2\n3\n44444444\n55555555555\n6\n7\n8\n9\n0\n1\n2\n3\n4\n5555555555555555555";
         Action action = getAction(DefaultEditorKit.pageDownAction);
         JTextArea c = getInitedComponent(4, 6, text);
@@ -342,10 +321,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testWritableActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.writableAction);
         JTextArea c = getInitedComponent(13, 15, text);
@@ -356,10 +331,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testReadOnlyActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.readOnlyAction);
         JTextArea c = getInitedComponent(13, 15, text);
@@ -369,10 +340,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testEndParagraphActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "\t012345  6789\nasfd\n\n\tasd  asd";
         Action action = getAction(DefaultEditorKit.endParagraphAction);
         JTextArea c = getInitedComponent(6, text);
@@ -398,10 +365,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testBeginParagraphActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "\t012345  6789\nasfd\n\n\tasd  asd";
         Action action = getAction(DefaultEditorKit.beginParagraphAction);
         JTextArea c = getInitedComponent(6, text);
@@ -427,10 +390,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testBeginWordActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.beginWordAction);
         JTextArea c = getInitedComponent(13, 15, text);
@@ -465,10 +424,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testEndWordActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.endWordAction);
         JTextArea c = getInitedComponent(13, 15, text);
@@ -499,10 +454,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testPreviousWordActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.previousWordAction);
         JTextArea c = getInitedComponent(13, 15, text);
@@ -537,10 +488,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testNextWordActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.nextWordAction);
         JTextArea c = getInitedComponent(13, 15, text);
@@ -571,10 +518,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testBeginLineActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = getAction(DefaultEditorKit.beginLineAction);
         String text = "0123456789\n12341234\n12341234";
         JTextArea c = getInitedComponent(14, text);
@@ -597,10 +540,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testEndLineActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = getAction(DefaultEditorKit.endLineAction);
         String text = "0123456789\n12341234\n12341234";
         JTextArea c = getInitedComponent(14, text);
@@ -623,10 +562,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testEndActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = getAction(DefaultEditorKit.endAction);
         String text = "0123456789\n12341234\n12341234";
         JTextArea c = getInitedComponent(8, 14, text);
@@ -649,10 +584,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testBeginActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = getAction(DefaultEditorKit.beginAction);
         String text = "0123456789\n12341234\n12341234";
         JTextArea c = getInitedComponent(8, 14, text);
@@ -675,10 +606,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testSelectWordActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.selectWordAction);
         JTextArea c = getInitedComponent(15, text);
@@ -696,10 +623,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testSelectLineActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "0123  456789\nasdf";
         Action action = getAction(DefaultEditorKit.selectLineAction);
         JTextArea c = getInitedComponent(5, text);
@@ -714,10 +637,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testSelectParagraphActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "\t012345  6789\nasfd\n\n\tasd  asd";
         Action action = getAction(DefaultEditorKit.selectParagraphAction);
         JTextArea c = getInitedComponent(6, text);
@@ -738,10 +657,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testSelectAllActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "0123456789\nasdasd";
         Action action = getAction(DefaultEditorKit.selectAllAction);
         JTextArea c = getInitedComponent(2, 7, text);
@@ -753,10 +668,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testDeleteNextCharActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = getAction(DefaultEditorKit.deleteNextCharAction);
         JTextArea c = getInitedComponent(2, 7, "0123456789");
         performAction(c, action);
@@ -773,10 +684,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testDeletePrevCharActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = getAction(DefaultEditorKit.deletePrevCharAction);
         JTextArea c = getInitedComponent(2, 7, "0123456789");
         performAction(c, action);
@@ -793,10 +700,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testInsertContentActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = getAction(DefaultEditorKit.insertContentAction);
         JTextArea c = getInitedComponent(2, 7, "0123456789");
         performAction(c, action, "aaa");
@@ -810,10 +713,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testCopyActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // TODO: Uncomment when Clipboard is fully supported
         //        DefaultEditorKit.CopyAction action = new DefaultEditorKit.CopyAction();
         //        putStringToClipboard("");
@@ -829,10 +728,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testCutActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // TODO: Uncomment when Clipboard is fully supported
         //        DefaultEditorKit.CutAction action = new DefaultEditorKit.CutAction();
         //        putStringToClipboard("");
@@ -849,10 +744,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testPasteActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // TODO: Uncomment when Clipboard is fully supported
         //        DefaultEditorKit.PasteAction action = new DefaultEditorKit.PasteAction();
         //        putStringToClipboard("98765");
@@ -862,10 +753,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testInsertTabActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultEditorKit.InsertTabAction action = new DefaultEditorKit.InsertTabAction();
         JTextArea c = getInitedComponent(2, 7, "0123456789");
         performAction(c, action);
@@ -873,10 +760,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testInsertBreakActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultEditorKit.InsertBreakAction action = new DefaultEditorKit.InsertBreakAction();
         JTextArea c = getInitedComponent(2, 7, "0123456789");
         performAction(c, action);
@@ -884,10 +767,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testDefaultKeyTypedActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultEditorKit.DefaultKeyTypedAction action = new DefaultEditorKit.DefaultKeyTypedAction();
         JTextArea c = getInitedComponent(2, 7, "0123456789");
         performAction(c, action, "asd");
@@ -895,20 +774,12 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testBeepActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultEditorKit.BeepAction action = new DefaultEditorKit.BeepAction();
         JComponent c = new JPanel();
         performAction(c, action);
     }
 
     public void testNextVisualPositionActionPerformedCaretForward() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.forwardAction);
         JTextArea c = getInitedComponent(8, text);
@@ -926,10 +797,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testNextVisualPositionActionPerformedCaretBackward() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.backwardAction);
         JTextArea c = getInitedComponent(8, text);
@@ -947,10 +814,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testNextVisualPositionActionPerformedSelectionForward() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.selectionForwardAction);
         JTextArea c = getInitedComponent(8, text);
@@ -968,10 +831,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testNextVisualPositionActionPerformedSelectionBackward() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.selectionBackwardAction);
         JTextArea c = getInitedComponent(8, text);
@@ -989,10 +848,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testNextVisualPositionActionPerformedCaretUp() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.upAction);
         JTextArea c = getInitedComponent(15, text);
@@ -1009,10 +864,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testNextVisualPositionActionPerformedCaretDown() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.downAction);
         JTextArea c = getInitedComponent(8, text);
@@ -1035,10 +886,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testNextVisualPositionActionPerformedSelectionUp() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.selectionUpAction);
         JTextArea c = getInitedComponent(15, text);
@@ -1055,10 +902,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testNextVisualPositionActionPerformedSelectionDown() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "012345  6789\nasfd\nasd  asd";
         Action action = getAction(DefaultEditorKit.selectionDownAction);
         JTextArea c = getInitedComponent(8, text);
@@ -1077,10 +920,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testDefaultKeyTypedActionFiltering() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         HashSet<Character> nonTypingChars = new HashSet<Character>();
         for (char i = 0; i < 32; i++) {
             nonTypingChars.add(new Character(i));
@@ -1106,10 +945,6 @@ public class DefaultEditorKit_Actions_Mu
     }
 
     public void testConstants() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("caret-backward", DefaultEditorKit.backwardAction);
         assertEquals("beep", DefaultEditorKit.beepAction);
         assertEquals("caret-begin", DefaultEditorKit.beginAction);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighterTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighterTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighterTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighterTest.java Sat Jun  5 08:34:57 2010
@@ -22,7 +22,6 @@ package javax.swing.text;
 import javax.swing.JFrame;
 import javax.swing.JTextArea;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class DefaultHighlighterTest extends SwingTestCase {
     JTextArea jta;
@@ -75,10 +74,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testDefaultHighlighter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultHighlighter dh1 = new DefaultHighlighter();
         assertNotNull(dh1);
     }
@@ -91,10 +86,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testAddHighlightBadLocationException() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         bWasException = false;
         try {
             dh.addHighlight(-8, -1, lpnt);
@@ -116,10 +107,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testAddHighlight() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             obj1 = dh.addHighlight(1, 5, lpnt);
         } catch (BadLocationException e) {
@@ -144,10 +131,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testInstall() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             obj1 = dh.addHighlight(1, 5, lpnt);
         } catch (BadLocationException e) {
@@ -170,10 +153,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testDeinstall() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             obj1 = dh.addHighlight(1, 5, lpnt);
         } catch (BadLocationException e) {
@@ -195,10 +174,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testChangeHighlight() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             obj1 = dh.addHighlight(1, 5, lpnt);
         } catch (BadLocationException e) {
@@ -233,10 +208,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testChangeHighlightBadLocationException() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         bWasException = false;
         try {
             obj1 = dh.addHighlight(1, 5, lpnt);
@@ -266,10 +237,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testRemoveHighlight() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             obj1 = dh.addHighlight(1, 5, lpnt);
         } catch (BadLocationException e) {
@@ -292,20 +259,12 @@ public class DefaultHighlighterTest exte
     }
 
     public void testSetGetDrawsLayeredHighlights() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(dh.getDrawsLayeredHighlights());
         dh.setDrawsLayeredHighlights(false);
         assertFalse(dh.getDrawsLayeredHighlights());
     }
 
     public void testRemoveAllHighlights() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             dh.addHighlight(0, 1, lpnt);
             dh.addHighlight(0, 4, lpnt);
@@ -321,10 +280,6 @@ public class DefaultHighlighterTest exte
     }
 
     public void testGetHighlights() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final int N = 50;
         final int M = 25;
         Object[] obj = new Object[N];

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java Sat Jun  5 08:34:57 2010
@@ -30,7 +30,6 @@ import javax.swing.JTextArea;
 import javax.swing.SwingWaitTestCase;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class DefaultHighlighter_DefaultHighlightPainterTest extends TestCase {
     JTextArea jta;
@@ -137,10 +136,6 @@ public class DefaultHighlighter_DefaultH
     }
 
     public void testDefaultHighlightPainter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(lp);
         assertEquals(Color.red, lp.getColor());
         lp = new DefaultHighlighter.DefaultHighlightPainter(null);
@@ -163,10 +158,6 @@ public class DefaultHighlighter_DefaultH
     }
     /* hard link to coordinates
      public void testPaintLayer() throws Exception{
-         if (Support_Excludes.isExcluded()) {
-             return;
-         }
-
      String s1;
      String s2;
      paintCase("JTextArea",5,7,new Rectangle(28,0,12,16));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FieldViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FieldViewTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FieldViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FieldViewTest.java Sat Jun  5 08:34:57 2010
@@ -24,7 +24,6 @@ import javax.swing.JFrame;
 import javax.swing.JTextField;
 import javax.swing.SwingTestCase;
 import javax.swing.plaf.basic.BasicTextUI;
-import tests.support.Support_Excludes;
 
 public class FieldViewTest extends SwingTestCase {
     JFrame jf;
@@ -51,10 +50,6 @@ public class FieldViewTest extends Swing
     }
 
     public void testGetPreferredSpan() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         FontMetrics fm = fv.getFontMetrics();
         assertEquals(fm.getHeight(), (int) fv.getPreferredSpan(View.Y_AXIS));
         assertEquals(fm.stringWidth(jtf.getText()), (int) fv.getPreferredSpan(View.X_AXIS));
@@ -65,20 +60,12 @@ public class FieldViewTest extends Swing
     }
 
     public void testGetResizeWeight() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(1, fv.getResizeWeight(View.X_AXIS));
         assertEquals(0, fv.getResizeWeight(View.Y_AXIS));
         assertEquals(0, fv.getResizeWeight(5000));
     }
 
     public void testGetFontMetrics() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(jtf.getFontMetrics(jtf.getFont()), fv.getFontMetrics());
         jtf.setFont(new java.awt.Font("SimSun", 0, 12));
         fv = (FieldView) ((BasicTextUI) jtf.getUI()).getRootView(jtf).getView(0);



Mime
View raw message