harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [10/20] - in /harmony/enhanced/java/branches/mrh: classlib/make/ classlib/modules/accessibility/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/auth/make/ classli...
Date Sat, 05 Jun 2010 08:35:05 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneTest.java Sat Jun  5 08:34:57 2010
@@ -35,7 +35,6 @@ import javax.swing.border.Border;
 import javax.swing.border.EtchedBorder;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicRootPaneUI;
-import tests.support.Support_Excludes;
 
 public class JRootPaneTest extends SwingTestCase {
     /*
@@ -113,19 +112,11 @@ public class JRootPaneTest extends Swing
      * Class under test for String getUIClassID()
      */
     public void testGetUIClassID() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("RootPaneUI", rootPane.getUIClassID());
     }
 
     @SuppressWarnings("deprecation")
     public void testSetGetMenuBar() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(rootPane.getMenuBar());
         JMenuBar menuBar = new JMenuBar();
         rootPane.setMenuBar(menuBar);
@@ -135,10 +126,6 @@ public class JRootPaneTest extends Swing
     }
 
     public void testJRootPaneConstructor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(rootPane.getContentPane() != null);
         assertTrue(rootPane.getLayeredPane() != null);
         assertTrue(rootPane.getGlassPane() != null);
@@ -146,10 +133,6 @@ public class JRootPaneTest extends Swing
     }
 
     public void testSetGetContentPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JPanel contentPane = new JPanel();
         contentPane.setOpaque(true);
         rootPane.setContentPane(contentPane);
@@ -157,10 +140,6 @@ public class JRootPaneTest extends Swing
     }
 
     public void testSetGetLayeredPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JLayeredPane pane = new JLayeredPane();
         rootPane.setLayeredPane(pane);
         assertTrue(pane == rootPane.getLayeredPane());
@@ -176,10 +155,6 @@ public class JRootPaneTest extends Swing
     }
 
     public void testSetGetGlassPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JPanel pane = new JPanel();
         pane.setVisible(false);
         rootPane.setGlassPane(pane);
@@ -196,10 +171,6 @@ public class JRootPaneTest extends Swing
     }
 
     public void testSetGetJMenuBar() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(rootPane.getJMenuBar());
         JMenuBar menuBar = new JMenuBar();
         rootPane.setJMenuBar(menuBar);
@@ -209,20 +180,12 @@ public class JRootPaneTest extends Swing
     }
 
     public void testSetGetUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicRootPaneUI ui = new BasicRootPaneUI();
         rootPane.setUI(ui);
         assertTrue(rootPane.getUI() == ui);
     }
 
     public void testUpdateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         rootPane.updateUI();
         ComponentUI ui1 = rootPane.getUI();
         ComponentUI ui2 = UIManager.getUI(rootPane);
@@ -231,10 +194,6 @@ public class JRootPaneTest extends Swing
     }
 
     public void testSetGetWindowDecorationStyle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // rootPane must be inside window in this test
         JFrame frame = new JFrame();
         rootPane = frame.getRootPane();
@@ -261,10 +220,6 @@ public class JRootPaneTest extends Swing
     }
 
     public void testAddImpl() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JPanel pane = new JPanel();
         // setGlassPane() calls addImpl(), which enshures that glass pane
         // has index 0
@@ -278,18 +233,10 @@ public class JRootPaneTest extends Swing
     }
 
     public void testIsValidateRoot() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(rootPane.isValidateRoot());
     }
 
     public void testIsOptimizedDrawingEnabled() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         rootPane.getGlassPane().setVisible(false);
         assertTrue(rootPane.isOptimizedDrawingEnabled());
         rootPane.getGlassPane().setVisible(true);
@@ -297,19 +244,11 @@ public class JRootPaneTest extends Swing
     }
 
     public void testParamString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestRootPane pane = new TestRootPane();
         assertTrue(pane.paramString() != null);
     }
 
     public void testCreateRootLayout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestRootPane pane = new TestRootPane();
         LayoutManager layout = pane.createRootLayout();
         assertTrue(layout != null);
@@ -317,10 +256,6 @@ public class JRootPaneTest extends Swing
     }
 
     public void testSetGetDefaultButton() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(rootPane.getDefaultButton());
         JButton button = new JButton();
         rootPane.setDefaultButton(button);
@@ -344,10 +279,6 @@ public class JRootPaneTest extends Swing
      */
     //
     public void testRootLayout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Dimension base = new Dimension(640, 480);
         rootPane.setSize(base);
         rootPane.getLayout().layoutContainer(rootPane);
@@ -393,10 +324,6 @@ public class JRootPaneTest extends Swing
      * Class under test for void addNotify()
      */
     public void testAddNotify() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: how to test?
     }
 
@@ -404,10 +331,6 @@ public class JRootPaneTest extends Swing
      * Class under test for void removeNotify()
      */
     public void testRemoveNotify() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: how to test?
     }
 
@@ -415,10 +338,6 @@ public class JRootPaneTest extends Swing
      * Class under test for Container createContentPane()
      */
     public void testCreateContentPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestRootPane root = new TestRootPane();
         JComponent content = (JComponent) root.createContentPane();
         assertTrue(content != null);
@@ -430,10 +349,6 @@ public class JRootPaneTest extends Swing
      * Class under test for Container createGlassPane()
      */
     public void testCreateGlassPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestRootPane root = new TestRootPane();
         JComponent glass = (JComponent) root.createGlassPane();
         assertTrue(glass != null);
@@ -447,10 +362,6 @@ public class JRootPaneTest extends Swing
      * Class under test for Container createLayeredPane()
      */
     public void testCreateLayeredPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestRootPane root = new TestRootPane();
         JLayeredPane layered = root.createLayeredPane();
         assertTrue(layered != null);
@@ -460,10 +371,6 @@ public class JRootPaneTest extends Swing
      * Class under test for AccessibleContext getAccessibleContext()
      */
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AccessibleContext c = rootPane.getAccessibleContext();
         assertTrue("instanceof AccessibleJRootPane", c instanceof JRootPane.AccessibleJRootPane);
         assertTrue("AccessibleRole is ok", c.getAccessibleRole() == AccessibleRole.ROOT_PANE);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSpinnerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSpinnerTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSpinnerTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSpinnerTest.java Sat Jun  5 08:34:57 2010
