harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [8/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/ classlib...
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/DefaultCellEditorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultCellEditorTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultCellEditorTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultCellEditorTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import java.util.Arrays;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.table.BasicSwingTableTestCase;
-import tests.support.Support_Excludes;
 
 public class DefaultCellEditorTest extends BasicSwingTableTestCase {
     private DefaultCellEditor editor;
@@ -42,10 +41,6 @@ public class DefaultCellEditorTest exten
     }
 
     public void testDefaultCellEditor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JTextField field = new JTextField();
         editor = new DefaultCellEditor(field);
         assertEquals(field, editor.editorComponent);
@@ -56,10 +51,6 @@ public class DefaultCellEditorTest exten
 
     @SuppressWarnings("deprecation")
     public void testEditorDelegate_TextField() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JTextField field = new JTextField();
         editor = new DefaultCellEditor(field);
         assertTrue(Arrays.asList(field.getActionListeners()).contains(editor.delegate));
@@ -108,10 +99,6 @@ public class DefaultCellEditorTest exten
     }
 
     public void testEditorDelegate_CheckBox() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JCheckBox check = new JCheckBox();
         editor = new DefaultCellEditor(check);
         assertTrue(Arrays.asList(check.getActionListeners()).contains(editor.delegate));
@@ -154,10 +141,6 @@ public class DefaultCellEditorTest exten
     }
 
     public void testEditorDelegate_ComboBox() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComboBox cb = new JComboBox();
         editor = new DefaultCellEditor(cb);
         assertTrue(Arrays.asList(cb.getActionListeners()).contains(editor.delegate));
@@ -208,20 +191,12 @@ public class DefaultCellEditorTest exten
     }
 
     public void testGetComponent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComboBox cb = new JComboBox();
         editor = new DefaultCellEditor(cb);
         assertEquals(cb, editor.getComponent());
     }
 
     public void testGetSetClickCountToStart() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         editor = new DefaultCellEditor(new JTextField());
         assertEquals(2, editor.getClickCountToStart());
         editor = new DefaultCellEditor(new JCheckBox());
@@ -235,10 +210,6 @@ public class DefaultCellEditorTest exten
     }
 
     public void testGetTreeCellEditorComponent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         editor = new DefaultCellEditor(new JTextField());
         assertEquals(editor.getComponent(), editor.getTreeCellEditorComponent(new JTree(),
                 "any", false, false, false, 0));
@@ -246,10 +217,6 @@ public class DefaultCellEditorTest exten
     }
 
     public void testGetTableCellEditorComponent() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         editor = new DefaultCellEditor(new JTextField());
         assertEquals(editor.getComponent(), editor.getTableCellEditorComponent(new JTable(),
                 "any", false, 0, 0));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java Sat Jun  5 08:34:57 2010
@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.Vector;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
-import tests.support.Support_Excludes;
 
 public class DefaultComboBoxModelTest extends SwingTestCase {
     private DefaultComboBoxModel model;
@@ -49,10 +48,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testDefaultComboBoxModel() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, model.getSize());
         assertNull(model.getSelectedItem());
         assertEquals(0, listener.getEvents().size());
@@ -75,10 +70,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testAddElement() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, model.getSize());
         assertNull(model.getSelectedItem());
         model.addElement("1");
@@ -95,10 +86,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testGetElementAt() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(model.getElementAt(0));
         model.addElement("a");
         model.addElement("b");
@@ -108,10 +95,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testGetIndexOf() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(-1, model.getIndexOf("a"));
         model.addElement("a");
         model.addElement("b");
@@ -122,10 +105,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testGetSize() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, model.getSize());
         model.addElement("a");
         assertEquals(1, model.getSize());
