You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/05/26 11:31:15 UTC

svn commit: r948377 [11/21] - in /harmony/enhanced/java/branches/mrh: classlib/make/ classlib/modules/accessibility/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/archive/src/test/j...

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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -35,6 +35,7 @@ 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 {
@@ -57,6 +58,10 @@ 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());
@@ -92,6 +97,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testAddNotify() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Marker marker = new Marker();
         new JTable() {
             @Override
@@ -103,6 +112,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testRemoveNotify() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Marker marker = new Marker();
         new JTable() {
             @Override
@@ -114,6 +127,10 @@ 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());
@@ -125,6 +142,10 @@ 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());
@@ -142,6 +163,10 @@ 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);
@@ -200,6 +225,10 @@ 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);
@@ -212,6 +241,10 @@ 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);
@@ -229,6 +262,10 @@ 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());
@@ -236,6 +273,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testSetShowGrid() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(table.getShowHorizontalLines());
         assertTrue(table.getShowVerticalLines());
         table.setShowGrid(false);
@@ -249,6 +290,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetShowHorizontalLines() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(table.getShowHorizontalLines());
         table.setShowHorizontalLines(false);
         assertFalse(table.getShowHorizontalLines());
@@ -258,6 +303,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetShowVerticalLines() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(table.getShowVerticalLines());
         table.setShowVerticalLines(false);
         assertFalse(table.getShowVerticalLines());
@@ -267,6 +316,10 @@ 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());
@@ -278,6 +331,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetAutoCreateColumnsFromModel() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(table.getAutoCreateColumnsFromModel());
         table.setAutoCreateColumnsFromModel(false);
         assertFalse(table.getAutoCreateColumnsFromModel());
@@ -295,6 +352,10 @@ 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();
@@ -318,6 +379,10 @@ 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
@@ -339,6 +404,10 @@ 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
@@ -357,12 +426,20 @@ 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()
@@ -376,6 +453,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetRowSelectionAllowed() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(table.getRowSelectionAllowed());
         table.setRowSelectionAllowed(false);
         assertFalse(table.getRowSelectionAllowed());
@@ -383,6 +464,10 @@ 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);
@@ -392,6 +477,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetCellSelectionEnabled() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse(table.getCellSelectionEnabled());
         assertFalse(table.cellSelectionEnabled);
         table.setCellSelectionEnabled(false);
@@ -413,6 +502,10 @@ 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);
@@ -429,6 +522,10 @@ 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);
@@ -455,6 +552,10 @@ 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);
@@ -481,6 +582,10 @@ 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);
@@ -520,6 +625,10 @@ 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);
@@ -564,6 +673,10 @@ 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);
@@ -573,6 +686,10 @@ 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);
@@ -582,6 +699,10 @@ 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);
@@ -594,6 +715,10 @@ 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);
@@ -608,6 +733,10 @@ 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);
@@ -617,6 +746,10 @@ 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);
@@ -626,6 +759,10 @@ 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));
@@ -639,6 +776,10 @@ 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));
@@ -655,6 +796,10 @@ 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());
@@ -760,6 +905,10 @@ 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);
@@ -812,6 +961,10 @@ 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
@@ -826,6 +979,10 @@ 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"));
@@ -848,6 +1005,10 @@ 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));
@@ -876,6 +1037,10 @@ 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);
@@ -899,6 +1064,10 @@ 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());
@@ -912,6 +1081,10 @@ 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());
@@ -925,6 +1098,10 @@ 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));
@@ -950,6 +1127,10 @@ 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) {
@@ -975,6 +1156,10 @@ 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));
@@ -998,6 +1183,10 @@ 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) {
@@ -1023,6 +1212,10 @@ 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");
@@ -1062,6 +1255,10 @@ 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");
@@ -1081,6 +1278,10 @@ 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"));
@@ -1093,6 +1294,10 @@ 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));
@@ -1109,6 +1314,10 @@ 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);
@@ -1129,6 +1338,10 @@ 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));
@@ -1152,6 +1365,10 @@ 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) {
@@ -1177,6 +1394,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetSurrendersFocusOnKeystroke() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse(table.getSurrendersFocusOnKeystroke());
         table.setSurrendersFocusOnKeystroke(true);
         assertTrue(table.getSurrendersFocusOnKeystroke());
@@ -1185,6 +1406,10 @@ 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());
@@ -1221,18 +1446,30 @@ 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;
@@ -1245,6 +1482,10 @@ 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);
@@ -1254,10 +1495,18 @@ 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);
@@ -1280,6 +1529,10 @@ 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);
@@ -1301,6 +1554,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testGetSetSelectionModel() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         DefaultListSelectionModel oldModel = (DefaultListSelectionModel) table
                 .getSelectionModel();
         assertNotNull(oldModel);