@@ -37,7 +37,6 @@ import javax.swing.text.DefaultFormatter
 import javax.swing.text.NumberFormatter;
 import org.apache.harmony.x.swing.StringConstants;
 import org.apache.harmony.x.swing.Utilities;
-import tests.support.Support_Excludes;
 
 public class JSpinnerTest extends BasicSwingTestCase {
     private JSpinner spinner;
@@ -86,20 +85,12 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testJSpinner() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(spinner.getModel() instanceof SpinnerNumberModel);
         assertTrue(spinner.getEditor() instanceof JSpinner.NumberEditor);
         assertTrue(Arrays.asList(spinner.getChangeListeners()).contains(spinner.getEditor()));
     }
 
     public void testSetGetUpdateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(spinner.getUIClassID(), "SpinnerUI");
         SpinnerUI defaultUI = spinner.getUI();
         assertNotNull(defaultUI);
@@ -115,10 +106,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testSetGetModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SpinnerNumberModel newModel = new SpinnerNumberModel(0, -1, 1, 1);
         spinner.setModel(newModel);
         assertSame(newModel, spinner.getModel());
@@ -143,29 +130,17 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testSetGetValue() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         spinner.setValue(new Integer(10));
         assertTrue(chl.isChanged());
         assertEquals(spinner.getModel().getValue(), spinner.getValue());
     }
 
     public void testGetPreviousNextValue() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(spinner.getNextValue(), spinner.getModel().getNextValue());
         assertEquals(spinner.getPreviousValue(), spinner.getModel().getPreviousValue());
     }
 
     public void testAddRemoveGetChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(2, spinner.getChangeListeners().length);
         assertTrue(Arrays.asList(spinner.getChangeListeners()).contains(chl));
         ChangeListener listener = new ChangeListener() {
@@ -180,19 +155,11 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testFireStateChanged() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         spinner.getModel().setValue(new Integer(10));
         assertTrue(chl.isChanged());
     }
 
     public void testSetGetEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComponent oldEditor = spinner.getEditor();
         assertNotNull(oldEditor);
         JComponent editor = new JProgressBar();
@@ -227,10 +194,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testCreateEditor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SpinnerModel model = new SpinnerNumberModel();
         spinner.setModel(model);
         assertTrue(spinner.createEditor(model) instanceof JSpinner.NumberEditor);
@@ -244,17 +207,9 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testDefaultEditor_DefaultEditor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultEditor defaultEditor = (DefaultEditor) spinner.createEditor(abstractModel);
         spinner.setEditor(defaultEditor);
         assertTrue(Arrays.asList(defaultEditor.getTextField().getPropertyChangeListeners())
@@ -270,10 +225,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testDefaultEditor_propertyChange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultEditor defaultEditor = (DefaultEditor) spinner.getEditor();
         PropertyChangeController pcc = new PropertyChangeController();
         ChangeController modelController = new ChangeController();
@@ -302,10 +253,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testDefaultEditor_stateChange() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultEditor defaultEditor = (DefaultEditor) spinner.getEditor();
         PropertyChangeController pcc = new PropertyChangeController();
         defaultEditor.getTextField().addPropertyChangeListener(pcc);
@@ -314,10 +261,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testDefaultEditor_LayoutSizes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultEditor defaultEditor = (DefaultEditor) spinner.createEditor(abstractModel);
         spinner.setEditor(defaultEditor);
         assertEquals(defaultEditor.minimumLayoutSize(spinner), Utilities.addInsets(
@@ -327,10 +270,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testNumberEditor_NumberEditor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         spinner.getModel().setValue(new Integer(5));
         NumberEditor numEditor = new NumberEditor(spinner);
         spinner.setEditor(numEditor);
@@ -352,10 +291,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testNumberEditor_formatter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberEditor numEditor = new NumberEditor(spinner);
         spinner.setEditor(numEditor);
         final Integer max1 = new Integer(777);
@@ -377,10 +312,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testNumberEditor_getModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberEditor numEditor = new NumberEditor(spinner);
         spinner.setEditor(numEditor);
         assertSame(numEditor.getModel(), spinner.getModel());
@@ -394,10 +325,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testDateEditor_DateEditor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         spinner.setModel(new SpinnerDateModel());
         DateEditor dateEditor = (DateEditor) spinner.getEditor();
         spinner.setEditor(dateEditor);
@@ -416,10 +343,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testDateEditor_formatter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         spinner.setModel(new SpinnerDateModel());
         DateEditor dateEditor = new DateEditor(spinner);
         spinner.setEditor(dateEditor);
@@ -441,10 +364,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testListEditor_ListEditor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Object[] values = { "arrline1", "arrline2", "text", new Integer(33), spinner };
         spinner.setModel(new SpinnerListModel(values));
         ListEditor listEditor = new ListEditor(spinner);
@@ -460,10 +379,6 @@ public class JSpinnerTest extends BasicS
     }
 
     public void testListEditor_formatter() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComponent comp = new JButton();
         Object[] values = { "arrline1", "arrline2", "text", new Integer(33), comp };
         spinner.setModel(new SpinnerListModel(values));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSplitPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSplitPaneTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSplitPaneTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JSplitPaneTest.java Sat Jun  5 08:34:57 2010
@@ -25,7 +25,6 @@ import java.awt.Graphics;
 import javax.swing.plaf.SplitPaneUI;
 import javax.swing.plaf.basic.BasicSplitPaneUI;
 import javax.swing.plaf.metal.MetalSplitPaneUI;
-import tests.support.Support_Excludes;
 
 public class JSplitPaneTest extends SwingTestCase {
     private JSplitPane pane;
@@ -47,10 +46,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testJSplitPane() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(pane.getLeftComponent() instanceof JButton);
         assertTrue(pane.getRightComponent() instanceof JButton);
         assertFalse(pane.isContinuousLayout());
@@ -105,10 +100,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetSetUpdateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(pane.getUI());
         SplitPaneUI ui = new MetalSplitPaneUI();
         pane.setUI(ui);
@@ -118,18 +109,10 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetUIClassID() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("SplitPaneUI", pane.getUIClassID());
     }
 
     public void testGetSetDividerSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(UIManager.getInt("SplitPane.dividerSize"), pane.getDividerSize());
         pane.setDividerSize(20);
         assertEquals(20, pane.getDividerSize());
@@ -137,10 +120,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetSetLeftTopComponent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(pane.getLeftComponent() instanceof JButton);
         Component left = new JPanel();
         pane.setLeftComponent(left);
@@ -155,10 +134,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetSetRightBottomComponent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(pane.getRightComponent() instanceof JButton);
         Component right = new JPanel();
         pane.setRightComponent(right);
@@ -173,10 +148,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testIsSetOneTouchExpandable() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(pane.isOneTouchExpandable());
         pane.setOneTouchExpandable(true);
         assertTrue(pane.isOneTouchExpandable());
@@ -184,10 +155,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetSetLastDividerLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, pane.getLastDividerLocation());
         pane.setLastDividerLocation(20);
         assertEquals(20, pane.getLastDividerLocation());
@@ -195,10 +162,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetSetOrientation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(JSplitPane.HORIZONTAL_SPLIT, pane.getOrientation());
         pane.setOrientation(JSplitPane.VERTICAL_SPLIT);
         assertEquals(JSplitPane.VERTICAL_SPLIT, pane.getOrientation());
@@ -206,10 +169,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testIsSetContinuousLayout() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(pane.isContinuousLayout());
         pane.setContinuousLayout(true);
         assertTrue(pane.isContinuousLayout());
@@ -217,10 +176,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetSetResizeWeight() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, 0, pane.getResizeWeight());
         pane.setResizeWeight(0.4);
         assertEquals(0, 0.4, pane.getResizeWeight());
