harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948377 [10/21] - in /harmony/enhanced/java/branches/mrh: classlib/make/ classlib/modules/accessibility/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/archive/src/test/j...
Date Wed, 26 May 2010 09:31:15 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JMenuTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JMenuTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JMenuTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JMenuTest.java Wed May 26 09:31:07 2010
@@ -29,6 +29,7 @@ import java.util.EventListener;
 import javax.swing.JPopupMenuTest.MyAction;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
+import tests.support.Support_Excludes;
 
 @SuppressWarnings("serial")
 public class JMenuTest extends JMenuItemTest {
@@ -106,12 +107,20 @@ public class JMenuTest extends JMenuItem
 
     @Override
     public void testJMenuItem() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 
     /*
      * Test method for 'javax.swing.JMenu.JMenu()'
      */
     public void testJMenu() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue("default buttonModel ", button.getModel() instanceof DefaultButtonModel);
         assertNull("icon ", button.getIcon());
         assertEquals("text ", "", button.getText());
@@ -136,6 +145,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.JMenu(String)'
      */
     public void testJMenuString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String text = "texttext";
         button = menuItem = menu = new JMenu(text);
         assertTrue("default buttonModel ", button.getModel() instanceof DefaultButtonModel);
@@ -164,6 +177,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.JMenu(String, boolean)'
      */
     public void testJMenuStringBoolean() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String text = "texttext";
         button = menuItem = menu = new JMenu(text, true);
         assertTrue("default buttonModel ", button.getModel() instanceof DefaultButtonModel);
@@ -192,6 +209,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.JMenu(Action)'
      */
     public void testJMenuAction() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final String command = "dnammoc";
         class MyAction extends AbstractAction {
             public MyAction(final String text, final Icon icon) {
@@ -253,6 +274,10 @@ public class JMenuTest extends JMenuItem
      */
     @Override
     public void testGetAccessibleContext() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         boolean assertedValue = (menuItem.getAccessibleContext() != null && menuItem
                 .getAccessibleContext().getClass().getName().equals(
                         "javax.swing.JMenu$AccessibleJMenu"));
@@ -263,6 +288,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.applyComponentOrientation(ComponentOrientation)'
      */
     public void testApplyComponentOrientation() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item = new JMenuItem();
         menu.applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
         assertTrue(menu.getPopupMenu().getComponentOrientation().isLeftToRight());
@@ -277,6 +306,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.setComponentOrientation(ComponentOrientation)'
      */
     public void testSetComponentOrientation() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item = new JMenuItem();
         menu.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
         assertTrue(menu.getPopupMenu().getComponentOrientation().isLeftToRight());
@@ -291,6 +324,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.remove(int)'
      */
     public void testRemoveInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         menu.add(item1);
@@ -317,6 +354,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.remove(Component)'
      */
     public void testRemoveComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         menu.add(item1);
@@ -335,6 +376,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.remove(JMenuItem)'
      */
     public void testRemoveJMenuItem() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         menu.add(item1);
@@ -354,6 +399,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.removeAll()'
      */
     public void testRemoveAll() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         assertEquals(0, menu.getMenuComponentCount());
@@ -371,6 +420,10 @@ public class JMenuTest extends JMenuItem
      */
     @Override
     public void testGetUIClassID() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("MenuUI", menu.getUIClassID());
     }
 
@@ -379,12 +432,20 @@ public class JMenuTest extends JMenuItem
      */
     @Override
     public void testDoClick() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 
     /*
      * Test method for 'javax.swing.JMenu.doClick(int)'
      */
     public void testDoClickInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JFrame frame = new JFrame();
         JMenuBar menuBar = new JMenuBar();
         frame.getContentPane().add(menuBar);
@@ -405,6 +466,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.setSelected(boolean)'
      */
     public void testSetIsSelected() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ConcreteMenuListener listener = new ConcreteMenuListener();
         menu.addMenuListener(listener);
         menu.setSelected(true);
@@ -424,6 +489,10 @@ public class JMenuTest extends JMenuItem
      */
     @Override
     public void testSetAccelerator() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             menu.setAccelerator(null);
             fail("no exception has been thrown");
@@ -436,6 +505,10 @@ public class JMenuTest extends JMenuItem
      */
     @Override
     public void testGetComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertSame(menu, menu.getComponent());
     }
 
@@ -444,6 +517,10 @@ public class JMenuTest extends JMenuItem
      */
     @Override
     public void testGetSubElements() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         JMenuItem item3 = new JMenuItem();
@@ -480,6 +557,10 @@ public class JMenuTest extends JMenuItem
      */
     @Override
     public void testMenuSelectionChanged() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ConcreteMenuListener listener = new ConcreteMenuListener();
         menu.addMenuListener(listener);
         menu.menuSelectionChanged(true);
@@ -498,6 +579,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.add(Action)'
      */
     public void testAddAction() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = createNewIcon();
         String text = "texttext";
         Action action = new JPopupMenuTest.MyAction(text, icon);
@@ -513,6 +598,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.add(String)'
      */
     public void testAddString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String text1 = "text";
         String text2 = "texttext";
         JMenuItem item1 = menu.add(text1);
@@ -533,6 +622,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.add(JMenuItem)'
      */
     public void testAddJMenuItem() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         JPopupMenu popup = menu.getPopupMenu();
@@ -555,6 +648,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.add(Component)'
      */
     public void testAddComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Component item1 = new JMenuItem();
         Component item2 = new JMenuItem();
         Component item3 = new JButton();
@@ -586,6 +683,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.add(Component, int)'
      */
     public void testAddComponentInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Component item1 = new JMenuItem();
         Component item2 = new JMenuItem();
         Component item3 = new JButton();
@@ -617,6 +718,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.addSeparator()'
      */
     public void testAddSeparator() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         JPopupMenu popup = menu.getPopupMenu();
@@ -642,6 +747,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.addMenuListener(MenuListener)'
      */
     public void testAddGetRemoveMenuListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MenuListener listener1 = new ConcreteMenuListener();
         MenuListener listener2 = new ConcreteMenuListener();
         MenuListener listener3 = new ConcreteMenuListener();
@@ -672,6 +781,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.createActionChangeListener(JMenuItem)'
      */
     public void testCreateActionChangeListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String text1 = "text";
         String text2 = "texttext";
         String text3 = "texttexttext";
@@ -705,6 +818,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.createActionComponent(Action)'
      */
     public void testCreateActionComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final String command = "dnammoc";
         class MyAction extends AbstractAction {
             public MyAction(final String text, final Icon icon) {
@@ -742,6 +859,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.createWinListener(JPopupMenu)'
      */
     public void testCreateWinListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPopupMenu pupop = new JPopupMenu();
         JMenu.WinListener listener1 = menu.createWinListener(pupop);
         JMenu.WinListener listener2 = menu.createWinListener(pupop);
@@ -754,6 +875,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.fireMenuCanceled()'
      */
     public void testFireMenuCanceled() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ConcreteMenuListener listener1 = new ConcreteMenuListener();
         ConcreteMenuListener listener2 = new ConcreteMenuListener();
         menu.addMenuListener(listener1);
@@ -769,6 +894,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.fireMenuDeselected()'
      */
     public void testFireMenuDeselected() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ConcreteMenuListener listener1 = new ConcreteMenuListener();
         ConcreteMenuListener listener2 = new ConcreteMenuListener();
         menu.addMenuListener(listener1);
@@ -784,6 +913,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.fireMenuSelected()'
      */
     public void testFireMenuSelected() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ConcreteMenuListener listener1 = new ConcreteMenuListener();
         ConcreteMenuListener listener2 = new ConcreteMenuListener();
         menu.addMenuListener(listener1);
@@ -799,6 +932,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.getMenuComponentCount()'
      */
     public void testGetMenuComponentCount() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         assertEquals(0, menu.getMenuComponentCount());
@@ -816,6 +953,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.getItemCount()'
      */
     public void testGetItemCount() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         assertEquals(0, menu.getItemCount());
@@ -833,6 +974,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.getMenuComponent(int)'
      */
     public void testGetMenuComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         assertNull(menu.getMenuComponent(0));
@@ -856,6 +1001,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.getItem(int)'
      */
     public void testGetItem() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         assertNull(menu.getItem(0));
@@ -879,6 +1028,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.getMenuComponents()'
      */
     public void testGetMenuComponents() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         JMenuItem item3 = new JMenuItem();
@@ -915,6 +1068,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.getPopupMenu()'
      */
     public void testGetPopupMenu() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNotNull(menu.getPopupMenu());
         assertNull(menu.getPopupMenu().getLabel());
         assertEquals(0, menu.getPopupMenu().getComponentCount());
@@ -927,6 +1084,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.getPopupMenuOrigin()'
      */
     public void testGetPopupMenuOrigin() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int offsetX1 = 50;
         int offsetY1 = 60;
         int offsetX2 = 20;
@@ -968,6 +1129,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.insert(String, int)'
      */
     public void testInsertStringInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String text1 = "text";
         String text2 = "texttext";
         menu.insert(text1, 0);
@@ -1000,6 +1165,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.insert(JMenuItem, int)'
      */
     public void testInsertJMenuItemInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         assertSame(item1, menu.insert(item1, 0));
@@ -1023,6 +1192,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.insert(Action, int)'
      */
     public void testInsertActionInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = createNewIcon();
         String text = "texttext";
         MyAction action1 = new MyAction(text, icon);
@@ -1055,6 +1228,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.insertSeparator(int)'
      */
     public void testInsertSeparator() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         menu.insertSeparator(0);
         assertEquals(1, menu.getItemCount());
         assertNull(menu.getItem(0));
@@ -1078,6 +1255,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.isMenuComponent(Component)'
      */
     public void testIsMenuComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JMenuItem item1 = new JMenuItem();
         JMenuItem item2 = new JMenuItem();
         JMenuItem item3 = new JMenuItem();
@@ -1120,6 +1301,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.isTearOff()'
      */
     public void testIsTearOff() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             menu.isTearOff();
             fail("no exception has been thrown");
@@ -1131,6 +1316,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.isTopLevelMenu()'
      */
     public void testIsTopLevelMenu() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse(menu.isTopLevelMenu());
         JMenuBar menuBar = new JMenuBar();
         JMenu menu2 = new JMenu();
@@ -1145,6 +1334,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.setDelay(int)'
      */
     public void testGetSetDelay() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int delay1 = 1000;
         int delay2 = -1000;
         menu.setDelay(0);
@@ -1161,6 +1354,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.setMenuLocation(int, int)'
      */
     public void testSetMenuLocation() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int x = 100;
         int y = 200;
         menu.getPopupMenu().setVisible(true);
@@ -1173,6 +1370,10 @@ public class JMenuTest extends JMenuItem
      * Test method for 'javax.swing.JMenu.setPopupMenuVisible(boolean)'
      */
     public void testSetIsPopupMenuVisible() throws InterruptedException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         menu.setPopupMenuVisible(true);
         assertFalse(menu.isPopupMenuVisible());
         JWindow frame = new JWindow();
@@ -1197,6 +1398,10 @@ public class JMenuTest extends JMenuItem
 
     @Override
     public void testNumberOfModelListeners() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         button.setUI(null);
         DefaultButtonModel model = (DefaultButtonModel) button.getModel();
         assertEquals("model's action listeners ", 1, model.getActionListeners().length);
@@ -1210,6 +1415,10 @@ public class JMenuTest extends JMenuItem
 
     @Override
     public void testConfigurePropertiesFromAction() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon1 = createNewIcon();
         Icon icon2 = createNewIcon();
         KeyStroke ks1 = KeyStroke.getKeyStroke('a');

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneRTest.java Wed May 26 09:31:07 2010
@@ -20,6 +20,7 @@
 package javax.swing;
 
 import java.awt.Frame;
+import tests.support.Support_Excludes;
 
 public class JOptionPaneRTest extends SwingTestCase {
     public JOptionPaneRTest(final String name) {
@@ -27,6 +28,10 @@ public class JOptionPaneRTest extends Sw
     }
 
     public void testGetFrameForComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Frame f = new Frame();
         final JDialog dialog = new JDialog(f);
         assertSame(f, JOptionPane.getFrameForComponent(dialog));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JOptionPaneTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ import java.awt.Frame;
 import java.awt.image.BufferedImage;
 import javax.accessibility.AccessibleRole;
 import javax.swing.plaf.OptionPaneUI;
+import tests.support.Support_Excludes;
 
 public class JOptionPaneTest extends SwingTestCase {
     JOptionPane pane = null;
@@ -40,6 +41,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetAccessibleContext() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         boolean assertedValue = (pane.getAccessibleContext() != null && pane
                 .getAccessibleContext().getClass().getName().equals(
                         "javax.swing.JOptionPane$AccessibleJOptionPane"));
@@ -49,14 +54,26 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testParamString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue("ParamString returns a string ", pane.toString() != null);
     }
 
     public void testGetUIClassID() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("UI class ID", "OptionPaneUI", pane.getUIClassID());
     }
 
     public void testUpdateUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         OptionPaneUI ui = new OptionPaneUI() {
             @Override
             public void selectInitialValue(JOptionPane arg0) {
@@ -77,6 +94,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void JOptionPane()
      */
     public void testJOptionPane() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("message", "JOptionPane message", pane.getMessage());
         assertEquals("message type", JOptionPane.PLAIN_MESSAGE, pane.getMessageType());
         assertEquals("option type", JOptionPane.DEFAULT_OPTION, pane.getOptionType());
@@ -91,6 +112,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void JOptionPane(Object)
      */
     public void testJOptionPaneObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String message = "message";
         pane = new JOptionPane(message);
         assertEquals("message", message, pane.getMessage());
@@ -106,6 +131,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void JOptionPane(Object, int)
      */
     public void testJOptionPaneObjectint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String message = "message";
         int messageType1 = JOptionPane.ERROR_MESSAGE;
         int messageType2 = -100;
@@ -130,6 +159,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void JOptionPane(Object, int, int)
      */
     public void testJOptionPaneObjectintint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String message = "message";
         int messageType1 = JOptionPane.ERROR_MESSAGE;
         int messageType2 = -100;
@@ -163,6 +196,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void JOptionPane(Object, int, int, Icon)
      */
     public void testJOptionPaneObjectintintIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String message = "message";
         Icon icon1 = new ImageIcon();
         Icon icon2 = null;
@@ -205,6 +242,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void JOptionPane(Object, int, int, Icon, Object[])
      */
     public void testJOptionPaneObjectintintIconObjectArray() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String message = "message";
         Icon icon1 = new ImageIcon();
         Icon icon2 = null;
@@ -258,6 +299,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void JOptionPane(Object, int, int, Icon, Object[], Object)
      */
     public void testJOptionPaneObjectintintIconObjectArrayObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String message = "message";
         Icon icon1 = new ImageIcon();
         Icon icon2 = null;
@@ -325,6 +370,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for String showInputDialog(Object)
      */
     public void testShowInputDialogObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInputDialog().
     }
 
@@ -332,6 +381,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for String showInputDialog(Object, Object)
      */
     public void testShowInputDialogObjectObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInputDialog().
     }
 
@@ -339,6 +392,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for String showInputDialog(Component, Object)
      */
     public void testShowInputDialogComponentObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInputDialog().
     }
 
@@ -346,6 +403,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for String showInputDialog(Component, Object, Object)
      */
     public void testShowInputDialogComponentObjectObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInputDialog().
     }
 
@@ -353,6 +414,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for String showInputDialog(Component, Object, String, int)
      */
     public void testShowInputDialogComponentObjectStringint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInputDialog().
     }
 
