harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948377 [14/21] - 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/archive/src/test/j...
Date Wed, 26 May 2010 09:31:15 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuItemUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuItemUITest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuItemUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuItemUITest.java Wed May 26 09:31:07 2010
@@ -46,6 +46,7 @@ import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.InsetsUIResource;
+import tests.support.Support_Excludes;
 
 public class BasicMenuItemUITest extends SwingTestCase {
     protected String prefix;
@@ -79,6 +80,10 @@ public class BasicMenuItemUITest extends
      */
     @SuppressWarnings("deprecation")
     public void testPaint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JFrame frame = new JFrame();
         JMenuItem item = new JMenuItem();
         item.setUI(menuItemUI);
@@ -92,6 +97,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.getPreferredSize(JComponent)'
      */
     public void testGetSizes() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item = new JMenuItem() {
             private static final long serialVersionUID = 1L;
 
@@ -139,6 +148,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.uninstallUI(JComponent)'
      */
     public void testInstallUninstallUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item = new JMenuItem();
         menuItemUI.installUI(item);
         assertNotNull(item.getBorder());
@@ -163,6 +176,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.createUI(JComponent)'
      */
     public void testCreateUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ComponentUI ui1 = BasicMenuItemUI.createUI(null);
         ComponentUI ui2 = BasicMenuItemUI.createUI(null);
         assertTrue(ui1 instanceof BasicMenuItemUI);
@@ -173,6 +190,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.installDefaults()'
      */
     public void testInstallUninstallDefaults() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item = new JMenuItem();
         item.setUI(menuItemUI);
         UIManager.getDefaults().put(prefix + "background", new ColorUIResource(Color.red));
@@ -242,6 +263,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.getPropertyPrefix()'
      */
     public void testGetPropertyPrefix() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("MenuItem", menuItemUI.getPropertyPrefix());
     }
 
@@ -249,6 +274,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.installListeners()'
      */
     public void testInstallUninstallListeners() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item = new JMenuItem();
         menuItemUI = (BasicMenuItemUI) item.getUI();
         menuItemUI.uninstallListeners();
@@ -282,6 +311,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.installKeyboardActions()'
      */
     public void testInstallUninstallKeyboardActions() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item = new JMenuItem();
         item.setUI(menuItemUI);
         menuItemUI.uninstallKeyboardActions();
@@ -303,6 +336,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.createMouseInputListener(JComponent)'
      */
     public void testCreateMouseInputListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNotNull(menuItemUI.createMouseInputListener(null));
     }
 
@@ -310,6 +347,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.createMenuDragMouseListener(JComponent)'
      */
     public void testCreateMenuDragMouseListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNotNull(menuItemUI.createMenuDragMouseListener(null));
     }
 