@@ -240,10 +195,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testResetToPreferredSizes() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             ((JComponent) pane.getLeftComponent()).setPreferredSize(new Dimension(100, 50));
             ((JComponent) pane.getRightComponent()).setPreferredSize(new Dimension(100, 50));
@@ -257,10 +208,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetSetDividerLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, pane.getDividerLocation());
         ((JComponent) pane.getLeftComponent()).setPreferredSize(new Dimension(100, 50));
         ((JComponent) pane.getRightComponent()).setPreferredSize(new Dimension(100, 50));
@@ -286,10 +233,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetMinimumMaximumDividerLocation() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SplitPaneUI ui = new BasicSplitPaneUI() {
             @Override
             public int getMinimumDividerLocation(final JSplitPane sp) {
@@ -307,10 +250,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testRemove() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(pane.getLeftComponent());
         pane.remove(pane.getLeftComponent());
         assertNull(pane.getLeftComponent());
@@ -333,18 +272,10 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testIsValidateRoot() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(pane.isValidateRoot());
     }
 
     public void testAddImpl() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pane.removeAll();
         assertEquals(0, pane.getComponentCount());
         Component left = new JButton();
@@ -399,10 +330,6 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testPaintChildren() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker m = new Marker();
         SplitPaneUI ui = new BasicSplitPaneUI() {
             @Override
@@ -416,18 +343,10 @@ public class JSplitPaneTest extends Swin
     }
 
     public void testGetAccessibleContext() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(pane.getAccessibleContext() instanceof JSplitPane.AccessibleJSplitPane);
     }
 
     public void testIsOpaque() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(pane.isOpaque());
     }
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTableTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTableTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTableTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTableTest.java Sat Jun  5 08:34:57 2010
@@ -35,7 +35,6 @@ import javax.swing.table.TableCellEditor
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
-import tests.support.Support_Excludes;
 
 @SuppressWarnings("serial")
 public class JTableTest extends BasicSwingTestCase {
@@ -58,10 +57,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testJTable() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(DefaultTableModel.class, table.dataModel.getClass());
         assertSame(DefaultTableColumnModel.class, table.columnModel.getClass());
         assertSame(DefaultListSelectionModel.class, table.selectionModel.getClass());
@@ -97,10 +92,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testAddNotify() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker marker = new Marker();
         new JTable() {
             @Override
@@ -112,10 +103,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testRemoveNotify() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker marker = new Marker();
         new JTable() {
             @Override
@@ -127,10 +114,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testConfigureUnconfigureEnclosingScrollPane() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JScrollPane pane = new JScrollPane();
         pane.setViewportView(table);
         assertNull(pane.getColumnHeader());
@@ -142,10 +125,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetTableHeader() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(table.getTableHeader());
         assertEquals(table.tableHeader, table.getTableHeader());
         assertEquals(table, table.getTableHeader().getTable());
@@ -163,10 +142,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetRowHeight() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(16, table.rowHeight);
         assertEquals(16, table.getRowHeight());
         table.setRowHeight(30);
@@ -225,10 +200,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetRowMargin() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(1, table.getRowMargin());
         assertEquals(1, table.getIntercellSpacing().height);
         table.setRowMargin(10);
@@ -241,10 +212,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetIntercellSpacing() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Dimension(1, 1), table.getIntercellSpacing());
         assertNotSame(table.getIntercellSpacing(), table.getIntercellSpacing());
         table.setRowMargin(10);
@@ -262,10 +229,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetGridColor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(UIManager.getColor("Table.gridColor"), table.getGridColor());
         table.setGridColor(Color.RED);
         assertEquals(Color.RED, table.getGridColor());
@@ -273,10 +236,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testSetShowGrid() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(table.getShowHorizontalLines());
         assertTrue(table.getShowVerticalLines());
         table.setShowGrid(false);
@@ -290,10 +249,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetShowHorizontalLines() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(table.getShowHorizontalLines());
         table.setShowHorizontalLines(false);
         assertFalse(table.getShowHorizontalLines());
@@ -303,10 +258,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetShowVerticalLines() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(table.getShowVerticalLines());
         table.setShowVerticalLines(false);
         assertFalse(table.getShowVerticalLines());
@@ -316,10 +267,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetAutoResizeMode() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS, table.getAutoResizeMode());
         table.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
         assertEquals(JTable.AUTO_RESIZE_ALL_COLUMNS, table.getAutoResizeMode());
@@ -331,10 +278,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetAutoCreateColumnsFromModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(table.getAutoCreateColumnsFromModel());
         table.setAutoCreateColumnsFromModel(false);
         assertFalse(table.getAutoCreateColumnsFromModel());
@@ -352,10 +295,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testCreateDefaultColumnsFromModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TableColumnModel columnModel = table.getColumnModel();
         assertEquals(0, columnModel.getColumnCount());
         TableColumn modelColumn1 = new TableColumn();
@@ -379,10 +318,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetDefaultRenderer() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(8, table.defaultRenderersByColumnClass.size());
         assertNotNull(table.getDefaultRenderer(String.class));
         assertSame(table.defaultRenderersByColumnClass.get(Object.class), table
@@ -404,10 +339,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetDefaultEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(3, table.defaultEditorsByColumnClass.size());
         assertNotNull(table.getDefaultEditor(String.class));
         assertSame(table.defaultEditorsByColumnClass.get(Object.class), table
@@ -426,20 +357,12 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetDragEnabled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(table.getDragEnabled());
         table.setDragEnabled(true);
         assertTrue(table.getDragEnabled());
     }
 
     public void testSetSelectionMode() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION, table.getSelectionModel()
                 .getSelectionMode());
         assertEquals(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION, table.getColumnModel()
@@ -453,10 +376,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetRowSelectionAllowed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(table.getRowSelectionAllowed());
         table.setRowSelectionAllowed(false);
         assertFalse(table.getRowSelectionAllowed());
@@ -464,10 +383,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetColumnSelectionAllowed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(table.getColumnSelectionAllowed());
         assertFalse(table.getColumnModel().getColumnSelectionAllowed());
         table.setColumnSelectionAllowed(true);
@@ -477,10 +392,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetCellSelectionEnabled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(table.getCellSelectionEnabled());
         assertFalse(table.cellSelectionEnabled);
         table.setCellSelectionEnabled(false);
@@ -502,10 +413,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testSelectAllClearSelection() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, getSelectedIndices(table.getSelectionModel()).length);
         assertEquals(0, getSelectedIndices(table.getColumnModel().getSelectionModel()).length);
@@ -522,10 +429,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testSetRowSelectionInterval() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, getSelectedIndices(table.getSelectionModel()).length);
         table.setRowSelectionInterval(1, 2);