@@ -360,6 +425,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for Object showInputDialog(Component, Object, String, int, Icon, Object[], Object)
      */
     public void testShowInputDialogComponentObjectStringintIconObjectArrayObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInputDialog().
     }
 
@@ -367,6 +436,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void showMessageDialog(Component, Object)
      */
     public void testShowMessageDialogComponentObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showMessageDialog().
     }
 
@@ -374,6 +447,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void showMessageDialog(Component, Object, String, int)
      */
     public void testShowMessageDialogComponentObjectStringint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showMessageDialog().
     }
 
@@ -381,6 +458,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void showMessageDialog(Component, Object, String, int, Icon)
      */
     public void testShowMessageDialogComponentObjectStringintIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showMessageDialog().
     }
 
@@ -388,6 +469,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for int showConfirmDialog(Component, Object)
      */
     public void testShowConfirmDialogComponentObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showConfirmDialog().
     }
 
@@ -395,6 +480,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for int showConfirmDialog(Component, Object, String, int)
      */
     public void testShowConfirmDialogComponentObjectStringint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showConfirmDialog().
     }
 
@@ -402,6 +491,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for int showConfirmDialog(Component, Object, String, int, int)
      */
     public void testShowConfirmDialogComponentObjectStringintint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showConfirmDialog().
     }
 