@@ -134,10 +113,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testInsertElementAt() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testExceptionalCase(new ExceptionalCase() {
             @Override
             public void exceptionalAction() throws Exception {
@@ -155,10 +130,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testRemoveAllElements() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         model.addElement("a");
         model.addElement("b");
         model.addElement("c");
@@ -170,10 +141,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testRemoveElement() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         model.removeElement("a");
         assertEquals(0, model.getSize());
         assertEquals(0, listener.getEvents().size());
@@ -188,10 +155,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testRemoveElementAt() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testExceptionalCase(new ExceptionalCase() {
             @Override
             public void exceptionalAction() throws Exception {
@@ -218,10 +181,6 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testGetSetSelectedItem() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(model.getSelectedItem());
         model.setSelectedItem("3");
         assertEquals("3", model.getSelectedItem());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import tests.support.Support_Excludes;
 
 public class InputMapTest extends SwingTestCase {
     protected InputMap map;
@@ -58,10 +57,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testPut() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         map.put(keyStroke1, "1");
@@ -78,10 +73,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testGet() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         assertNull(map.get(keyStroke1));
@@ -108,10 +99,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testRemove() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         map.put(keyStroke1, "1");
@@ -127,10 +114,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testKeys() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         KeyStroke keyStroke3 = KeyStroke.getKeyStroke(KeyEvent.VK_1, 0);
@@ -162,10 +145,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testAllKeys() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_1, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_2, 0);
         KeyStroke keyStroke3 = KeyStroke.getKeyStroke(KeyEvent.VK_3, 0);
@@ -199,10 +178,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testSetGetParent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         InputMap parent1 = new InputMap();
         InputMap parent2 = new InputMap();
         InputMap parent3 = null;
@@ -216,10 +191,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testClear() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         assertTrue(map.size() == 0);
@@ -235,10 +206,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_1, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_2, 0);
         KeyStroke keyStroke3 = KeyStroke.getKeyStroke(KeyEvent.VK_3, 0);
@@ -256,10 +223,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testWriteObject() throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         ObjectOutputStream so = new ObjectOutputStream(output);
         so.writeObject(map);
@@ -268,10 +231,6 @@ public class InputMapTest extends SwingT
     }
 
     public void testReadObject() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_1, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_2, 0);
         Object object1 = "object1";

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java Sat Jun  5 08:34:57 2010
@@ -22,7 +22,6 @@ package javax.swing;
 import java.awt.event.ActionEvent;
 import javax.accessibility.AccessibleRole;
 import javax.swing.JToggleButton.ToggleButtonModel;
-import tests.support.Support_Excludes;
 
 public class JCheckBoxMenuItemTest extends JMenuItemTest {
     @Override
@@ -41,10 +40,6 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem()'
      */
     public void testJCheckBoxMenuItem() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(menuItem.isSelected());
         assertTrue("default buttonModel ", button.getModel() instanceof ToggleButtonModel);
         assertNull("icon ", button.getIcon());
@@ -60,10 +55,6 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(Icon)'
      */
     public void testJCheckBoxMenuItemIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = createNewIcon();
         menuItem = new JCheckBoxMenuItem(icon);
         assertTrue("default buttonModel ", button.getModel() instanceof ToggleButtonModel);
@@ -80,10 +71,6 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(String)'
      */
     public void testJCheckBoxMenuItemString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "texttext";
         menuItem = new JCheckBoxMenuItem(text);
         assertFalse(menuItem.isSelected());
@@ -100,10 +87,6 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(String, Icon)'
      */
     public void testJCheckBoxMenuItemStringIcon() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = createNewIcon();
         String text = "texttext";
         menuItem = new JCheckBoxMenuItem(text, icon);
@@ -122,10 +105,6 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(Action)'
      */
     public void testJCheckBoxMenuItemAction() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final String command = "dnammoc";
         final KeyStroke accelerator = KeyStroke.getKeyStroke('a');
         class MyAction extends AbstractAction {
@@ -180,10 +159,6 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(String, Icon, boolean)'
      */
     public void testJCheckBoxMenuItemStringIconBoolean() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Icon icon = createNewIcon();
         String text = "texttext";
         menuItem = new JCheckBoxMenuItem(text, icon, true);
@@ -205,10 +180,6 @@ public class JCheckBoxMenuItemTest exten
      */
     @Override
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         boolean assertedValue = (menuItem.getAccessibleContext() != null && menuItem
                 .getAccessibleContext().getClass().getName().equals(
                         "javax.swing.JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem"));
@@ -222,10 +193,6 @@ public class JCheckBoxMenuItemTest exten
      */
     @Override
     public void testGetUIClassID() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("CheckBoxMenuItemUI", menuItem.getUIClassID());
     }
 
@@ -234,10 +201,6 @@ public class JCheckBoxMenuItemTest exten
      */
     @Override
     public void testGetSelectedObjects() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String text = "texttext";
         menuItem = new JCheckBoxMenuItem(text);
         assertNull(((JCheckBoxMenuItem) menuItem).getSelectedObjects());
@@ -250,10 +213,6 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.getState()'
      */
     public void testGetSetState() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("default Selected", ((JCheckBoxMenuItem) menuItem).getState(), menuItem
                 .isSelected());
         menuItem.setSelected(true);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ import javax.accessibility.AccessibleCon
 import javax.accessibility.AccessibleRole;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicDesktopPaneUI;
-import tests.support.Support_Excludes;
 
 public class JDesktopPaneTest extends SwingTestCase {
     /*
@@ -83,10 +82,6 @@ public class JDesktopPaneTest extends Sw
      * Class under test for boolean isOpaque()
      */
     public void testIsOpaque() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue("always returns true", desktop.isOpaque());
         desktop.setOpaque(false);
         assertTrue("always returns true", desktop.isOpaque());
@@ -96,10 +91,6 @@ public class JDesktopPaneTest extends Sw
      * Class under test for void updateUI()
      */
     public void testUpdateUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         desktop.updateUI();
         ComponentUI ui1 = desktop.getUI();
         ComponentUI ui2 = UIManager.getUI(desktop);
@@ -111,10 +102,6 @@ public class JDesktopPaneTest extends Sw
      * Class under test for AccessibleContext getAccessibleContext()
      */
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AccessibleContext c = desktop.getAccessibleContext();
         assertTrue("instanceof AccessibleJDesktopPane",
                 c instanceof JDesktopPane.AccessibleJDesktopPane);
@@ -125,19 +112,11 @@ public class JDesktopPaneTest extends Sw
      * Class under test for String paramString()
      */
     public void testParamString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestJDesktopPane desktop = new TestJDesktopPane();
         assertTrue(desktop.paramString() != null);
     }
 
     public void testJDesktopPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         desktop = new JDesktopPane();
         assertTrue(desktop.isFocusCycleRoot());
         assertFalse(desktop.isFocusTraversalPolicyProvider());
@@ -150,10 +129,6 @@ public class JDesktopPaneTest extends Sw
      *     DesktopPaneUI getUI()
      */
     public void testSetGetUI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BasicDesktopPaneUI ui = new BasicDesktopPaneUI();
         desktop.setUI(ui);
         assertTrue("UI is set", desktop.getUI() == ui);
@@ -165,10 +140,6 @@ public class JDesktopPaneTest extends Sw
      *     JInternalFrame getSelectedFrame()
      */
     public void testSetGetSelectedFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JInternalFrame f = new JInternalFrame();
         assertNull("null by default", desktop.getSelectedFrame());
         desktop.setSelectedFrame(f);
@@ -204,10 +175,6 @@ public class JDesktopPaneTest extends Sw
      * Class under test for JInternalFrame[] getAllFrames()
      */
     public void testGetAllFrames() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JInternalFrame[] frames = desktop.getAllFrames();
         assertTrue("empty array", frames.length == 0);
         addComponents();
@@ -219,10 +186,6 @@ public class JDesktopPaneTest extends Sw
      * Class under test for JInternalFrame[] getAllFramesInLayer(int)
      */
     public void testGetAllFramesInLayer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JInternalFrame[] frames; // = desktop.getAllFramesInLayer(1);
         //assertTrue("empty array", frames.length == 0);
         addComponents();
@@ -248,10 +211,6 @@ public class JDesktopPaneTest extends Sw
      *     DesktopManager getDesktopManager()
      */
     public void testSetGetDesktopManager() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener l = new MyPropertyChangeListener();
         DesktopManager m = new DefaultDesktopManager();
         assertTrue("not null by default", desktop.getDesktopManager() != null);
@@ -267,10 +226,6 @@ public class JDesktopPaneTest extends Sw
      * Class under test for String getUIClassID()
      */
     public void testGetUIClassID() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue("", desktop.getUIClassID() == "DesktopPaneUI");
     }
 
@@ -280,10 +235,6 @@ public class JDesktopPaneTest extends Sw
      *     int getDragMode()
      */
     public void testSetGetDragMode() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue("initial ok", desktop.getDragMode() == JDesktopPane.LIVE_DRAG_MODE);
         desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
         assertTrue("set", desktop.getDragMode() == JDesktopPane.OUTLINE_DRAG_MODE);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java Sat Jun  5 08:34:57 2010
@@ -34,7 +34,6 @@ import java.beans.PropertyChangeListener
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleState;
-import tests.support.Support_Excludes;
 
 public class JDialogTest extends SwingTestCase {
     /*
@@ -134,10 +133,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog()
      */
     public void testJDialog() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dialog = new JDialog();
         // title == null, isModal() == false
         checkDialogCorrectness(dialog, null, false);
@@ -147,10 +142,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void dialogInit()
      */
     public void testDialogInit() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestDialog dialog = new TestDialog();
         assertTrue("onwer is not null", dialog.getOwner() != null);
         assertTrue("rootPaneCheckingEnabled is true", dialog.isRootPaneCheckingEnabled());
@@ -186,10 +177,6 @@ public class JDialogTest extends SwingTe
      *     int getDefaultCloseOperation()
      */
     public void testSetGetDefaultCloseOperation() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // default value is JDialog.HIDE_ON_CLOSE
         assertEquals(WindowConstants.HIDE_ON_CLOSE, dialog.getDefaultCloseOperation());
         // test setting valid value
@@ -219,10 +206,6 @@ public class JDialogTest extends SwingTe
      *     static boolean isDefaultLookAndFeelDecorated()
      */
     public void testSetIsDefaultLookAndFeelDecorated() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test for default value
         assertFalse(JDialog.isDefaultLookAndFeelDecorated());
         JDialog.setDefaultLookAndFeelDecorated(true);
@@ -237,10 +220,6 @@ public class JDialogTest extends SwingTe
      *     boolean isRootPaneCheckingEnabled()
      */
     public void testSetIsRootPaneCheckingEnabled() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestDialog dialog = new TestDialog();
         assertTrue("rootPaneCheckingEnabled is true by default", dialog
                 .isRootPaneCheckingEnabled());
@@ -253,10 +232,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame, String, boolean, GraphicsConfiguration)
      */
     public void testJDialogFrameStringbooleanGraphicsConfiguration() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Frame owner = new Frame();
         final GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().getDefaultConfiguration();
@@ -286,10 +261,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog, String, boolean, GraphicsConfiguration)
      */
     public void testJDialogDialogStringbooleanGraphicsConfiguration() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Dialog owner = new Dialog(new Frame());
         final GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().getDefaultConfiguration();
@@ -312,10 +283,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame, String, boolean)
      */
     public void testJDialogFrameStringboolean() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Frame owner = new Frame();
         // test with corrent owner, correct title, modal == false
         dialog = new JDialog(owner, "Test JDialog", false);
@@ -341,10 +308,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame, String)
      */
     public void testJDialogFrameString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Frame owner = new Frame();
         // test with corrent owner, correct title
         dialog = new JDialog(owner, "Test JDialog");