@@ -1320,6 +1577,10 @@ 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());
@@ -1335,6 +1596,10 @@ 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());
@@ -1350,6 +1615,10 @@ 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());
@@ -1365,23 +1634,43 @@ 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();
@@ -1389,6 +1678,10 @@ 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();
@@ -1396,6 +1689,10 @@ public class JTableTest extends BasicSwi
     }
 
     public void testInitializeLocalVars() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         table.rowMargin = 0;
         table.tableHeader = null;
         table.rowHeight = 0;
@@ -1420,27 +1717,47 @@ 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);
@@ -1448,6 +1765,10 @@ 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));
@@ -1469,6 +1790,10 @@ 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));
@@ -1481,6 +1806,10 @@ 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);
@@ -1492,6 +1821,10 @@ 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));
@@ -1513,6 +1846,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -22,6 +22,7 @@ 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;
@@ -86,6 +87,10 @@ 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());
@@ -130,6 +135,10 @@ 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());
@@ -168,6 +177,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -45,6 +45,7 @@ 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";
@@ -204,6 +205,10 @@ 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);
@@ -215,6 +220,10 @@ 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");
@@ -272,6 +281,10 @@ public class JTextFieldTest extends Swin
     }
 
     public void testConfigurePropertiesFromAction() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Action action = new DefaultEditorKit.CutAction();
         jtf.configurePropertiesFromAction(action);
         assertTrue(jtf.isEnabled());
@@ -284,6 +297,10 @@ 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);
@@ -300,6 +317,10 @@ 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);
@@ -308,6 +329,10 @@ 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");
@@ -329,6 +354,10 @@ 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);
@@ -348,6 +377,10 @@ 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());
@@ -367,6 +400,10 @@ 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());
@@ -375,18 +412,30 @@ 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);
@@ -394,6 +443,10 @@ public class JTextFieldTest extends Swin
     }
 
     public void testJTextFieldDocumentStringInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String str1 = "AAA";
         String str2 = "testJTextFieldDocumentStringInt()";
         Document doc = new PlainDocument();
@@ -427,6 +480,10 @@ 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);
@@ -442,6 +499,10 @@ 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());
@@ -450,6 +511,10 @@ 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());
@@ -466,12 +531,20 @@ 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() + "," +
@@ -500,6 +573,10 @@ 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");
@@ -533,9 +610,17 @@ 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();
@@ -560,6 +645,10 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetDocument() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Document old = jtf.getDocument();
         Document doc = new PlainDocument();
         jtf.setDocument(doc);
@@ -568,6 +657,10 @@ 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());
@@ -585,6 +678,10 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetGetAction() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(jtf.getAction());
         Action action = new DefaultEditorKit.CutAction();
         jtf.setAction(action);
@@ -616,6 +713,10 @@ public class JTextFieldTest extends Swin
     }
 
     public void testSetGetColumns() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(0, jtf.getColumns());
         jtf.wasCallInvalidate = false;
         jtf.setColumns(5);