@@ -552,10 +455,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testSetColumnSelectionInterval() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, getSelectedIndices(table.getColumnModel().getSelectionModel()).length);
         table.setColumnSelectionInterval(1, 2);
@@ -582,10 +481,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testAddRemoveRowSelectionInterval() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, getSelectedIndices(table.getSelectionModel()).length);
         table.addRowSelectionInterval(0, 0);
@@ -625,10 +520,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testAddRemoveColumnSelectionInterval() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, getSelectedIndices(table.getColumnModel().getSelectionModel()).length);
         table.addColumnSelectionInterval(0, 0);
@@ -673,10 +564,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSelectedRow() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(-1, table.getSelectedRow());
         table.setRowSelectionInterval(1, 1);
@@ -686,10 +573,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSelectedColumn() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(-1, table.getSelectedColumn());
         table.setColumnSelectionInterval(1, 1);
@@ -699,10 +582,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSelectedRows() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, table.getSelectedRows().length);
         table.setRowSelectionInterval(1, 1);
@@ -715,10 +594,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSelectedColumns() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, table.getSelectedColumns().length);
         table.setColumnSelectionInterval(0, 1);
@@ -733,10 +608,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSelectedRowCount() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, table.getSelectedRowCount());
         table.setRowSelectionInterval(1, 1);
@@ -746,10 +617,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSelectedColumnCount() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(0, table.getSelectedColumnCount());
         table.setColumnSelectionInterval(0, 1);
@@ -759,10 +626,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testIsRowSelected() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertFalse(table.isRowSelected(0));
         assertFalse(table.isRowSelected(1));
@@ -776,10 +639,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testIsColumnSelected() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertFalse(table.isColumnSelected(0));
         assertFalse(table.isColumnSelected(1));
@@ -796,10 +655,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testIsCellSelected() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertTrue(table.getRowSelectionAllowed());
         assertFalse(table.getColumnSelectionAllowed());
@@ -905,10 +760,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testChangeSelection() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         table.setCellSelectionEnabled(true);
         table.changeSelection(1, 1, true, false);
@@ -961,10 +812,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetSelectionForegroundBackground() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(UIManager.getColor("Table.selectionForeground"), table
                 .getSelectionForeground());
         assertEquals(UIManager.getColor("Table.selectionBackground"), table
@@ -979,10 +826,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetColumn() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertNotNull(table.getColumn("A"));
         assertNotNull(table.getColumn("B"));
@@ -1005,10 +848,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testConvertColumnIndexToModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-5, table.convertColumnIndexToModel(-5));
         table = new JTable(3, 4);
         assertEquals(0, table.convertColumnIndexToModel(0));
@@ -1037,10 +876,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testConvertColumnIndexToView() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-5, table.convertColumnIndexToView(-5));
         assertEquals(-1, table.convertColumnIndexToView(10));
         table = new JTable(3, 4);
@@ -1064,10 +899,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetRowCount() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, table.getRowCount());
         table = new JTable(3, 4);
         assertEquals(3, table.getRowCount());
@@ -1081,10 +912,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetColumnCount() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, table.getColumnCount());
         table = new JTable(3, 4);
         assertEquals(4, table.getColumnCount());
@@ -1098,10 +925,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetColumnName() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals("A", table.getColumnName(0));
         assertEquals("B", table.getColumnName(1));