@@ -317,6 +358,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.createMenuKeyListener(JComponent)'
      */
     public void testCreateMenuKeyListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (isHarmony()) {
             assertNull(menuItemUI.createMenuKeyListener(null));
         } else {
@@ -328,6 +373,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.getPreferredMenuItemSize(JComponent, Icon, Icon, int)'
      */
     public void testGetPreferredMenuItemSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon1 = null;
         Icon icon2 = new ImageIcon(new BufferedImage(10, 20, BufferedImage.TYPE_INT_RGB));
         Icon icon3 = new ImageIcon(new BufferedImage(100, 20, BufferedImage.TYPE_INT_RGB));
@@ -369,6 +418,10 @@ public class BasicMenuItemUITest extends
      */
     @SuppressWarnings("deprecation")
     public void testGetPath() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JFrame frame = new JFrame();
         JMenuBar menuBar = new JMenuBar();
         JMenu menu = new JMenu("menu");
@@ -410,6 +463,10 @@ public class BasicMenuItemUITest extends
      * Test method for 'javax.swing.plaf.basic.BasicMenuItemUI.doClick(MenuSelectionManager)'
      */
     public void testDoClick() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         class MyJMenuItem extends JMenuItem {
             private static final long serialVersionUID = 1L;
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUITest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUITest.java Wed May 26 09:31:07 2010
@@ -39,6 +39,7 @@ import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.InsetsUIResource;
+import tests.support.Support_Excludes;
 
 public class BasicMenuUITest extends SwingTestCase {
     protected BasicMenuUI menuUI;
@@ -67,6 +68,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.getMaximumSize(JComponent)'
      */
     public void testGetMaximumSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuBar bar = new JMenuBar();
         JMenu menu1 = new JMenu();
         menu1.setUI(menuUI);
@@ -95,6 +100,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createUI(JComponent)'
      */
     public void testCreateUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ComponentUI ui1 = BasicMenuUI.createUI(null);
         ComponentUI ui2 = BasicMenuUI.createUI(null);
         assertTrue(ui1 instanceof BasicMenuUI);
@@ -105,6 +114,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.getPropertyPrefix()'
      */
     public void testGetPropertyPrefix() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("Menu", menuUI.getPropertyPrefix());
     }
 
@@ -112,6 +125,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.installDefaults()'
      */
     public void testInstallUninstallDefaults() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenu menu = new JMenu();
         UIManager.getDefaults().put("Menu.background", new ColorUIResource(Color.red));
         UIManager.getDefaults().put("Menu.foreground", new ColorUIResource(Color.yellow));
@@ -177,6 +194,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.installListeners()'
      */
     public void testInstallUninstallListeners() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenu menu = new JMenu();
         menuUI = (BasicMenuUI) menu.getUI();
         menuUI.uninstallListeners();
@@ -222,6 +243,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.installKeyboardActions()'
      */
     public void testInstallUninstallKeyboardActions() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenu menu = new JMenu();
         menu.setUI(menuUI);
         menuUI.uninstallKeyboardActions();
@@ -246,6 +271,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createMouseInputListener(JComponent)'
      */
     public void testCreateMouseInputListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNotNull(menuUI.createMouseInputListener(null));
     }
 
@@ -253,6 +282,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createMenuDragMouseListener(JComponent)'
      */
     public void testCreateMenuDragMouseListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNotNull(menuUI.createMenuDragMouseListener(null));
         if (isHarmony()) {
             assertSame(menuUI.createMenuDragMouseListener(null), menuUI
@@ -264,6 +297,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createMenuKeyListener(JComponent)'
      */
     public void testCreateMenuKeyListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (isHarmony()) {
             assertNull(menuUI.createMenuKeyListener(null));
             assertSame(menuUI.createMenuKeyListener(null), menuUI.createMenuKeyListener(null));
@@ -276,6 +313,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.BasicMenuUI()'
      */
     public void testBasicMenuUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(menuUI.changeListener);
         assertNull(menuUI.menuListener);
         assertNull(menuUI.propertyChangeListener);
@@ -285,6 +326,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createChangeListener(JComponent)'
      */
     public void testCreateChangeListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(menuUI.createChangeListener(null));
         assertNull(menuUI.createChangeListener(new JMenu()));
     }
@@ -293,6 +338,10 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createMenuListener(JComponent)'
      */
     public void testCreateMenuListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!isHarmony()) {
             return;
         }
@@ -305,10 +354,18 @@ public class BasicMenuUITest extends Swi
      * Test method for 'javax.swing.plaf.basic.BasicMenuUI.createPropertyChangeListener(JComponent)'
      */
     public void testCreatePropertyChangeListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNotNull(menuUI.createPropertyChangeListener(null));
     }
 
     public void testInstallUninstallUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenu item = new JMenu();
         menuUI.installUI(item);
         assertNotNull(item.getBorder());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUI_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUI_MultithreadedTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUI_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicMenuUI_MultithreadedTest.java Wed May 26 09:31:07 2010
@@ -32,6 +32,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.SwingWaitTestCase;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
+import tests.support.Support_Excludes;
 
 public class BasicMenuUI_MultithreadedTest extends BasicSwingTestCase {
     protected BasicMenuUI menuUI;
@@ -70,6 +71,10 @@ public class BasicMenuUI_MultithreadedTe
      */
     @SuppressWarnings("deprecation")
     public void testSetupPostTimer() throws InterruptedException, InvocationTargetException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final MenuSelectionManager manager = MenuSelectionManager.defaultManager();
         JFrame frame = new JFrame();
         JMenuBar menuBar = new JMenuBar();

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

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRadioButtonMenuItemUITest.java Wed May 26 09:31:07 2010
@@ -20,6 +20,7 @@
 package javax.swing.plaf.basic;
 
 import javax.swing.plaf.ComponentUI;
+import tests.support.Support_Excludes;
 
 public class BasicRadioButtonMenuItemUITest extends BasicMenuItemUITest {
     protected BasicRadioButtonMenuItemUI radioUI;
@@ -44,6 +45,10 @@ public class BasicRadioButtonMenuItemUIT
      */
     @Override
     public void testCreateUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ComponentUI ui1 = BasicRadioButtonMenuItemUI.createUI(null);
         ComponentUI ui2 = BasicRadioButtonMenuItemUI.createUI(null);
         assertTrue(ui1 instanceof BasicRadioButtonMenuItemUI);
@@ -55,6 +60,10 @@ public class BasicRadioButtonMenuItemUIT
      */
     @Override
     public void testGetPropertyPrefix() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("RadioButtonMenuItem", menuItemUI.getPropertyPrefix());
     }
 
@@ -63,5 +72,9 @@ public class BasicRadioButtonMenuItemUIT
      * as method has an empty body we wo't test it
      */
     public void testProcessMouseEvent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRootPaneUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRootPaneUITest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRootPaneUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicRootPaneUITest.java Wed May 26 09:31:07 2010
@@ -30,6 +30,7 @@ import javax.swing.SwingTestCase;
 import javax.swing.SwingUtilities;
 import javax.swing.plaf.ComponentUI;
 import java.util.EventListener;
+import tests.support.Support_Excludes;
 
 public class BasicRootPaneUITest extends SwingTestCase {
     private JRootPane rootPane;
@@ -62,6 +63,10 @@ public class BasicRootPaneUITest extends
      * Class under test for constructor
      */
     public void testBasicRootPaneUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ui = new BasicRootPaneUI();
         assertTrue(ui != null);
     }
@@ -88,6 +93,10 @@ public class BasicRootPaneUITest extends
      *     void uninstallUI(JComponent)
      */
     public void testInstallUninstallUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ui.installUI(rootPane);
         // check install listeners
         assertTrue(isListenerInstalled(rootPane, ui));
@@ -117,6 +126,10 @@ public class BasicRootPaneUITest extends
      * Class under test for void propertyChange()
      */
     public void testPropertyChange() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JFrame frame = new JFrame();
         rootPane = frame.getRootPane();
         rootPane.setUI(ui);
@@ -143,6 +156,10 @@ public class BasicRootPaneUITest extends
      * Class under test for ComponentUI createUI(JComponent)
      */
     public void testCreateUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ComponentUI ui = BasicRootPaneUI.createUI(rootPane);
         assertTrue(ui != null);
         assertTrue(ui instanceof BasicRootPaneUI);

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

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

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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -40,6 +40,7 @@ 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;
@@ -88,6 +89,10 @@ 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);
@@ -95,6 +100,10 @@ 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);
@@ -106,16 +115,28 @@ 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);
@@ -124,6 +145,10 @@ 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);
@@ -132,6 +157,10 @@ 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));
@@ -139,6 +168,10 @@ 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));
@@ -146,6 +179,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testCalculateTabHeight() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!isHarmony()) {
             return;
         }