@@ -365,10 +328,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog, String, boolean)
      */
     public void testJDialogDialogStringboolean() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Dialog owner = new Dialog(new Frame());
         // test with corrent owner, correct title, modal == false
         dialog = new JDialog(owner, "Test JDialog", false);
@@ -392,10 +351,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog, String)
      */
     public void testJDialogDialogString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Dialog owner = new Dialog(new Frame());
         // test with corrent owner, correct title
         dialog = new JDialog(owner, "Test JDialog");
@@ -414,10 +369,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame, boolean)
      */
     public void testJDialogFrameboolean() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Frame owner = new Frame();
         // test with corrent owner, modal == false
         dialog = new JDialog(owner, false);
@@ -439,10 +390,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame)
      */
     public void testJDialogFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Frame owner = new Frame();
         // test with corrent owner
         dialog = new JDialog(owner);
@@ -459,10 +406,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog, boolean)
      */
     public void testJDialogDialogboolean() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Dialog owner = new Dialog(new Frame());
         // test with corrent owner, modal == false
         dialog = new JDialog(owner, false);
@@ -481,10 +424,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog)
      */
     public void testJDialogDialog() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Dialog owner = new Dialog(new Frame());
         // test with corrent owner
         dialog = new JDialog(owner);
@@ -498,10 +437,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void addImpl(Component, Object, int)
      */
     public void testAddImpl() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestDialog dialog = new TestDialog();
         JComponent comp = new JPanel();
         // rootPaneCheckingEnabled is true, no exception since 1.5