@@ -1127,10 +950,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetColumnClass() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(new DefaultTableModel(3, 4) {
             @Override
             public Class<?> getColumnClass(final int columnIndex) {
@@ -1156,10 +975,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetvalueAt() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertNull(table.getValueAt(0, 0));
         assertNull(table.getValueAt(0, 1));
@@ -1183,10 +998,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testIsCellEditable() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(new DefaultTableModel(3, 4) {
             @Override
             public boolean isCellEditable(final int row, final int column) {
@@ -1212,10 +1023,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testAddColumn() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, table.getColumnCount());
         TableColumn column1 = new TableColumn(0);
         column1.setIdentifier("column1");
@@ -1255,10 +1062,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testRemoveColumn() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, table.getColumnCount());
         TableColumn column1 = new TableColumn(0);
         column1.setIdentifier("column1");
@@ -1278,10 +1081,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testMoveColumn() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TableColumn column1 = new TableColumn(0);
         table.addColumn(column1);
         assertEquals(0, table.getColumnModel().getColumnIndex("A"));
@@ -1294,10 +1093,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testColumnAtPoint() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, table.columnAtPoint(new Point(10, 10)));
         assertEquals(-1, table.columnAtPoint(new Point(-10, 10)));
         table.addColumn(new TableColumn(0, 20));
@@ -1314,10 +1109,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testRowAtPoint() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, table.rowAtPoint(new Point(10, 10)));
         assertEquals(-1, table.rowAtPoint(new Point(10, -10)));
         table = new JTable(3, 4);
@@ -1338,10 +1129,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetCellRect() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Rectangle(), table.getCellRect(0, 0, true));
         assertEquals(new Rectangle(), table.getCellRect(0, 0, false));
         assertEquals(new Rectangle(), table.getCellRect(10, 10, true));
@@ -1365,10 +1152,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetToolTipText() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(table.getToolTipText(new MouseEvent(table, MouseEvent.MOUSE_ENTERED, 0, 0,
                 0, 0, 0, false)));
         table = new JTable(3, 4) {
@@ -1394,10 +1177,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetSurrendersFocusOnKeystroke() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(table.getSurrendersFocusOnKeystroke());
         table.setSurrendersFocusOnKeystroke(true);
         assertTrue(table.getSurrendersFocusOnKeystroke());
@@ -1406,10 +1185,6 @@ public class JTableTest extends BasicSwi
 
     @SuppressWarnings("deprecation")
     public void testEditCellAt() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(table.editCellAt(0, 0));
         assertFalse(table.isEditing());
         assertEquals(-1, table.getEditingRow());
@@ -1446,30 +1221,18 @@ public class JTableTest extends BasicSwi
     }
 
     public void testIsEditing() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(table.isEditing());
         table.cellEditor = new DefaultCellEditor(new JCheckBox());
         assertTrue(table.isEditing());
     }
 
     public void testGetEditingComponent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(table.getEditorComponent());
         table.editorComp = new JLabel();
         assertEquals(table.editorComp, table.getEditorComponent());
     }
 
     public void testGetSetEditingRowColumn() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, table.getEditingRow());
         assertEquals(-1, table.getEditingColumn());
         table.editingRow = 25;
@@ -1482,10 +1245,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetUpdateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(table.getUI() instanceof BasicTableUI);
         TableUI ui = new BasicTableUI();
         table.setUI(ui);
@@ -1495,18 +1254,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetUIClassID() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("TableUI", table.getUIClassID());
     }
 
     public void testGetSetModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultTableModel oldModel = (DefaultTableModel) table.getModel();
         assertNotNull(oldModel);
         assertEquals(1, oldModel.getTableModelListeners().length);
@@ -1529,10 +1280,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetColumnModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         DefaultTableColumnModel oldModel = (DefaultTableColumnModel) table.getColumnModel();
         assertNotNull(oldModel);
@@ -1554,10 +1301,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetSelectionModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultListSelectionModel oldModel = (DefaultListSelectionModel) table
                 .getSelectionModel();
         assertNotNull(oldModel);
@@ -1577,10 +1320,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testEditingCanceled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         table.editCellAt(0, 0);
         assertTrue(table.isEditing());
@@ -1596,10 +1335,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testEditingStoppped() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         table.editCellAt(0, 0);
         assertTrue(table.isEditing());
@@ -1615,10 +1350,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetPreferredScrollableViewportSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Dimension(450, 400), table.getPreferredScrollableViewportSize());
         table = new JTable(3, 4);
         assertEquals(new Dimension(450, 400), table.getPreferredScrollableViewportSize());
@@ -1634,43 +1365,23 @@ public class JTableTest extends BasicSwi
 
     //TODO
     public void testGetScrollableUnitIncrement() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     //TODO
     public void testGetScrollableBlockIncrement() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetScrollableTracksViewportWidth() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(table.getScrollableTracksViewportWidth());
         table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
         assertFalse(table.getScrollableTracksViewportWidth());
     }
 
     public void testGetScrollableTracksViewportHeight() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(table.getScrollableTracksViewportHeight());
     }
 
     public void testCreateDefaultRenderers() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(8, table.defaultRenderersByColumnClass.size());
         table.defaultRenderersByColumnClass = null;
         table.createDefaultRenderers();
@@ -1678,10 +1389,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testCreateDefaultEditors() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(3, table.defaultEditorsByColumnClass.size());
         table.defaultEditorsByColumnClass = null;
         table.createDefaultEditors();
@@ -1689,10 +1396,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testInitializeLocalVars() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table.rowMargin = 0;
         table.tableHeader = null;
         table.rowHeight = 0;
@@ -1717,47 +1420,27 @@ public class JTableTest extends BasicSwi
     }
 
     public void testCreateDefaultDataModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(DefaultTableModel.class, table.createDefaultDataModel().getClass());
         assertNotSame(table.createDefaultDataModel(), table.createDefaultDataModel());
     }
 
     public void testCreateDefaultColumnModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(DefaultTableColumnModel.class, table.createDefaultColumnModel().getClass());
         assertNotSame(table.createDefaultColumnModel(), table.createDefaultColumnModel());
     }
 
     public void testCreateDefaultSelectionModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(DefaultListSelectionModel.class, table.createDefaultSelectionModel()
                 .getClass());
         assertNotSame(table.createDefaultSelectionModel(), table.createDefaultSelectionModel());
     }
 
     public void testCreateDefaultTableHeader() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(JTableHeader.class, table.createDefaultTableHeader().getClass());
         assertNotSame(table.createDefaultTableHeader(), table.createDefaultTableHeader());
     }
 
     public void testGetSetCellEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(table.getCellEditor());
         TableCellEditor editor = new DefaultCellEditor(new JTextField());
         table.setCellEditor(editor);
@@ -1765,10 +1448,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetCellRenderer() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(table.defaultRenderersByColumnClass.get(Object.class), table
                 .getCellRenderer(0, 0));
@@ -1790,10 +1469,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testPrepareRenderer() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         DefaultTableCellRenderer renderer = new DefaultTableCellRenderer();
         assertSame(renderer, table.prepareRenderer(renderer, 0, 0));
@@ -1806,10 +1481,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testPrepareEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         JTextField editorComponent = new JTextField();
         DefaultCellEditor editor = new DefaultCellEditor(editorComponent);
@@ -1821,10 +1492,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetCellEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table = new JTable(3, 4);
         assertEquals(table.defaultEditorsByColumnClass.get(Object.class), table.getCellEditor(
                 0, 0));