@@ -409,14 +502,26 @@ public class JOptionPaneTest extends Swi
      * Class under test for int showConfirmDialog(Component, Object, String, int, int, Icon)
      */
     public void testShowConfirmDialogComponentObjectStringintintIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showConfirmDialog().
     }
 
     public void testShowOptionDialog() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showOptionDialog().
     }
 
     public void testCreateInternalFrame() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JDesktopPane deskTop = new JDesktopPane();
         JFrame frame = new JFrame();
         JPanel panel = new JPanel();
@@ -448,6 +553,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testCreateDialog() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JFrame frame = new JFrame();
         JPanel panel = new JPanel();
         String title = "title-title";
@@ -466,6 +575,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void showInternalMessageDialog(Component, Object)
      */
     public void testShowInternalMessageDialogComponentObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalMessageDialog().
         //        JFrame frame = new JFrame();
         //        JPanel panel = new JPanel();
@@ -480,6 +593,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void showInternalMessageDialog(Component, Object, String, int)
      */
     public void testShowInternalMessageDialogComponentObjectStringint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalMessageDialog().
     }
 
@@ -487,6 +604,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for void showInternalMessageDialog(Component, Object, String, int, Icon)
      */
     public void testShowInternalMessageDialogComponentObjectStringintIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalMessageDialog().
     }
 