@@ -536,10 +471,6 @@ public class JDialogTest extends SwingTe
      *     JRootPane getRootPane()
      */
     public void testSetGetRootPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestDialog dialog = new TestDialog();
         assertTrue("setRootPane() is called from the constructor", TestDialog.setRootPaneCalled);
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
@@ -558,10 +489,6 @@ public class JDialogTest extends SwingTe
      * Class under test for JRootPane createRootPane()
      */
     public void testCreateRootPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestDialog dialog = new TestDialog();
         assertTrue("createRootPane() is called from the constructor",
                 TestDialog.createRootPaneCalled);
@@ -575,10 +502,6 @@ public class JDialogTest extends SwingTe
      *     JMenuBar getJMenuBar()
      */
     public void testSetGetJMenuBarJMenuBar() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(dialog.getJMenuBar());
         JMenuBar menuBar = new JMenuBar();
         dialog.setJMenuBar(menuBar);
@@ -593,10 +516,6 @@ public class JDialogTest extends SwingTe
      *     JLayeredPane getLayeredPane()
      */
     public void testSetGetLayeredPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         dialog.addPropertyChangeListener("layeredPane", listener);
         JLayeredPane pane = new JLayeredPane();
@@ -622,10 +541,6 @@ public class JDialogTest extends SwingTe
      * Class under test for AccessibleContext getAccessibleContext()
      */
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AccessibleContext c = dialog.getAccessibleContext();
         assertTrue("class is ok", c instanceof JDialog.AccessibleJDialog);
         assertTrue("AccessibleRole is ok", c.getAccessibleRole() == AccessibleRole.DIALOG);
@@ -647,10 +562,6 @@ public class JDialogTest extends SwingTe
      * Class under test for String paramString()
      */
     public void testParamString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestDialog dialog = new TestDialog();
         assertTrue("paramString() cannot return null", dialog.paramString() != null);
     }
@@ -659,10 +570,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void processWindowEvent(WindowEvent)
      */
     public void testProcessWindowEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestDialog dialog = new TestDialog();
         dialog.setVisible(true);
         WindowEvent e = new WindowEvent(dialog, WindowEvent.WINDOW_CLOSING);
@@ -691,10 +598,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void setLayout(LayoutManager)
      */
     public void testSetLayout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestDialog dialog = new TestDialog();
         LayoutManager contentLayout = dialog.getContentPane().getLayout();
         LayoutManager dialogLayout = dialog.getLayout();
@@ -731,10 +634,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void update(Graphics)
      */
     public void testUpdate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
@@ -744,10 +643,6 @@ public class JDialogTest extends SwingTe
      *     Container getContentPane()
      */
     public void testSetGetContentPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         dialog.addPropertyChangeListener("contentPane", listener);
         JPanel pane = new JPanel();
@@ -775,10 +670,6 @@ public class JDialogTest extends SwingTe
      *     Component getGlassPane()
      */
     public void testSetGetGlassPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         dialog.addPropertyChangeListener("glassPane", listener);
         JPanel pane = new JPanel();
@@ -804,10 +695,6 @@ public class JDialogTest extends SwingTe
      * Class under test for void remove(Component)
      */
     public void testRemove() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComponent comp = new JPanel();
         dialog.getContentPane().add(comp);
         assertTrue("added to contentPane", dialog.isAncestorOf(comp));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java Sat Jun  5 08:34:57 2010
@@ -44,7 +44,6 @@ import javax.swing.text.EditorKit;
 import javax.swing.text.Element;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyledEditorKit;
-import tests.support.Support_Excludes;
 
 //import javax.swing.text.html.HTMLEditorKit;
 //import javax.swing.text.rtf.RTFEditorKit;
@@ -193,10 +192,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -212,10 +207,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testGetPreferredSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             jep1.setMinimumSize(new Dimension(3, 3));
             JViewport parent = (JViewport) jep1.getParent();
@@ -226,18 +217,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testGetUIClassID() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("EditorPaneUI", jep.getUIClassID());
     }
 
     public void testGetScrollableTracksViewportWidthHeight() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JViewport parent = (JViewport) jep1.getParent();
         jep1.setMinimumSize(new Dimension(3, 3));
         Dimension minSize = jep1.getMinimumSize();
@@ -257,10 +240,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReplaceSelection() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jep.setText("testReplaceSelection");
         jep.setSelectionStart(4);
         jep.setSelectionEnd(7);
@@ -284,10 +263,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReplaceSelectionNotEditable() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jep.setText("replaceSelectionNotEditable");
         jep.setEditable(false);
         jep.setSelectionStart(3);
@@ -298,10 +273,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReplaceSelectionWithAttributes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -343,10 +314,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testSetGetText() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -407,10 +374,6 @@ public class JEditorPaneTest extends Swi
      assertNotSame(contentKit1, contentKit2);
      }*/
     public void testRegisterEditorKitForContentTypeStringString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JEditorPane.registerEditorKitForContentType("text/test1",
                 "javax.swing.text.DefaultEditorKit");
         assertEquals("javax.swing.text.DefaultEditorKit", JEditorPane
@@ -430,10 +393,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testRegisterEditorKitForContentTypeStringStringClassLoader() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -460,19 +419,11 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testJEditorPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         checkBaseValues("javax.swing.text.PlainDocument",
                 "javax.swing.JEditorPane$PlainEditorKit", "text/plain", null, jep);
     }
 
     public void testJEditorPaneString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -486,10 +437,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testJEditorPaneStringString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -500,10 +447,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testJEditorPaneURL() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -517,10 +460,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testJEditorPaneJarHTML() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression for HARMONY-4529
         URL jar = getClass().getResource("testhtml.jar");
         URL url = new URL("jar:" + jar + "!/index.html");
@@ -536,10 +475,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testAddRemoveGetHyperlinkListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         HyperlinkListener listener1 = new SimpleHyperlinkListener("1");
         HyperlinkListener listener2 = new SimpleHyperlinkListener("2");
         HyperlinkListener listener3 = new SimpleHyperlinkListener("3");