@@ -1846,10 +1513,6 @@ public class JTableTest extends BasicSwi
     }
 
     public void testRemoveEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         table.removeEditor();
         int childrenCount = table.getComponentCount();
         table.setCellEditor(new DefaultCellEditor(new JTextField()));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextArea_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextArea_MultithreadedTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextArea_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextArea_MultithreadedTest.java Sat Jun  5 08:34:57 2010
@@ -22,7 +22,6 @@ package javax.swing;
 import java.awt.Container;
 import java.awt.GridLayout;
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class JTextArea_MultithreadedTest extends TestCase {
     JFrame jf;
@@ -87,10 +86,6 @@ public class JTextArea_MultithreadedTest
     }
 
     public void testReplaceRange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jta.replaceRange(str1, 5, 10);
         tmp = replaceRange(content, str1, 5, 10);
         assertEquals(tmp, jta.getText());
@@ -135,10 +130,6 @@ public class JTextArea_MultithreadedTest
     }
 
     public void testInsert() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jta.insert(str1, 5);
         tmp = insertString(content, str1, 5);
         assertEquals(tmp, jta.getText());
@@ -177,10 +168,6 @@ public class JTextArea_MultithreadedTest
     }
 
     public void testAppend() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jta.append(str1);
         tmp = content + str1;
         assertEquals(tmp, jta.getText());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextFieldTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextFieldTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextFieldTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextFieldTest.java Sat Jun  5 08:34:57 2010
@@ -45,7 +45,6 @@ import javax.swing.text.DefaultEditorKit
 import javax.swing.text.Document;
 import javax.swing.text.PlainDocument;
 import javax.swing.text.View;
-import tests.support.Support_Excludes;
 
 public class JTextFieldTest extends SwingTestCase {
     String sLTR = "abcd";
@@ -205,10 +204,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testAccessibleJTextField() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AccessibleContext accessible = jtf.getAccessibleContext();
         assertTrue(accessible instanceof JTextField.AccessibleJTextField);
         assertEquals(jtf.getAccessibleContext(), accessible);
@@ -220,10 +215,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testAddRemoveGetActionListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SimpleActionListener listener1 = new SimpleActionListener("first");
         SimpleActionListener listener2 = new SimpleActionListener("second");
         SimpleActionListener listener3 = new SimpleActionListener("third");
@@ -281,10 +272,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testConfigurePropertiesFromAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = new DefaultEditorKit.CutAction();
         jtf.configurePropertiesFromAction(action);
         assertTrue(jtf.isEnabled());
@@ -297,10 +284,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testCreateActionPropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action action = new DefaultEditorKit.CutAction();
         PropertyChangeListener listener = jtf.createActionPropertyChangeListener(action);
         assertNotNull(listener);
@@ -317,10 +300,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testCreateDefaultModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Document doc = jtf.createDefaultModel();
         Document doc1 = jtf.createDefaultModel();
         assertTrue(doc instanceof PlainDocument);
@@ -329,10 +308,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testFireActionPerformed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SimpleActionListener listener1 = new SimpleActionListener("first");
         SimpleActionListener listener2 = new SimpleActionListener("second");
         SimpleActionListener listener3 = new SimpleActionListener("third");
@@ -354,10 +329,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testGetActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action editorKitActions[] = jtf.getUI().getEditorKit(jtf).getActions();
         Action jtfActions[] = jtf.getActions();
         assertEquals(editorKitActions.length + 1, jtfActions.length);
@@ -377,10 +348,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testGetHorizontalVisibility() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BoundedRangeModel brm = jtf.getHorizontalVisibility();
         assertTrue(brm instanceof DefaultBoundedRangeModel);
         assertEquals(0, brm.getMinimum());
@@ -400,10 +367,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testGetPreferredSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(jtf.getPreferredSize(), jtf.getPreferredScrollableViewportSize());
         jtf.setColumns(10);
         assertEquals(getPrefferedSize(jtf), jtf.getPreferredSize());
@@ -412,30 +375,18 @@ public class JTextFieldTest extends Swin
     }
 
     public void testGetUIClassID() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("TextFieldUI", jtf.getUIClassID());
         assertEquals("TextFieldUI", jtfBidi.getUIClassID());
         assertEquals("TextFieldUI", jtfScroll.getUIClassID());
     }
 
     public void testIsValidateRoot() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(jtf.isValidateRoot());
         assertTrue(jtfBidi.isValidateRoot());
         assertFalse(jtfScroll.isValidateRoot());
     }
 
     public void testJTextField() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JTextField tf = new JTextField();
         assertEquals("", tf.getText());
         assertTrue(tf.getDocument() instanceof PlainDocument);
@@ -443,10 +394,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testJTextFieldDocumentStringInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String str1 = "AAA";
         String str2 = "testJTextFieldDocumentStringInt()";
         Document doc = new PlainDocument();
@@ -480,10 +427,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testJTextFieldInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JTextField tf = new JTextField(5);
         assertEquals("", tf.getText());
         assertTrue(tf.getDocument() instanceof PlainDocument);
@@ -499,10 +442,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testJTextFieldString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String str1 = "testJTextFieldString()";
         JTextField tf = new JTextField(str1);
         assertEquals(str1, tf.getText());
@@ -511,10 +450,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testJTextFieldStringInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String str1 = "testJTextFieldString()";
         JTextField tf = new JTextField(str1, 5);
         assertEquals(str1, tf.getText());
@@ -531,20 +466,12 @@ public class JTextFieldTest extends Swin
     }
 
     public void testNotifyAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("notify-field-accept", JTextField.notifyAction);
     }
 
     //implementation dependent
     /*
      public void testParamString() {
-         if (Support_Excludes.isExcluded()) {
-             return;
-         }
-
      jtf.setActionCommand("ACTION_COMMAND");
      String str = "," +
      jtf.getX() + "," +
@@ -573,10 +500,6 @@ public class JTextFieldTest extends Swin
      assertEquals(changeString(str), changeString(jtf.paramString()));
      } */
     public void testPostActionEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SimpleActionListener listener1 = new SimpleActionListener("first");
         SimpleActionListener listener2 = new SimpleActionListener("second");
         SimpleActionListener listener3 = new SimpleActionListener("third");