@@ -494,6 +615,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for int showInternalConfirmDialog(Component, Object)
      */
     public void testShowInternalConfirmDialogComponentObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalConfirmDialog().
     }
 
@@ -501,6 +626,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for int showInternalConfirmDialog(Component, Object, String, int)
      */
     public void testShowInternalConfirmDialogComponentObjectStringint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalConfirmDialog().
     }
 
@@ -508,6 +637,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for int showInternalConfirmDialog(Component, Object, String, int, int)
      */
     public void testShowInternalConfirmDialogComponentObjectStringintint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalConfirmDialog().
     }
 
@@ -515,10 +648,18 @@ public class JOptionPaneTest extends Swi
      * Class under test for int showInternalConfirmDialog(Component, Object, String, int, int, Icon)
      */
     public void testShowInternalConfirmDialogComponentObjectStringintintIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalConfirmDialog().
     }
 
     public void testShowInternalOptionDialog() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalOptionDialog().
     }
 
@@ -526,6 +667,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for String showInternalInputDialog(Component, Object)
      */
     public void testShowInternalInputDialogComponentObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalInputDialog().
     }
 
@@ -533,6 +678,10 @@ public class JOptionPaneTest extends Swi
      * Class under test for String showInternalInputDialog(Component, Object, String, int)
      */
     public void testShowInternalInputDialogComponentObjectStringint() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalInputDialog().
     }
 