@@ -156,6 +193,10 @@ 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));
@@ -164,29 +205,53 @@ 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());
@@ -207,12 +272,20 @@ 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));
@@ -221,6 +294,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetFocusIndex() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         showTabPane();
         Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager()
                 .getFocusOwner();
@@ -229,12 +306,20 @@ 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);
@@ -244,24 +329,44 @@ 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));
@@ -270,12 +375,20 @@ 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));
@@ -284,16 +397,28 @@ 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);
@@ -303,6 +428,10 @@ 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));
@@ -312,6 +441,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabBoundsintRectangle() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         tabbed.setSize(220, 100);
         tabbed.doLayout();
         Rectangle r = new Rectangle();
@@ -325,6 +458,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabBoundsJTabbedPaneint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         tabbed.setSize(220, 100);
         tabbed.doLayout();
         Rectangle r1 = ui.getTabBounds(tabbed, 0);
@@ -334,6 +471,10 @@ 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);
@@ -344,6 +485,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testGetTabLabelShiftX() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!isHarmony()) {
             return;
         }
@@ -360,6 +505,10 @@ 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));
@@ -374,6 +523,10 @@ 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);
@@ -381,6 +534,10 @@ 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));
@@ -388,20 +545,36 @@ 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");
@@ -417,6 +590,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testInstallUninstallComponents() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int count = tabbed.getComponentCount();
         ui.uninstallComponents();
         assertEquals(count, tabbed.getComponentCount());