@@ -632,6 +733,10 @@ 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());
@@ -687,6 +792,10 @@ 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());
@@ -722,6 +831,10 @@ 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);
@@ -732,6 +845,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -25,6 +25,7 @@ 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;
@@ -49,6 +50,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -34,6 +34,7 @@ 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;
@@ -61,6 +62,10 @@ 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() {
@@ -79,6 +84,10 @@ 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() {
@@ -97,6 +106,10 @@ 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);
@@ -105,11 +118,19 @@ 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());
@@ -125,11 +146,19 @@ 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);
@@ -140,6 +169,10 @@ 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);
@@ -156,6 +189,10 @@ 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);
@@ -163,6 +200,10 @@ 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);
@@ -178,6 +219,10 @@ public class JViewportTest extends Swing
     }
 
     public void testSetBorder() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             port.setBorder(BorderFactory.createEmptyBorder());
             fail("must throw an exception");
@@ -189,10 +234,18 @@ 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);
@@ -200,6 +253,10 @@ 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);
@@ -261,11 +318,19 @@ 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);
@@ -277,6 +342,10 @@ 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);
@@ -287,17 +356,29 @@ 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);
@@ -309,6 +390,10 @@ 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);
@@ -319,6 +404,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -33,6 +33,7 @@ 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 {
     /*
@@ -130,6 +131,10 @@ 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());
@@ -142,6 +147,10 @@ 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);
@@ -164,6 +173,10 @@ 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());
@@ -176,6 +189,10 @@ 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();
@@ -215,6 +232,10 @@ 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
@@ -234,6 +255,10 @@ 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
@@ -257,6 +282,10 @@ 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
@@ -276,6 +305,10 @@ 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
@@ -310,6 +343,10 @@ 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();
@@ -328,6 +365,10 @@ 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);
@@ -341,6 +382,10 @@ 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();
@@ -366,6 +411,10 @@ 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);
@@ -378,6 +427,10 @@ 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);
     }
@@ -386,6 +439,10 @@ 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();
@@ -422,6 +479,10 @@ 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
     }
 
@@ -431,6 +492,10 @@ 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();
@@ -458,6 +523,10 @@ 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();
@@ -483,6 +552,10 @@ 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));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/LayoutFocusTraversalPolicyTest.java Wed May 26 09:31:07 2010
@@ -23,6 +23,7 @@ import java.awt.Component;
 import java.awt.ComponentOrientation;
 import java.awt.GridLayout;
 import javax.swing.plaf.ComboBoxUI;
+import tests.support.Support_Excludes;
 
 public class LayoutFocusTraversalPolicyTest extends BasicSwingTestCase {
     private LayoutFocusTraversalPolicy policy;
@@ -63,6 +64,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testAccept() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         frame.setVisible(true);
         SwingWaitTestCase.isRealized(frame);
         Component invisible = new JPanel();
@@ -103,6 +108,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testGetComponentBefore() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
         assertEquals(button1, policy.getComponentBefore(cycleRoot, button2));
         assertEquals(button2, policy.getComponentBefore(cycleRoot, button3));
@@ -116,6 +125,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testGetComponentBefore_Null() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
 
         try {
@@ -141,6 +154,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testGetComponentAfter() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
         assertEquals(button1, policy.getComponentAfter(cycleRoot, button4));
         assertEquals(button2, policy.getComponentAfter(cycleRoot, button1));
@@ -154,6 +171,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testGetComponentAfter_Null() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
 
         try {
@@ -179,6 +200,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testGetLastComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
         assertEquals(button1, policy.getLastComponent(cycleRoot));
         cycleRoot = createTestPanel(ComponentOrientation.RIGHT_TO_LEFT);
@@ -186,6 +211,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testGetLastComponent_Null() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
 
         try {
@@ -197,6 +226,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testGetFirstComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
         assertEquals(button2, policy.getFirstComponent(cycleRoot));
         cycleRoot = createTestPanel(ComponentOrientation.RIGHT_TO_LEFT);
@@ -204,6 +237,10 @@ public class LayoutFocusTraversalPolicyT
     }
 
     public void testGetFirstComponent_Null() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel cycleRoot = createTestPanel(ComponentOrientation.LEFT_TO_RIGHT);
 
         try {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/OverlayLayoutTest.java Wed May 26 09:31:07 2010
@@ -33,6 +33,7 @@ import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import javax.swing.border.EmptyBorder;
+import tests.support.Support_Excludes;
 
 public class OverlayLayoutTest extends SwingTestCase {
     protected OverlayLayout layout = null;
@@ -42,6 +43,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testOverlayLayout() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         boolean thrown = false;
         try {
@@ -63,6 +68,10 @@ public class OverlayLayoutTest extends S
      * Class under test for void addLayoutComponent(Component, Object)
      */
     public void testAddLayoutComponentComponentObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -87,6 +96,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testPreferredLayoutSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JComponent container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -138,6 +151,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testMinimumLayoutSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JComponent container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -189,6 +206,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testMaximumLayoutSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JComponent container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -243,6 +264,10 @@ public class OverlayLayoutTest extends S
      * Class under test for void addLayoutComponent(String, Component)
      */
     public void testAddLayoutComponentStringComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -279,6 +304,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testLayoutContainer1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JComponent container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -328,6 +357,10 @@ public class OverlayLayoutTest extends S
 
     @SuppressWarnings("deprecation")
     public void testLayoutContainer2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JWindow window = new JWindow();
         JComponent panel = new JPanel();
         JComponent panel1 = new JPanel();
@@ -362,6 +395,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testInvalidateLayout() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -384,6 +421,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testGetLayoutAlignmentY() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -422,6 +463,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testGetLayoutAlignmentX() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -460,6 +505,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testRemoveLayoutComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         JComponent component1 = new JPanel();
         JComponent component2 = new JPanel();
@@ -491,6 +540,10 @@ public class OverlayLayoutTest extends S
 
     // Layout sharing testcases and so on
     public void testSharingLayout() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         layout = new OverlayLayout(container);
         boolean thrown = false;
@@ -566,6 +619,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testWriteObject() throws IOException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new JPanel();
         OverlayLayout layout1 = new OverlayLayout(container);
         ByteArrayOutputStream fo = new ByteArrayOutputStream();
@@ -575,6 +632,10 @@ public class OverlayLayoutTest extends S
     }
 
     public void testReadObject() throws ClassNotFoundException, IOException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = new Panel();
         OverlayLayout layout1 = new OverlayLayout(container);
         ByteArrayOutputStream fo = new ByteArrayOutputStream();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryRTest.java Wed May 26 09:31:07 2010