@@ -610,17 +533,9 @@ public class JTextFieldTest extends Swin
     }
 
     public void testScrollRectToVisible() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testSetActionCommand() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SimpleActionListener listener = new SimpleActionListener("");
         jtf.addActionListener(listener);
         jtf.fireActionPerformed();
@@ -645,10 +560,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetDocument() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Document old = jtf.getDocument();
         Document doc = new PlainDocument();
         jtf.setDocument(doc);
@@ -657,10 +568,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetFont() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Font oldFont = jtf.getFont();
         FontMetrics fm = jtf.getFontMetrics(oldFont);
         assertEquals(fm.charWidth('m'), jtf.getColumnWidth());
@@ -678,10 +585,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetGetAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(jtf.getAction());
         Action action = new DefaultEditorKit.CutAction();
         jtf.setAction(action);
@@ -713,10 +616,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetGetColumns() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, jtf.getColumns());
         jtf.wasCallInvalidate = false;
         jtf.setColumns(5);
@@ -733,10 +632,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetGetHorizontalAlignment() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(SwingConstants.LEADING, jtf.getHorizontalAlignment());
         jtf.setHorizontalAlignment(SwingConstants.LEFT);
         assertEquals(SwingConstants.LEFT, jtf.getHorizontalAlignment());
@@ -792,10 +687,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetGetScrollOffset() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(getInitialScrollOffest(jtf), jtf.getScrollOffset());
         //assertEquals(getInitialScrollOffest(jtfScroll),jtfScroll.getScrollOffset());
         assertEquals(getInitialScrollOffest(jtfBidi), jtfBidi.getScrollOffset());
@@ -831,10 +722,6 @@ public class JTextFieldTest extends Swin
 
     // Regression for HARMONY-2627
     public void testGetScrollOffset() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jtf = new ExtJTextField("abc");
         final int viewWidth = (int)jtf.getUI().getRootView(jtf)
                                    .getPreferredSpan(View.X_AXIS);
@@ -845,10 +732,6 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSerialization() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         /*
          JTextField jt = new JTextField(bidiContent);
          jt.setColumns(8);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextField_NotifyActionRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextField_NotifyActionRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextField_NotifyActionRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JTextField_NotifyActionRTest.java Sat Jun  5 08:34:57 2010
@@ -25,7 +25,6 @@ import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
-import tests.support.Support_Excludes;
 
 public class JTextField_NotifyActionRTest extends BasicSwingTestCase {
     private JFrame frame;
@@ -50,10 +49,6 @@ public class JTextField_NotifyActionRTes
     }
 
     public void testActionPerformed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         c = new JPanel();
         Container parent = new Panel();
         textField = new JTextField("   ");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JViewportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JViewportTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JViewportTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JViewportTest.java Sat Jun  5 08:34:57 2010
@@ -34,7 +34,6 @@ import javax.swing.JViewport.ViewListene
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.basic.BasicViewportUI;
-import tests.support.Support_Excludes;
 
 public class JViewportTest extends SwingTestCase {
     private JViewport port;
@@ -62,10 +61,6 @@ public class JViewportTest extends Swing
     }
 
     public void testAddRemoveChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final List<String> test = new Vector<String>();
         assertEquals(0, port.getChangeListeners().length);
         ChangeListener listener = new ChangeListener() {
@@ -84,10 +79,6 @@ public class JViewportTest extends Swing
     }
 
     public void testAddRemovePropertyChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final List<String> test = new Vector<String>();
         assertEquals(0, port.getPropertyChangeListeners().length);
         PropertyChangeListener listener = new PropertyChangeListener() {
@@ -106,10 +97,6 @@ public class JViewportTest extends Swing
     }
 
     public void testGetExtentSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Dimension(0, 0), port.getExtentSize());
         Dimension d = new Dimension(3, 5);
         port.setExtentSize(d);
@@ -118,19 +105,11 @@ public class JViewportTest extends Swing
     }
 
     public void testGetInsets() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Insets(0, 0, 0, 0), port.getInsets());
         assertEquals(new Insets(0, 0, 0, 0), port.getInsets(new Insets(1, 2, 3, 4)));
     }
 
     public void testGetScrollMode() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(1, port.getScrollMode());
         port.setScrollMode(JViewport.BACKINGSTORE_SCROLL_MODE);
         assertEquals(2, port.getScrollMode());
@@ -146,19 +125,11 @@ public class JViewportTest extends Swing
     }
 
     public void testGetUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(port.getUI());
         assertEquals("ViewportUI", port.getUIClassID());
     }
 
     public void testGetView() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(port.getView());
         JLabel l = new JLabel();
         port.add(l);
@@ -169,10 +140,6 @@ public class JViewportTest extends Swing
     }
 
     public void testGetSetViewPosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JLabel l = new JLabel();
         l.setPreferredSize(new Dimension(200, 200));
         port.add(l);
@@ -189,10 +156,6 @@ public class JViewportTest extends Swing
     }
 
     public void testGetViewRect() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JLabel l = new JLabel();
         l.setPreferredSize(new Dimension(20, 40));
         port.add(l);
@@ -200,10 +163,6 @@ public class JViewportTest extends Swing
     }
 
     public void testGetSetViewSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JLabel l = new JLabel();
         port.add(l);
         Dimension dimension = new Dimension(20, 50);
@@ -219,10 +178,6 @@ public class JViewportTest extends Swing
     }
 
     public void testSetBorder() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             port.setBorder(BorderFactory.createEmptyBorder());
             fail("must throw an exception");
@@ -234,18 +189,10 @@ public class JViewportTest extends Swing
     }
 
     public void testIsOptimizedDrawingEnabled() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(port.isOptimizedDrawingEnabled());
     }
 
     public void testParamString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(port.paramString().indexOf(",isViewSizeSet=") > 0);
         assertTrue(port.paramString().indexOf(",lastPaintPosition=") > 0);
         assertTrue(port.paramString().indexOf(",scrollUnderway=") > 0);
@@ -253,10 +200,6 @@ public class JViewportTest extends Swing
 
     @SuppressWarnings("deprecation")
     public void testScrollRectToVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JLabel label = new JLabel();
         label.setPreferredSize(new Dimension(300, 300));
         label.setBackground(Color.RED);
@@ -318,19 +261,11 @@ public class JViewportTest extends Swing
     }
 
     public void testSetUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("ViewportUI", port.getUIClassID());
         assertTrue(port.getUI() instanceof BasicViewportUI);
     }
 
     public void testToViewCoordinates() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JLabel l = new JLabel();
         Dimension dimension = new Dimension(20, 50);
         l.setPreferredSize(dimension);
@@ -342,10 +277,6 @@ public class JViewportTest extends Swing
     }
 
     public void testCreateLayoutManager() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JLabel l = new JLabel();
         Dimension dimension = new Dimension(20, 50);
         l.setPreferredSize(dimension);
@@ -356,29 +287,17 @@ public class JViewportTest extends Swing
     }
 
     public void testCreateViewListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ViewListener viewListener = port.createViewListener();
         assertNotNull(viewListener);
     }
 
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AccessibleContext accessibleContext = port.getAccessibleContext();
         assertNotNull(accessibleContext);
         assertTrue(AccessibleRole.VIEWPORT == accessibleContext.getAccessibleRole());
     }
 
     public void testSetView() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         port.setView(null);
         JComponent comp = newJComponent();
         port.setView(comp);
@@ -390,10 +309,6 @@ public class JViewportTest extends Swing
     }
 
     public void testEnsureIndexIsVisible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         list = new JList(new Object[] { "a", "b", "c" });
         JScrollPane scroller = insertListToFrame();
         assertNotNull(scroller);
@@ -404,10 +319,6 @@ public class JViewportTest extends Swing
     }
 
     public void testIsOpaque() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(port.isOpaque());
     }
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JWindowTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JWindowTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JWindowTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JWindowTest.java Sat Jun  5 08:34:57 2010
@@ -33,7 +33,6 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
-import tests.support.Support_Excludes;
 
 public class JWindowTest extends SwingTestCase {
     /*
@@ -131,10 +130,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void JWindow()
      */
     public void testJWindow() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         window = new JWindow();
         assertTrue("owner is not null", window.getOwner() != null);
         assertFalse("JWindow is invisible by default", window.isVisible());