@@ -434,6 +611,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testInstallDefaults() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         tabbed.setBackgroundAt(0, null);
         tabbed.setBackground(null);
         tabbed.setForeground(null);
@@ -448,10 +629,18 @@ 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(
@@ -467,6 +656,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testInstallUninstallListeners() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ui.uninstallListeners();
         ui.installListeners();
         assertTrue(Arrays.asList(tabbed.getPropertyChangeListeners()).contains(
@@ -483,6 +676,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testInstallUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         tabbed.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
         ui.uninstallListeners();
         ui.uninstallComponents();
@@ -504,6 +701,10 @@ 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);
@@ -516,15 +717,27 @@ 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);
@@ -543,6 +756,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testPaintGraphicsJComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         BasicTabbedPaneUI localBasicTabbedPaneUI = new BasicTabbedPaneUI(); 
         localBasicTabbedPaneUI.installUI(new JTabbedPane());
         try { 
@@ -554,54 +771,106 @@ 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(),
@@ -611,6 +880,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSelectNextTab() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         create2TabRuns();
         int initIndex = 0;
         tabbed.setSelectedIndex(initIndex);
@@ -619,6 +892,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSelectPreviousTab() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         create2TabRuns();
         int initIndex = 0;
         tabbed.setSelectedIndex(initIndex);
@@ -627,6 +904,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSelectNextTabInRun() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         create2TabRuns();
         int initIndex = 0;
         tabbed.setSelectedIndex(initIndex);
@@ -636,6 +917,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSelectPreviousTabInRun() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         create2TabRuns();
         int initIndex = 0;
         tabbed.setSelectedIndex(initIndex);
@@ -645,6 +930,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testSetGetRolloverTab() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(-1, ui.getRolloverTab());
         ui.setRolloverTab(1);
         assertEquals(1, ui.getRolloverTab());
@@ -653,6 +942,10 @@ 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));
@@ -661,6 +954,10 @@ public class BasicTabbedPaneUITest exten
     }
 
     public void testShouldRotateTabRuns() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(ui.shouldRotateTabRuns(tabbed.getTabPlacement()));
     }
 
@@ -668,6 +965,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -31,6 +31,7 @@ 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;
@@ -84,6 +85,10 @@ 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();
@@ -105,11 +110,19 @@ 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);
@@ -126,6 +139,10 @@ 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);
@@ -133,11 +150,23 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ 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;
@@ -66,6 +67,10 @@ 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);
@@ -81,19 +86,39 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -33,6 +33,7 @@ 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;
@@ -79,6 +80,10 @@ 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());
@@ -90,10 +95,18 @@ 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());
@@ -130,6 +143,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ 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;
@@ -56,27 +57,47 @@ 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
     }
 }



Mime
View raw message