@@ -580,10 +515,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testCreateDefaultEditorKit() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         EditorKit kit1 = jep.createDefaultEditorKit();
         EditorKit kit2 = jep.createDefaultEditorKit();
         assertEquals("javax.swing.JEditorPane$PlainEditorKit", kit1.getClass().getName());
@@ -595,10 +526,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testFireHyperlinkUpdate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SimpleHyperlinkListener listener1 = new SimpleHyperlinkListener("1");
         SimpleHyperlinkListener listener2 = new SimpleHyperlinkListener("2");
         SimpleHyperlinkListener listener3 = new SimpleHyperlinkListener("3");
@@ -628,10 +555,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testSetGetPage1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SimplePropertyChangeListener listener = new SimplePropertyChangeListener();
         jep.addPropertyChangeListener(listener);
         assertNull(jep.getPage());
@@ -653,10 +576,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testSetGetPage2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -683,10 +602,6 @@ public class JEditorPaneTest extends Swi
      }
      }*/
     public void testReadHTML() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -728,10 +643,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReadPlain() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         byte bytes[] = plainString.getBytes();
         ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
         try {
@@ -744,10 +655,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReadRTF() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -771,17 +678,9 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testScrollToReference() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testSetGetContentType() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -833,10 +732,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testGetContentType() throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression for HARMONY-4696
         checkContentType("txt", "text/plain");
         checkContentType("html", "text/html");
@@ -887,10 +782,6 @@ public class JEditorPaneTest extends Swi
      .getEditorKitClassNameForContentType(content));
      }*/
     public void testSetGetEditorKit() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -948,28 +839,16 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testConstants() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("JEditorPane.honorDisplayProperties", JEditorPane.HONOR_DISPLAY_PROPERTIES);
         assertEquals("JEditorPane.w3cLengthUnits", JEditorPane.W3C_LENGTH_UNITS);
     }
 
     public void testPlainEditorKit() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         EditorKit kit = jep.getEditorKit();
         assertEquals(kit, kit.getViewFactory());
     }
 
     public void testGetEditorKitClassNameForContentType() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("javax.swing.JEditorPane$PlainEditorKit", JEditorPane
                 .getEditorKitClassNameForContentType("text/plain"));
         assertEquals("javax.swing.text.html.HTMLEditorKit", JEditorPane
@@ -987,10 +866,6 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testSetEditorKitForContentType() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {          
             JEditorPane ep = new JEditorPane();
             ep.setEditorKitForContentType("abc", null);
@@ -1017,20 +892,12 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testIsFocusCycleRoot() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression test for HARMONY-2573
         assertTrue(new JEditorPane().isFocusCycleRoot());
     }
 
     public void testCreateEditorKitForContentType() throws Exception {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression test for HARMONY-3453, HARMONY-3454
         final ClassLoader classLoader1 = new ArrayClassLoader();
         final ClassLoader classLoader2 = new ArrayClassLoader();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java Sat Jun  5 08:34:57 2010
@@ -19,8 +19,6 @@
  */
 package javax.swing;
 
-import tests.support.Support_Excludes;
-
 public class JEditorPane_AccessibleJEditorPaneHTMLTest extends SwingTestCase {
     JEditorPane jep;
 
@@ -48,31 +46,15 @@ public class JEditorPane_AccessibleJEdit
     }
 
     public void testGetAccessibleText() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(accessible.getAccessibleText() instanceof JEditorPane.JEditorPaneAccessibleHypertextSupport);
     }
 
     public void testGetAccessibleAt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetAccessibleChild(final int i) {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetAccessibleChildrenCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
-}
+}
\ No newline at end of file

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java Sat Jun  5 08:34:57 2010
@@ -21,7 +21,6 @@ package javax.swing;
 
 import java.io.File;
 import javax.swing.filechooser.FileFilter;
-import tests.support.Support_Excludes;
 
 public class JFileChooserRTest extends BasicSwingTestCase {
     private JFileChooser chooser;
@@ -41,10 +40,6 @@ public class JFileChooserRTest extends B
     }
 
     public void testAddChoosableFileFilter() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         FileFilter ff = new FileFilter() {
             @Override
             public boolean accept(File file) {
@@ -68,10 +63,6 @@ public class JFileChooserRTest extends B
     }
 
     public void testGetSetSelectedFile() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         propertyChangeController = new PropertyChangeController();
         chooser.addPropertyChangeListener(propertyChangeController);
         assertNull(chooser.getSelectedFile());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserTest.java Sat Jun  5 08:34:57 2010
@@ -29,7 +29,6 @@ import javax.swing.filechooser.FileSyste
 import javax.swing.filechooser.FileView;
 import javax.swing.plaf.FileChooserUI;
 import javax.swing.plaf.basic.BasicFileChooserUI;
-import tests.support.Support_Excludes;
 
 public class JFileChooserTest extends SwingTestCase {
     private JFileChooser chooser;
@@ -55,10 +54,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testJFileChooser() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(chooser.getCurrentDirectory());
         assertEquals(FileSystemView.getFileSystemView().getDefaultDirectory(), chooser
                 .getCurrentDirectory());
@@ -107,10 +102,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testJFileChooser_FSV() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         File testDir = new File("testDir");
         testDir.deleteOnExit();
         testDir.mkdir();
@@ -149,10 +140,6 @@ public class JFileChooserTest extends Sw
 
     //TODO
     public void testSetup() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         chooser = new JFileChooser();
         assertEquals(FileSystemView.getFileSystemView(), chooser.getFileSystemView());
         chooser.setup(FileSystemView.getFileSystemView());
@@ -192,10 +179,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetDragEnabled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(chooser.getDragEnabled());
         chooser.setDragEnabled(true);
         assertTrue(chooser.getDragEnabled());
@@ -203,10 +186,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetSelectedFile() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(chooser.getSelectedFile());
         File selectedFile = new File("testFile");
         chooser.setSelectedFile(selectedFile);
@@ -221,10 +200,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetSelectedFiles() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, chooser.getSelectedFiles().length);
         chooser.setSelectedFile(new File("c"));
         assertEquals(0, chooser.getSelectedFiles().length);
@@ -252,10 +227,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetCurrentDirectory() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(FileSystemView.getFileSystemView().getDefaultDirectory(), chooser
                 .getCurrentDirectory());
         File dir = new File("testDir");
@@ -282,20 +253,12 @@ public class JFileChooserTest extends Sw
     }
 
     public void testChangeToParentDirectory() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         chooser.changeToParentDirectory();
         assertEquals(FileSystemView.getFileSystemView().getDefaultDirectory().getParentFile(),
                 chooser.getCurrentDirectory());
     }
 
     public void testGetSetControlButtonsAreShown() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(chooser.getControlButtonsAreShown());
         chooser.setControlButtonsAreShown(false);
         assertFalse(chooser.getControlButtonsAreShown());