@@ -19,12 +19,18 @@
  */
 package javax.swing;
 
+import tests.support.Support_Excludes;
+
 public class PopupFactoryRTest extends BasicSwingTestCase {
     public PopupFactoryRTest(final String name) {
         super(name);
     }
 
     public void testGetPopup() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Popup p1 = PopupFactory.getSharedInstance().getPopup(null, new JPanel(), 10, 10);
         p1.show();
         p1.hide();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupFactoryTest.java Wed May 26 09:31:07 2010
@@ -20,6 +20,7 @@
 package javax.swing;
 
 import java.awt.Window;
+import tests.support.Support_Excludes;
 
 public class PopupFactoryTest extends BasicSwingTestCase {
     public PopupFactoryTest(final String name) {
@@ -27,6 +28,10 @@ public class PopupFactoryTest extends Ba
     }
 
     public void testGetSetSharedInstance() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNotNull(PopupFactory.getSharedInstance());
         PopupFactory factory = new PopupFactory();
         PopupFactory.setSharedInstance(factory);
@@ -40,6 +45,10 @@ public class PopupFactoryTest extends Ba
     }
 
     public void testGetPopup() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JButton content1 = new JButton();
         Popup p1 = PopupFactory.getSharedInstance().getPopup(null, content1, 10, 10);
         p1.show();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/PopupTest.java Wed May 26 09:31:07 2010
@@ -21,6 +21,7 @@ package javax.swing;
 
 import java.awt.Component;
 import java.awt.Point;
+import tests.support.Support_Excludes;
 
 public class PopupTest extends BasicSwingTestCase {
     private Popup popup;
@@ -35,6 +36,10 @@ public class PopupTest extends BasicSwin
     }
 
     public void testPopup() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Component content = new JButton("content");
         assertNull(content.getParent());
         popup = new Popup(null, content, 10, 10);
@@ -71,6 +76,10 @@ public class PopupTest extends BasicSwin
     }
 
     public void testShowHide() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Component content = new JButton("content");
         assertNull(SwingUtilities.getWindowAncestor(content));
         popup = new Popup(null, content, 100, 200);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorInputStreamTest.java Wed May 26 09:31:07 2010
