harmony-commits mailing list archives

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

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxIconTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxIconTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxIconTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/metal/MetalComboBoxIconTest.java Wed May 26 09:31:07 2010
@@ -21,6 +21,7 @@ package javax.swing.plaf.metal;
 
 import javax.swing.JLabel;
 import javax.swing.SwingTestCase;
+import tests.support.Support_Excludes;
 
 public class MetalComboBoxIconTest extends SwingTestCase {
     private MetalComboBoxIcon icon;
@@ -40,14 +41,26 @@ public class MetalComboBoxIconTest exten
     }
 
     public void testGetIconHeight() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(5, icon.getIconHeight());
     }
 
     public void testGetIconWidth() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(10, icon.getIconWidth());
     }
 
     public void testPaintIcon() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         icon.paintIcon(new JLabel(), createTestGraphics(), 0, 0);
     }
 }

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

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

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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -22,15 +22,24 @@ 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);
@@ -39,6 +48,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserDetailViewIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getFileChooserDetailViewIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -47,6 +60,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserHomeFolderIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getFileChooserHomeFolderIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -55,6 +72,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserListViewIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getFileChooserListViewIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -63,6 +84,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserNewFolderIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getFileChooserNewFolderIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -71,6 +96,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetFileChooserUpFolserIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getFileChooserUpFolderIcon();
         checkIcon(icon, 18, 18);
         assertTrue(icon instanceof UIResource);
@@ -79,6 +108,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetHorizontalSliderThumbIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getHorizontalSliderThumbIcon();
         checkIcon(icon, 16, 15);
         assertTrue(icon instanceof UIResource);
@@ -87,6 +120,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameAltMaximizeIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int size = 10;
         Icon icon = MetalIconFactory.getInternalFrameAltMaximizeIcon(size);
         checkIcon(icon, size, size);
@@ -96,6 +133,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameCloseIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int size = 14;
         Icon icon = MetalIconFactory.getInternalFrameCloseIcon(size);
         checkIcon(icon, size, size);
@@ -105,6 +146,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameDefaultMenuIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getInternalFrameDefaultMenuIcon();
         checkIcon(icon, 16, 16);
         assertTrue(icon instanceof UIResource);
@@ -113,6 +158,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameMaximizeIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int size = 14;
         Icon icon = MetalIconFactory.getInternalFrameMaximizeIcon(size);
         checkIcon(icon, size, size);
@@ -122,6 +171,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetInternalFrameMinimizeIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int size = 15;
         Icon icon = MetalIconFactory.getInternalFrameMinimizeIcon(size);
         checkIcon(icon, size, size);
@@ -131,6 +184,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetMenuArrowIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getMenuArrowIcon();
         checkIcon(icon, 8, 4);
         assertTrue(icon instanceof UIResource);
@@ -138,6 +195,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetMenuItemArrowIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getMenuItemArrowIcon();
         checkIcon(icon, 8, 4);
         assertTrue(icon instanceof UIResource);
@@ -146,10 +207,18 @@ 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);
@@ -158,6 +227,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetRadioButtonMenuItemIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getRadioButtonMenuItemIcon();
         checkIcon(icon, 10, 10);
         assertTrue(icon instanceof UIResource);
@@ -166,6 +239,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeComputerIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getTreeComputerIcon();
         checkIcon(icon, 16, 16);
         assertTrue(icon instanceof UIResource);
@@ -174,6 +251,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeControlIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MetalIconFactory.TreeControlIcon icon = (MetalIconFactory.TreeControlIcon) MetalIconFactory
                 .getTreeControlIcon(true);
         checkIcon(icon, 18, 18);
@@ -184,6 +265,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeFloppyDriveIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getTreeFloppyDriveIcon();
         checkIcon(icon, 16, 16);
         assertTrue(icon instanceof UIResource);
@@ -192,6 +277,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeFolderIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MetalIconFactory.TreeFolderIcon icon = (MetalIconFactory.TreeFolderIcon) MetalIconFactory
                 .getTreeFolderIcon();
         checkIcon(icon, 18, 16);
@@ -203,6 +292,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeHardDriveIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getTreeHardDriveIcon();
         checkIcon(icon, 16, 16);
         assertTrue(icon instanceof UIResource);
@@ -211,6 +304,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetTreeLeafIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MetalIconFactory.TreeLeafIcon icon = (MetalIconFactory.TreeLeafIcon) MetalIconFactory
                 .getTreeLeafIcon();
         checkIcon(icon, 20, 16);
@@ -221,6 +318,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testGetVerticalSliderThumbIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = MetalIconFactory.getVerticalSliderThumbIcon();
         checkIcon(icon, 15, 16);
         assertTrue(icon instanceof UIResource);
@@ -229,6 +330,10 @@ public class MetalIconFactoryTest extend
     }
 
     public void testPaletteCloseIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MetalIconFactory.PaletteCloseIcon icon = new MetalIconFactory.PaletteCloseIcon();
         if (isHarmony()) {
             checkIcon(icon, 8, 8);
@@ -238,6 +343,10 @@ 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);
@@ -246,6 +355,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -29,6 +29,7 @@ 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;
@@ -60,18 +61,30 @@ 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()) {
@@ -83,6 +96,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -23,6 +23,7 @@ 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) {
@@ -40,6 +41,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ 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;
@@ -64,6 +65,10 @@ 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();
@@ -92,6 +97,10 @@ 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();
@@ -119,6 +128,10 @@ 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();
@@ -147,6 +160,10 @@ 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);
@@ -158,6 +175,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -35,6 +35,7 @@ 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 {
@@ -117,18 +118,34 @@ 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);
@@ -136,10 +153,18 @@ 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);
@@ -147,6 +172,10 @@ public class MetalToolBarUITest extends 
     }
 
     public void testCreateNonRolloverBorder() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNotNull(ui.createNonRolloverBorder());
         if (isHarmony()) {
             assertTrue(ui.createNonRolloverBorder() instanceof UIResource);
@@ -154,6 +183,10 @@ 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));
@@ -164,6 +197,10 @@ public class MetalToolBarUITest extends 
     }
 
     public void testUninstallListeners() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestMetalToolBarUI ui = new TestMetalToolBarUI();
         toolBar.setUI(ui);
         ui.uninstallListeners();
@@ -173,6 +210,10 @@ public class MetalToolBarUITest extends 
     }
 
     public void testSetBorderToNonRollover() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestMetalToolBarUI ui = new TestMetalToolBarUI();
         toolBar.setUI(ui);
         ui.setBorderToNonRollover(b);
@@ -188,18 +229,34 @@ 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);
@@ -208,6 +265,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ 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;
@@ -90,18 +91,30 @@ 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());
@@ -109,14 +122,26 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -21,6 +21,7 @@ package javax.swing.text;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import tests.support.Support_Excludes;
 
 /**
  * Tests AbstractDocument.AbstractElement class - the part which
@@ -68,6 +69,10 @@ 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");
@@ -77,6 +82,10 @@ 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");
@@ -86,6 +95,10 @@ 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");
@@ -95,6 +108,10 @@ 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");
@@ -104,6 +121,10 @@ 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");
@@ -113,6 +134,10 @@ 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");
@@ -122,6 +147,10 @@ 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");
@@ -142,6 +171,10 @@ 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() {



Mime
View raw message