@@ -147,10 +142,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void windowInit()
      */
     public void testWindowInit() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestWindow window = new TestWindow();
         assertTrue("rootPaneCheckingEnabled is true", window.isRootPaneCheckingEnabled());
         assertTrue("layout is not null", window.getLayout() != null);
@@ -173,10 +164,6 @@ public class JWindowTest extends SwingTe
      *     boolean isRootPaneCheckingEnabled()
      */
     public void testSetIsRootPaneCheckingEnabled() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestWindow window = new TestWindow();
         assertTrue("rootPaneCheckingEnabled is true by default", window
                 .isRootPaneCheckingEnabled());
@@ -189,10 +176,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void JWindow(Window, GraphicsConfiguration)
      */
     public void testJWindowWindowGraphicsConfiguration() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().getDefaultConfiguration();
         Window owner = new JWindow();
@@ -232,10 +215,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void JWindow(Window)
      */
     public void testJWindowWindow() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Window owner = new JWindow();
         window = new JWindow(owner);
         // test with the correct owner
@@ -255,10 +234,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void JWindow(GraphicsConfiguration)
      */
     public void testJWindowGraphicsConfiguration() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().getDefaultConfiguration();
         // test with valid gc
@@ -282,10 +257,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void JWindow(Frame)
      */
     public void testJWindowFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Frame owner = new Frame();
         window = new JWindow(owner);
         // test with the correct owner
@@ -305,10 +276,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void addImpl(Component, Object, int)
      */
     public void testAddImpl() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestWindow window = new TestWindow();
         JComponent comp = new JPanel();
         // rootPaneCheckingEnabled is true, no exception since 1.5
@@ -343,10 +310,6 @@ public class JWindowTest extends SwingTe
      *     JRootPane getRootPane()
      */
     public void testSetGetRootPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestWindow window = new TestWindow();
         assertTrue("setRootPane() is called from the constructor", TestWindow.setRootPaneCalled);
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
@@ -365,10 +328,6 @@ public class JWindowTest extends SwingTe
      * Class under test for JRootPane createRootPane()
      */
     public void testCreateRootPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestWindow frame = new TestWindow();
         assertTrue("createRootPane() is called from the constructor",
                 TestWindow.createRootPaneCalled);
@@ -382,10 +341,6 @@ public class JWindowTest extends SwingTe
      *     JLayeredPane getLayeredPane()
      */
     public void testSetGetLayeredPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         window.addPropertyChangeListener("layeredPane", listener);
         JLayeredPane pane = new JLayeredPane();
@@ -411,10 +366,6 @@ public class JWindowTest extends SwingTe
      * Class under test for AccessibleContext getAccessibleContext()
      */
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AccessibleContext c = window.getAccessibleContext();
         assertTrue("instance of AccessibleJWindow", c instanceof JWindow.AccessibleJWindow);
         assertTrue("AccessibleRole is ok", c.getAccessibleRole() == AccessibleRole.WINDOW);
@@ -427,10 +378,6 @@ public class JWindowTest extends SwingTe
      * Class under test for String paramString()
      */
     public void testParamString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestWindow window = new TestWindow();
         assertTrue("paramString() cannot return null", window.paramString() != null);
     }
@@ -439,10 +386,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void setLayout(LayoutManager)
      */
     public void testSetLayout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestWindow window = new TestWindow();
         LayoutManager contentLayout = window.getContentPane().getLayout();
         LayoutManager frameLayout = window.getLayout();
@@ -479,10 +422,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void update(Graphics)
      */
     public void testUpdate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
@@ -492,10 +431,6 @@ public class JWindowTest extends SwingTe
      *     Container getContentPane()
      */
     public void testSetGetContentPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         window.addPropertyChangeListener("contentPane", listener);
         JPanel pane = new JPanel();
@@ -523,10 +458,6 @@ public class JWindowTest extends SwingTe
      *     Component getGlassPane()
      */
     public void testSetGetGlassPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         window.addPropertyChangeListener("glassPane", listener);
         JPanel pane = new JPanel();
@@ -552,10 +483,6 @@ public class JWindowTest extends SwingTe
      * Class under test for void remove(Component)
      */
     public void testRemove() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComponent comp = new JPanel();
         window.getContentPane().add(comp);
         assertTrue("label is in contentPane", window.isAncestorOf(comp));



Mime
View raw message