@@ -540,10 +689,18 @@ public class JOptionPaneTest extends Swi
      * Class under test for Object showInternalInputDialog(Component, Object, String, int, Icon, Object[], Object)
      */
     public void testShowInternalInputDialogComponentObjectStringintIconObjectArrayObject() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement showInternalInputDialog().
     }
 
     public void testGetFrameForComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame defaultFrame = JOptionPane.getRootFrame();
         JPanel panel = new JPanel();
         JFrame frame = new JFrame();
@@ -561,6 +718,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetDesktopPaneForComponent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPanel panel = new JPanel();
         JDesktopPane frame = new JDesktopPane();
         assertNull("frame", JOptionPane.getDesktopPaneForComponent(null));
@@ -570,6 +731,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testSetRootFrame() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame frame1 = new Frame();
         Frame frame2 = new JFrame();
         JOptionPane.setRootFrame(frame1);
@@ -582,6 +747,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetRootFrame() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame frame1 = JOptionPane.getRootFrame();
         frame1.add(new JPanel());
         frame1.add(new JPanel());
@@ -595,13 +764,25 @@ public class JOptionPaneTest extends Swi
      * is beinng tested in BasicOptionPaneUITest
      */
     public void testSetUIOptionPaneUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 
     public void testGetUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue("ui is returned ", pane.getUI() != null);
     }
 
     public void testSetMessage() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PropertyChangeController listener1 = new PropertyChangeController();
         String message1 = "message1";
         String message2 = "message2";
@@ -620,10 +801,18 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetMessage() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("message", "JOptionPane message", pane.getMessage());
     }
 
     public void testSetIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon1 = new ImageIcon(new BufferedImage(20, 20, BufferedImage.TYPE_BYTE_GRAY));
         Icon icon2 = new ImageIcon(new BufferedImage(20, 20, BufferedImage.TYPE_BYTE_GRAY));
         PropertyChangeController listener1 = new PropertyChangeController();