@@ -25,6 +25,7 @@ import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
+import tests.support.Support_Excludes;
 
 public class ProgressMonitorInputStreamTest extends BasicSwingTestCase {
     private JFrame window;
@@ -66,6 +67,10 @@ public class ProgressMonitorInputStreamT
     }
 
     public void testProgressMonitorInputStream() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         in = new ProgressMonitorInputStream(window, "Here we go...", realIn);
         assertNotNull(in.getProgressMonitor());
         in.read();
@@ -76,6 +81,10 @@ public class ProgressMonitorInputStreamT
     }
 
     public void testMaximum() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         in = new ProgressMonitorInputStream(window, "Here we go...", new ErrorStream(realIn));
         assertEquals(0, in.getProgressMonitor().getMaximum());
         in.read();
@@ -87,6 +96,10 @@ public class ProgressMonitorInputStreamT
     }
 
     public void testReset() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         in = new ProgressMonitorInputStream(window, "Here we go...", realIn);
         ProgressMonitor pm = in.getProgressMonitor();
         in.read();
@@ -98,6 +111,10 @@ public class ProgressMonitorInputStreamT
     }
 
     public void testInterrupted() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         in = new ProgressMonitorInputStream(window, "Here we go...", realIn);
         in.read();
         Thread.sleep(600);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/ProgressMonitorTest.java Wed May 26 09:31:07 2010
@@ -20,6 +20,7 @@
 package javax.swing;
 
 import java.awt.event.WindowEvent;
+import tests.support.Support_Excludes;
 
 public class ProgressMonitorTest extends BasicSwingTestCase {
     private ProgressMonitor progressMonitor;
@@ -40,12 +41,20 @@ public class ProgressMonitorTest extends
     }
 
     public void testProgressMonitor() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 100);
         assertEquals(progressMonitor.getMillisToDecideToPopup(), 500);
         assertEquals(progressMonitor.getMillisToPopup(), 2000);
     }
 
     public void testSetProgress() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 100);
         assertEquals(0, window.getOwnedWindows().length);
         progressMonitor.setProgress(1);
@@ -69,6 +78,10 @@ public class ProgressMonitorTest extends
     }
 
     public void testGetSetMaximum() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 300);
         progressMonitor.setProgress(1);
         Thread.sleep(500 + 100);
@@ -82,6 +95,10 @@ public class ProgressMonitorTest extends
     }
 
     public void testGetSetMinimum() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 300);
         progressMonitor.setProgress(1);
         Thread.sleep(500 + 100);
@@ -95,6 +112,10 @@ public class ProgressMonitorTest extends
     }
 
     public void testIsCancelled() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 100);
         progressMonitor.setProgress(1);
         Thread.sleep(500 + 100);
@@ -117,6 +138,10 @@ public class ProgressMonitorTest extends
     }
 
     public void testClose() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         progressMonitor = new ProgressMonitor(window, "message test", "note test", 0, 100);
         progressMonitor.setProgress(1);
         Thread.sleep(500 + 100);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/RepaintManagerTest.java Wed May 26 09:31:07 2010
@@ -31,6 +31,7 @@ import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.InvocationEvent;
 import org.apache.harmony.awt.ComponentInternals;