@@ -303,10 +266,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testgetSetDialogType() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(JFileChooser.OPEN_DIALOG, chooser.getDialogType());
         chooser.setDialogType(JFileChooser.SAVE_DIALOG);
         assertEquals(JFileChooser.SAVE_DIALOG, chooser.getDialogType());
@@ -322,10 +281,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetDialogTitle() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(chooser.getDialogTitle());
         assertEquals("Open", chooser.getUI().getDialogTitle(chooser));
         chooser.setDialogTitle("title");
@@ -335,10 +290,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetApproveButtonToolTipText() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(chooser.getApproveButtonToolTipText());
         chooser.setApproveButtonToolTipText("text");
         assertEquals("text", chooser.getApproveButtonToolTipText());
@@ -349,10 +300,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetApproveButtonText() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(chooser.getApproveButtonText());
         assertEquals("Open", chooser.getUI().getApproveButtonText(chooser));
         chooser.setApproveButtonText("text");
@@ -366,10 +313,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetApproveButtonMnemonic() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, chooser.getApproveButtonMnemonic());
         chooser.setApproveButtonMnemonic('c');
         assertEquals(KeyEvent.VK_C, chooser.getApproveButtonMnemonic());
@@ -379,10 +322,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetAddRemoveResetChoosableFileFilters() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(1, chooser.getChoosableFileFilters().length);
         FileFilter fileFilter = new FileFilter() {
             @Override
@@ -415,10 +354,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetAcceptAllFileFilter() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         FileFilter acceptAllFilter = chooser.getAcceptAllFileFilter();
         assertNotNull(acceptAllFilter);
         assertEquals(acceptAllFilter, chooser.getUI().getAcceptAllFileFilter(chooser));
@@ -429,10 +364,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testIsSetAcceptAllFilterUsed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(chooser.isAcceptAllFileFilterUsed());
         chooser.setAcceptAllFileFilterUsed(false);
         assertFalse(chooser.isAcceptAllFileFilterUsed());
@@ -444,10 +375,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetAccessory() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(chooser.getAccessory());
         JComponent accessory = new JButton();
         chooser.setAccessory(accessory);
@@ -456,10 +383,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetFileSelectionMode_isSelectionEnabled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(JFileChooser.FILES_ONLY, chooser.getFileSelectionMode());
         assertTrue(chooser.isFileSelectionEnabled());
         assertFalse(chooser.isDirectorySelectionEnabled());
@@ -481,10 +404,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testIsSetMultiSelectionEnabled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(chooser.isMultiSelectionEnabled());
         chooser.setMultiSelectionEnabled(true);
         assertTrue(chooser.isMultiSelectionEnabled());
@@ -492,10 +411,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testIsSetFileHidingEnabled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(chooser.isFileHidingEnabled());
         chooser.setFileHidingEnabled(false);
         assertFalse(chooser.isFileHidingEnabled());
@@ -503,10 +418,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetFileFilter() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(chooser.getAcceptAllFileFilter(), chooser.getFileFilter());
         FileFilter fileFilter = new FileFilter() {
             @Override
@@ -525,10 +436,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetFileView() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(chooser.getFileView());
         assertNotNull(chooser.getUI().getFileView(chooser));
         FileView view = new FileView() {
@@ -540,10 +447,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetName_Description_TypeDescription_Icon_Traversable() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         File f = new File(".");
         assertEquals(chooser.getUI().getFileView(chooser).getName(f), chooser.getName(f));
         assertEquals(chooser.getUI().getFileView(chooser).getDescription(f), chooser
@@ -591,10 +494,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testAccept() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         File f = new File(".");
         assertTrue(chooser.accept(f));
         chooser.setFileFilter(new FileFilter() {
@@ -614,10 +513,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetSetFileSystemView() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(FileSystemView.getFileSystemView(), chooser.getFileSystemView());
         FileSystemView fileSystemView = new FileSystemView() {
             @Override
@@ -631,10 +526,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testApproveSelection() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestActionListener listener = new TestActionListener();
         chooser.addActionListener(listener);
         chooser.approveSelection();
@@ -644,10 +535,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testCancelSelection() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestActionListener listener = new TestActionListener();
         chooser.addActionListener(listener);
         chooser.cancelSelection();
@@ -657,10 +544,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetAddRemoveFireActionListeners() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, chooser.getActionListeners().length);
         TestActionListener listener = new TestActionListener();
         chooser.addActionListener(listener);
@@ -673,10 +556,6 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetUpdateUI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         FileChooserUI ui = chooser.getUI();
         assertNotNull(ui);
         FileChooserUI customUI = new BasicFileChooserUI(chooser);
@@ -688,26 +567,14 @@ public class JFileChooserTest extends Sw
     }
 
     public void testGetUIClassID() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("FileChooserUI", chooser.getUIClassID());
     }
 
     public void testgetAccessibleContext() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(chooser.getAccessibleContext() instanceof JFileChooser.AccessibleJFileChooser);
     }
 
     public void testGetName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JFileChooser fc = new JFileChooser();
         assertNull(fc.getName());
     }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFormattedTextFieldTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFormattedTextFieldTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFormattedTextFieldTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFormattedTextFieldTest.java Sat Jun  5 08:34:57 2010
@@ -36,7 +36,6 @@ import javax.swing.text.DefaultFormatter
 import javax.swing.text.InternationalFormatter;
 import javax.swing.text.NumberFormatter;
 import javax.swing.text.TextAction;
-import tests.support.Support_Excludes;
 
 public class JFormattedTextFieldTest extends SwingTestCase {
     JFrame jf;
@@ -179,10 +178,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testJFormattedTextFieldObject() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Object value = Color.RED;
         JFormattedTextField tf1 = new JFormattedTextField(value);
         assertEquals(value, tf1.getValue());
@@ -197,10 +192,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testJFormattedTextFieldObject_NullToString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Object value = new Object() {
             @Override
             public String toString() {
@@ -212,10 +203,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testJFormattedTextFieldAbstractFormatter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         InternationalFormatter formatter = new InternationalFormatter();
         JFormattedTextField tf1 = new JFormattedTextField(formatter);
         assertNull(tf1.getValue());
@@ -230,10 +217,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testJFormattedTextFieldFormat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Format format = new SimpleDateFormat();
         InternationalFormatter formatter;
         DefaultFormatterFactory factory;
@@ -263,10 +246,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testJFormattedTextFieldAbstractFormatterFactory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JFormattedTextField.AbstractFormatterFactory factory = new DefaultFormatterFactory();
         JFormattedTextField tf1 = new JFormattedTextField(factory);
         assertNull(tf1.getValue());
@@ -276,10 +255,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testJFormattedTextFieldAbstractFormatterFactoryObject() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Object value = Color.RED;
         JFormattedTextField.AbstractFormatterFactory factory = new DefaultFormatterFactory();
         JFormattedTextField tf1 = new JFormattedTextField(factory, value);
@@ -290,10 +265,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testSetGetValue() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String propertyName = "value";
         listener.setInterestingPropertyName(propertyName);
         assertNull(tf.getValue());
@@ -309,10 +280,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testSetGetFormatter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String propertyName = "textFormatter";
         listener.setInterestingPropertyName(propertyName);
         assertNull(tf.getFormatter());
@@ -330,10 +297,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testSetGetFocusLostBehavior() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(JFormattedTextField.COMMIT_OR_REVERT, tf.getFocusLostBehavior());
         tf.setFocusLostBehavior(JFormattedTextField.COMMIT);
         assertEquals(JFormattedTextField.COMMIT, tf.getFocusLostBehavior());
@@ -364,10 +327,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testSetGetFormatterFactory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String propertyName = "formatterFactory";
         listener.setInterestingPropertyName(propertyName);
         assertNull(tf.getFormatterFactory());
@@ -378,10 +337,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testProcessFocusEventFocusEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Long value = new Long(56);
         tf.setValue(new Integer(345));
         tf.setFocusLostBehavior(JFormattedTextField.COMMIT);
@@ -432,17 +387,9 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testSetDocumentDocument() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testGetActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Action[] actions = tf.getActions();
         Action[] defaultActions = new DefaultEditorKit().getActions();
         assertEquals(defaultActions.length + 2, actions.length);
@@ -474,10 +421,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testCommitEdit() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         tf.setFormatter(new NumberFormatter());
         assertNull(tf.getValue());
         tf.setText("678");
@@ -490,10 +433,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testIsEditValid() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String propertyName = "editValid";
         listener.setInterestingPropertyName(propertyName);
         tf.setValue(new Integer(90000000));
@@ -509,10 +448,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testConstants() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, JFormattedTextField.COMMIT);
         assertEquals(1, JFormattedTextField.COMMIT_OR_REVERT);
         assertEquals(2, JFormattedTextField.REVERT);
@@ -520,10 +455,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testGetUIClassID() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("FormattedTextFieldUI", tf.getUIClassID());
     }
 
@@ -548,10 +479,6 @@ public class JFormattedTextFieldTest ext
     }
 
     public void testCreateFormattersFactory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DefaultFormatterFactory factory;
         tf.setValue(new Integer(34));
         factory = getFactoryIfDefault(tf.getFormatterFactory());

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameRTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameRTest.java Sat Jun  5 08:34:57 2010
@@ -20,7 +20,6 @@
 package javax.swing;
 
 import javax.swing.plaf.metal.MetalLookAndFeel;
-import tests.support.Support_Excludes;
 
 public class JFrameRTest extends SwingTestCase {
     public JFrameRTest(final String name) {
@@ -28,10 +27,6 @@ public class JFrameRTest extends SwingTe
     }
 
     public void testInitDecorations() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         UIManager.setLookAndFeel(new MetalLookAndFeel() {
             private static final long serialVersionUID = 1L;
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFrameTest.java Sat Jun  5 08:34:57 2010
@@ -36,7 +36,6 @@ import javax.accessibility.AccessibleCon
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleState;
 import org.apache.harmony.x.swing.StringConstants;
-import tests.support.Support_Excludes;
 
 public class JFrameTest extends SwingTestCase {
     /*
@@ -121,10 +120,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void JFrame()
      */
     public void testJFrame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         frame = new JFrame();
         assertEquals("title is empty", "", frame.getTitle());
         assertFalse("JFrame is invisible by default", frame.isVisible());
@@ -135,10 +130,6 @@ public class JFrameTest extends SwingTes
     }
 
     public void testFrameInit() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestFrame frame = new TestFrame();
         assertTrue("rootPaneCheckingEnabled is true", frame.isRootPaneCheckingEnabled());
         assertTrue("layout is not null", frame.getLayout() != null);
@@ -175,10 +166,6 @@ public class JFrameTest extends SwingTes
      *     int getDefaultCloseOperation()
      */
     public void testSetGetDefaultCloseOperation() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // default value is JFrame.HIDE_ON_CLOSE
         assertEquals(WindowConstants.HIDE_ON_CLOSE, frame.getDefaultCloseOperation());
         // test setting valid value
@@ -230,10 +217,6 @@ public class JFrameTest extends SwingTes
      *     static boolean isDefaultLookAndFeelDecorated()
      */
     public void testSetIsDefaultLookAndFeelDecorated() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test for default value
         assertFalse(JFrame.isDefaultLookAndFeelDecorated());
         JFrame.setDefaultLookAndFeelDecorated(true);
@@ -248,10 +231,6 @@ public class JFrameTest extends SwingTes
      *     boolean isRootPaneCheckingEnabled()
      */
     public void testSetIsRootPaneCheckingEnabled() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestFrame frame = new TestFrame();
         assertTrue("rootPaneCheckingEnabled is true by default", frame
                 .isRootPaneCheckingEnabled());
@@ -264,10 +243,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void JFrame(String, GraphicsConfiguration)
      */
     public void testJFrameStringGraphicsConfiguration() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final String title = "Test frame.";
         final GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().getDefaultConfiguration();
@@ -292,10 +267,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void JFrame(String)
      */
     public void testJFrameString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final String title = "Test frame.";
         // test with valid title
         frame = new JFrame(title);
@@ -315,10 +286,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void JFrame(GraphicsConfiguration)
      */
     public void testJFrameGraphicsConfiguration() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().getDefaultConfiguration();
         // test with valid gc
@@ -342,10 +309,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void addImpl(Component, Object, int)
      */
     public void testAddImpl() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         JComponent comp = new JPanel();
         // rootPaneCheckingEnabled is true, exception must be thrown
         frame.setRootPaneCheckingEnabled(true);
@@ -379,10 +342,6 @@ public class JFrameTest extends SwingTes
      *     JRootPane getRootPane()
      */
     public void testSetGetRootPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestFrame frame = new TestFrame();
         assertTrue("setRootPane() is called from the constructor", TestFrame.setRootPaneCalled);
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
@@ -401,10 +360,6 @@ public class JFrameTest extends SwingTes
      * Class under test for JRootPane createRootPane()
      */
     public void testCreateRootPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestFrame frame = new TestFrame();
         assertTrue("createRootPane() is called from the constructor",
                 TestFrame.createRootPaneCalled);
@@ -418,10 +373,6 @@ public class JFrameTest extends SwingTes
      *     JMenuBar getJMenuBar()
      */
     public void testSetGetJMenuBar() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(frame.getJMenuBar());
         JMenuBar menuBar = new JMenuBar();
         frame.setJMenuBar(menuBar);
@@ -436,10 +387,6 @@ public class JFrameTest extends SwingTes
      *     JLayeredPane getLayeredPane()
      */
     public void testSetGetLayeredPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         frame.addPropertyChangeListener("layeredPane", listener);
         JLayeredPane pane = new JLayeredPane();
@@ -465,10 +412,6 @@ public class JFrameTest extends SwingTes
      * Class under test for AccessibleContext getAccessibleContext()
      */
     public void testGetAccessibleContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AccessibleContext c = frame.getAccessibleContext();
         assertTrue("class is ok", c instanceof JFrame.AccessibleJFrame);
         assertTrue("AccessibleRole is ok", c.getAccessibleRole() == AccessibleRole.FRAME);
@@ -490,10 +433,6 @@ public class JFrameTest extends SwingTes
      * Class under test for String paramString()
      */
     public void testParamString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestFrame frame = new TestFrame();
         assertTrue("paramString() cannot return null", frame.paramString() != null);
     }
@@ -502,10 +441,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void processWindowEvent(WindowEvent)
      */
     public void testProcessWindowEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestFrame frame = new TestFrame();
         frame.setVisible(true);
         WindowEvent e = new WindowEvent(frame, WindowEvent.WINDOW_CLOSING);
@@ -535,10 +470,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void setLayout(LayoutManager)
      */
     public void testSetLayout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestFrame frame = new TestFrame();
         LayoutManager contentLayout = frame.getContentPane().getLayout();
         LayoutManager frameLayout = frame.getLayout();
@@ -575,10 +506,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void update(Graphics)
      */
     public void testUpdate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Note: painting code, cannot test
     }
 
@@ -588,10 +515,6 @@ public class JFrameTest extends SwingTes
      *     Container getContentPane()
      */
     public void testSetGetContentPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         frame.addPropertyChangeListener("contentPane", listener);
         JPanel pane = new JPanel();
@@ -619,10 +542,6 @@ public class JFrameTest extends SwingTes
      *     Component getGlassPane()
      */
     public void testSetGetGlassPane() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         frame.addPropertyChangeListener("glassPane", listener);
         JPanel pane = new JPanel();
@@ -648,10 +567,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void remove(Component)
      */
     public void testRemove() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         TestFrame frame = new TestFrame();
         JComponent comp = new JPanel();
         frame.getContentPane().add(comp);
@@ -689,10 +604,6 @@ public class JFrameTest extends SwingTes
      * Class under test for void setIconImage(Image image)
      */
     public void testSetIconImage() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Image image = new BufferedImage(5, 5, BufferedImage.TYPE_BYTE_INDEXED);
         PropertyChangeController cont = new PropertyChangeController();
         frame.addPropertyChangeListener(cont);



Mime
View raw message