@@ -646,10 +835,18 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull("icon", pane.getIcon());
     }
 
     public void testSetValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JButton button1 = new JButton("1");
         JButton button2 = new JButton("2");
         PropertyChangeController listener1 = new PropertyChangeController();
@@ -664,10 +861,18 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("value", JOptionPane.UNINITIALIZED_VALUE, pane.getValue());
     }
 
     public void testSetOptions() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Object options2[] = new Object[] { new JButton("1"), new ImageIcon(), "asdasd" };
         Object options22[] = options2.clone();
         Object options3[] = new Object[] { "asd", new InputMap(), new JPanel() };
@@ -693,12 +898,20 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetOptions() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue("options", pane.getOptions() == null || pane.getOptions().length == 0);
 
         assertNull(new JOptionPane().getOptions());
     }
 
     public void testSetInitialValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JButton button1 = new JButton("1");
         JButton button2 = new JButton("2");
         pane.setWantsInput(false);
@@ -715,10 +928,18 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetInitialValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull("InitialValue", pane.getInitialValue());
     }
 
     public void testSetMessageType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PropertyChangeController listener1 = new PropertyChangeController();
         pane.addPropertyChangeListener(listener1);
         pane.setMessageType(JOptionPane.ERROR_MESSAGE);
@@ -745,10 +966,18 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetMessageType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("message type", JOptionPane.PLAIN_MESSAGE, pane.getMessageType());
     }
 
     public void testSetOptionType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PropertyChangeController listener1 = new PropertyChangeController();
         pane.addPropertyChangeListener(listener1);
         pane.setOptionType(JOptionPane.CANCEL_OPTION);
@@ -774,10 +1003,18 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetOptionType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("option type", JOptionPane.CLOSED_OPTION, pane.getOptionType());
     }
 
     public void testSetSelectionValues() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Object buttons2[] = new Object[] { new JButton("1"), new JButton("2") };
         Object buttons3[] = new Object[] { new JButton("1"), new JButton("2") };
         PropertyChangeController listener1 = new PropertyChangeController();
@@ -810,6 +1047,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetSelectionValues() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Object buttons2[] = new Object[] { new JButton("1"), new JButton("2") };
         Object buttons3[] = new Object[] { new JButton("1"), new JButton("2") };
         assertNull("SelectionValues", pane.getSelectionValues());
@@ -822,6 +1063,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testSetInitialSelectionValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Object str1 = "String1";
         Object str2 = "String2";
         pane.setWantsInput(false);
@@ -836,6 +1081,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetInitialSelectionValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JButton button1 = new JButton("1");
         JButton button2 = new JButton("2");
         assertNull("InitialSelectionValue", pane.getInitialSelectionValue());
@@ -848,6 +1097,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testSetInputValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PropertyChangeController listener1 = new PropertyChangeController();
         JButton button1 = new JButton("1");
         JButton button2 = new JButton("2");
@@ -866,18 +1119,34 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetInputValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("input value", JOptionPane.UNINITIALIZED_VALUE, pane.getInputValue());
     }
 
     public void testGetMaxCharactersPerLineCount() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("num characters", Integer.MAX_VALUE, pane.getMaxCharactersPerLineCount());
     }
 
     public void testSelectInitialValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         //TODO Implement selectInitialValue().
     }
 
     public void testSetWantsInput() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PropertyChangeController listener1 = new PropertyChangeController();
         pane.addPropertyChangeListener(listener1);
         pane.setWantsInput(true);
@@ -894,6 +1163,10 @@ public class JOptionPaneTest extends Swi
     }
 
     public void testGetWantsInput() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse("wants input", pane.getWantsInput());
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JRootPaneRTest.java Wed May 26 09:31:07 2010
@@ -20,6 +20,7 @@
 package javax.swing;
 
 import java.beans.PropertyVetoException;
+import tests.support.Support_Excludes;
 
 public class JRootPaneRTest extends SwingTestCase {
     private JFrame frame;
@@ -38,6 +39,10 @@ public class JRootPaneRTest extends Swin
     }
 
     public void testDefaultButton() throws PropertyVetoException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JInternalFrame iframe = new JInternalFrame("", true, true, true, true);
         JDesktopPane desktop = new JDesktopPane();
         desktop.add(iframe);

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

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

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



Mime
View raw message