+import tests.support.Support_Excludes;
 
 public class RepaintManagerTest extends BasicSwingTestCase {
     private Dimension dbMaxSize;
@@ -53,6 +54,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testCurrentManager() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         RepaintManager inst1 = RepaintManager.currentManager(new JButton());
         assertNotNull(inst1);
         RepaintManager inst2 = RepaintManager.currentManager(new Button());
@@ -64,6 +69,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testSetCurrentManager() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         RepaintManager newInst = new RepaintManager();
         RepaintManager.setCurrentManager(newInst);
         assertTrue(RepaintManager.currentManager(null) == newInst);
@@ -73,6 +82,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testAddRemoveInvalidComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame f = new Frame();
         final JPanel rootPanel = new JPanel(new BorderLayout()) {
                 private static final long serialVersionUID = 1L;
@@ -169,6 +182,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testValidateInvalidComponents() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame f = new Frame();
         final JPanel rootPanel = new JPanel(new BorderLayout()) {
             private static final long serialVersionUID = 1L;
@@ -213,6 +230,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testAddDirtyRegion() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final JPanel root = new JPanel(new BorderLayout());
         JFrame f = new JFrame();
         f.getContentPane().add(root);
@@ -248,6 +269,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testMarkCompletelyDirtyClean() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final JPanel root = new JPanel(new BorderLayout());
         JFrame f = new JFrame();
         f.getContentPane().add(root);
@@ -296,6 +321,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testIsCompletelyDirty() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final JPanel root = new JPanel(new BorderLayout());
         JFrame f = new JFrame();
         f.getContentPane().add(root);
@@ -338,6 +367,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testGetDirtyRegion() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final JPanel root = new JPanel(new BorderLayout());
         JFrame f = new JFrame();
         f.getContentPane().add(root);
@@ -367,6 +400,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testPaintDirtyRegions() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Marker rootPaintMarker = new Marker();
         final Marker rootPaintImmediatelyMarker = new Marker();
         final JPanel root = new JPanel(null) {
@@ -583,12 +620,20 @@ public class RepaintManagerTest extends 
     }
 
     public void testIsDoubleBufferingEnabled() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(RepaintManager.currentManager(null).isDoubleBufferingEnabled());
         RepaintManager.currentManager(null).setDoubleBufferingEnabled(false);
         assertFalse(RepaintManager.currentManager(null).isDoubleBufferingEnabled());
     }
 
     public void testGetDoubleBufferMaximumSize() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(Toolkit.getDefaultToolkit().getScreenSize(), RepaintManager
                 .currentManager(null).getDoubleBufferMaximumSize());
         Dimension bufferSize = new Dimension(100, 100);
@@ -598,6 +643,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testGetOffscreenBuffer() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel root = new JPanel();
         JFrame f = new JFrame();
         f.getContentPane().add(root);
@@ -657,6 +706,10 @@ public class RepaintManagerTest extends 
     }
 
     public void testGetVolatileOffscreenBuffer() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel root = new JPanel();
         JFrame f = new JFrame();
         f.getContentPane().add(root);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyRTest.java Wed May 26 09:31:07 2010
@@ -21,6 +21,7 @@ package javax.swing;
 
 import java.awt.Component;
 import java.util.Comparator;
+import tests.support.Support_Excludes;
 
 public class SortingFocusTraversalPolicyRTest extends BasicSwingTestCase {
     private SortingFocusTraversalPolicy policy;
@@ -60,6 +61,10 @@ public class SortingFocusTraversalPolicy
     }
 
     public void testGetComponentAfterInNonDisplayableHierarchy() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JFrame f = new JFrame();
         f.setVisible(true);
         SwingWaitTestCase.isRealized(f);
@@ -80,6 +85,10 @@ public class SortingFocusTraversalPolicy
     }
 
     public void testGetComponentBeforeAfterNotAcceptable() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JFrame f = new JFrame();
         f.setVisible(true);
         SwingWaitTestCase.isRealized(f);