harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r463638 [1/2] - in /incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api: java.injected/javax/swing/ java/common/javax/swing/
Date Fri, 13 Oct 2006 10:45:01 GMT
Author: hindessm
Date: Fri Oct 13 03:44:58 2006
New Revision: 463638

URL: http://svn.apache.org/viewvc?view=rev&rev=463638
Log:
Converting things like:

  assertTrue(blah == [true|false|null]) to assert[True|False|Null]
  assertEquals(blah, [true,false,null]) to assert[True|False|Null]
  assertEquals([true,false,null], blah) to assert[True|False|Null]

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/JAppletTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractActionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractButtonTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJButtonTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJComponentTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ActionMapTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/BorderFactoryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/Box_FillerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ButtonGroupTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultButtonModelTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultDesktopManagerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultFocusManagerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ImageIconTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InputMapTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InternalFrameFocusTraversalPolicyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/KeyStrokeTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/SwingUtilitiesTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/Timer_MultithreadedTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/UIDefaultsTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/JAppletTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/JAppletTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/JAppletTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/JAppletTest.java Fri Oct 13 03:44:58 2006
@@ -238,7 +238,7 @@
 
         // test setting rootPane to null
         applet.setRootPane(null);
-        assertTrue(applet.getRootPane() == null);
+        assertNull(applet.getRootPane());
         assertTrue("rootPane is removed from the container", applet.getComponentCount() == 0);
     }
 
@@ -260,14 +260,14 @@
      *     JMenuBar getJMenuBar()
      */
     public void testSetGetJMenuBarJMenuBar() {
-        assertEquals(null, applet.getJMenuBar());
+        assertNull(applet.getJMenuBar());
 
         JMenuBar menuBar = new JMenuBar();
         applet.setJMenuBar(menuBar);
         assertTrue(applet.getJMenuBar() == menuBar);
 
         applet.setJMenuBar(null);
-        assertTrue(applet.getJMenuBar() == null);
+        assertNull(applet.getJMenuBar());
     }
 
     /*
@@ -291,7 +291,7 @@
         } catch (IllegalComponentStateException e) {
             ok = true;
         } finally {
-            assertEquals(true, ok);
+            assertTrue(ok);
         }
         // layeredPane cannot be null, even after setLayeredPane(null)
         assertTrue(applet.getLayeredPane() != null);
@@ -310,9 +310,9 @@
                    c instanceof JApplet.AccessibleJApplet);
         assertTrue("AccessibleRole is ok",
                 c.getAccessibleRole() == AccessibleRole.FRAME);
-        assertTrue("AccessibleName is ok", c.getAccessibleName() == null);
-        assertTrue("AccessibleDescription is ok",
-                c.getAccessibleDescription() == null);
+        assertNull("AccessibleName is ok", c.getAccessibleName());
+        assertNull("AccessibleDescription is ok",
+                c.getAccessibleDescription());
         assertTrue("AccessibleChildrenCount == 1",
                    c.getAccessibleChildrenCount() == 1);
     }
@@ -393,7 +393,7 @@
         } catch (IllegalComponentStateException e) {
             ok = true;
         } finally {
-            assertEquals(true, ok);
+            assertTrue(ok);
         }
         // contentPane cannot be null, even after setContentPane(null)
         assertTrue(applet.getContentPane() != null);
@@ -423,7 +423,7 @@
         } catch (NullPointerException e) {
             ok = true;
         } finally {
-            assertEquals(true, ok);
+            assertTrue(ok);
         }
         // glassPane cannot be null, even after setGlassPane(null)
         assertTrue(applet.getGlassPane() != null);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractActionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractActionTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractActionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractActionTest.java Fri Oct 13 03:44:58 2006
@@ -119,7 +119,7 @@
             }
         };
 
-        assertEquals("icon initialized properly", null, action.getValue(Action.SMALL_ICON));
+        assertNull("icon initialized properly", action.getValue(Action.SMALL_ICON));
         assertEquals("name initialized properly", "ActionName", action.getValue(Action.NAME));
         assertTrue("enabled property init state is true", action.isEnabled());
     }
@@ -133,8 +133,8 @@
             }
         };
 
-        assertEquals("icon initialized properly", null, action.getValue(Action.SMALL_ICON));
-        assertEquals("name initialized properly", null, action.getValue(Action.NAME));
+        assertNull("icon initialized properly", action.getValue(Action.SMALL_ICON));
+        assertNull("name initialized properly", action.getValue(Action.NAME));
         assertTrue("enabled property init state is true", action.isEnabled());
     }
 
@@ -145,8 +145,8 @@
         String value2 = "value2";
         PropertyChangeController changeListener = new PropertyChangeController();
 
-        assertEquals("value is not stored initially", null, action.getValue(name1));
-        assertEquals("value is not stored initially", null, action.getValue(name2));
+        assertNull("value is not stored initially", action.getValue(name1));
+        assertNull("value is not stored initially", action.getValue(name2));
 
         action.addPropertyChangeListener(changeListener);
         action.putValue(name1, value1);
@@ -161,7 +161,7 @@
 
         changeListener.reset();
         action.putValue(name1, null);
-        assertEquals("value is stored properly", null, action.getValue(name1));
+        assertNull("value is stored properly", action.getValue(name1));
         assertEquals("value is stored properly", value2, action.getValue(name2));
         changeListener.checkLastPropertyFired(action, name1, value1, null);
     }
@@ -172,8 +172,8 @@
         String value1 = "value1";
         String value2 = "value2";
 
-        assertEquals("value is not stored initially", null, action.getValue(name1));
-        assertEquals("value is not stored initially", null, action.getValue(name2));
+        assertNull("value is not stored initially", action.getValue(name1));
+        assertNull("value is not stored initially", action.getValue(name2));
 
         action.putValue(name1, value1);
         assertEquals("value is stored properly", value1, action.getValue(name1));
@@ -183,7 +183,7 @@
         assertEquals("value is stored properly", value2, action.getValue(name2));
 
         action.putValue(name1, null);
-        assertEquals("value is stored properly", null, action.getValue(name1));
+        assertNull("value is stored properly", action.getValue(name1));
         assertEquals("value is stored properly", value2, action.getValue(name2));
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractButtonTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractButtonTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractButtonTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AbstractButtonTest.java Fri Oct 13 03:44:58 2006
@@ -223,7 +223,7 @@
         button.setEnabled(true);
         assertFalse("event's not been fired ", listener1.isChanged());
         assertFalse("event's not been fired ", listener2.isChanged());
-        assertTrue("event's not been fired ", listener3.eventHappened == null);
+        assertNull("event's not been fired ", listener3.eventHappened);
         listener1.reset();
         listener2.reset();
     }
@@ -251,11 +251,11 @@
 
         button.setBorderPainted(false);
         button.paintBorder(button.getGraphics());
-        assertEquals("painted", false, border.haveBeenPainted);
+        assertFalse("painted", border.haveBeenPainted);
 
         button.setBorderPainted(true);
         button.paintBorder(button.getGraphics());
-        assertEquals("painted", true, border.haveBeenPainted);
+        assertTrue("painted", border.haveBeenPainted);
     }
 
     public void testImageUpdate() {
@@ -320,7 +320,7 @@
         button.setText(text);
         button.setSelected(false);
 
-        assertTrue("no selected objects", button.getSelectedObjects() == null);
+        assertNull("no selected objects", button.getSelectedObjects());
 
         button.setSelected(true);
         assertTrue("there are selected objects", button.getSelectedObjects() != null && button.getSelectedObjects().length > 0);
@@ -334,13 +334,13 @@
         button.setAction(action1);
 
         assertEquals("action ", action1, button.getAction());
-        assertEquals("enabled ", true, button.isEnabled());
-        assertEquals("enabled ", true, action1.isEnabled());
+        assertTrue("enabled ", button.isEnabled());
+        assertTrue("enabled ", action1.isEnabled());
 
         action1.setEnabled(false);
         assertFalse(button.isEnabled());
-        assertEquals("enabled ", false, button.isEnabled());
-        assertEquals("enabled ", false, action1.isEnabled());
+        assertFalse("enabled ", button.isEnabled());
+        assertFalse("enabled ", action1.isEnabled());
 
         assertEquals("icon ", icon1, button.getIcon());
         action1.putValue(Action.SMALL_ICON, icon2);
@@ -365,7 +365,7 @@
 
         button.setAction(action2);
         action1.putValue(Action.SHORT_DESCRIPTION, text4);
-        assertEquals("ToolTipText ", null, button.getToolTipText());
+        assertNull("ToolTipText ", button.getToolTipText());
         action2.putValue(Action.SHORT_DESCRIPTION, text4);
         assertEquals("ToolTipText ", text4, button.getToolTipText());
     }
@@ -423,7 +423,7 @@
         listener2.reset();
 
         button.setText(null);
-        assertEquals("text ", null, button.getText());
+        assertNull("text ", button.getText());
     }
 
     public void testSetText2() {
@@ -569,12 +569,12 @@
         action1.putValue(Action.MNEMONIC_KEY, new Integer(1));
         button.setAction(action1);
 
-        assertEquals("enabled ", true, button.isEnabled());
-        assertEquals("enabled ", true, action1.isEnabled());
+        assertTrue("enabled ", button.isEnabled());
+        assertTrue("enabled ", action1.isEnabled());
         action1.setEnabled(false);
         button.isEnabled();
-        assertEquals("enabled ", false, button.isEnabled());
-        assertEquals("enabled ", false, action1.isEnabled());
+        assertFalse("enabled ", button.isEnabled());
+        assertFalse("enabled ", action1.isEnabled());
 
         assertEquals("icon ", icon1, button.getIcon());
         action1.putValue(Action.SMALL_ICON, icon2);
@@ -657,7 +657,7 @@
 
         button.setAction(action2);
         action1.putValue(Action.SHORT_DESCRIPTION, text4);
-        assertEquals("ToolTipText ", null, button.getToolTipText());
+        assertNull("ToolTipText ", button.getToolTipText());
         action2.putValue(Action.SHORT_DESCRIPTION, text4);
         assertEquals("ToolTipText ", text4, button.getToolTipText());
     }
@@ -672,7 +672,7 @@
             }
         };
 
-        assertEquals("default action ", null, button.getAction());
+        assertNull("default action ", button.getAction());
 
         button.setAction(action1);
         assertEquals("action ", action1, button.getAction());
@@ -880,7 +880,7 @@
         Icon icon1 = createNewIcon();
         Icon icon2 = createNewIcon();
 
-        assertEquals("default Selected Icon ", null, button.getSelectedIcon());
+        assertNull("default Selected Icon ", button.getSelectedIcon());
 
         button.setSelectedIcon(icon1);
         assertEquals("Selected Icon ", icon1, button.getSelectedIcon());
@@ -893,7 +893,7 @@
         Icon icon1 = createNewIcon();
         Icon icon2 = createNewIcon();
 
-        assertEquals("default Rollover Selected Icon ", null, button.getRolloverSelectedIcon());
+        assertNull("default Rollover Selected Icon ", button.getRolloverSelectedIcon());
 
         button.setRolloverSelectedIcon(icon1);
         assertEquals("Rollover Selected Icon ", icon1, button.getRolloverSelectedIcon());
@@ -906,7 +906,7 @@
         Icon icon1 = createNewIcon();
         Icon icon2 = createNewIcon();
 
-        assertEquals("default Rollover Icon ", null, button.getRolloverIcon());
+        assertNull("default Rollover Icon ", button.getRolloverIcon());
 
         button.setRolloverIcon(icon1);
         assertEquals("Rollover Icon ", icon1, button.getRolloverIcon());
@@ -919,7 +919,7 @@
         Icon icon1 = createNewIcon();
         Icon icon2 = createNewIcon();
 
-        assertEquals("default Pressed Icon ", null, button.getPressedIcon());
+        assertNull("default Pressed Icon ", button.getPressedIcon());
 
         button.setPressedIcon(icon1);
         assertEquals("Pressed Icon ", icon1, button.getPressedIcon());
@@ -932,7 +932,7 @@
         Icon icon1 = createNewIcon();
         Icon icon2 = createNewIcon();
 
-        assertEquals("default Icon ", null, button.getIcon());
+        assertNull("default Icon ", button.getIcon());
 
         button.setIcon(icon1);
         assertEquals("Icon ", icon1, button.getIcon());
@@ -946,7 +946,7 @@
         Icon icon2 = createNewIcon();
         Icon icon3 = createNewIcon();
 
-        assertEquals("default Icon ", null, button.getDisabledSelectedIcon());
+        assertNull("default Icon ", button.getDisabledSelectedIcon());
 
         button.setDisabledSelectedIcon(icon1);
         assertEquals("DisabledSelected Icon ", icon1, button.getDisabledSelectedIcon());
@@ -988,7 +988,7 @@
         Icon icon1 = createNewIcon();
         Icon icon2 = createNewIcon();
 
-        assertEquals("default Icon ", null, button.getDisabledIcon());
+        assertNull("default Icon ", button.getDisabledIcon());
 
         button.setDisabledIcon(icon1);
         assertEquals("Disabled Icon ", icon1, button.getDisabledIcon());
@@ -1840,9 +1840,9 @@
         listener3.eventHappened = null;
 
         button.setSelected(false);
-        assertTrue("event's not been fired ", listener1.eventHappened == null);
-        assertTrue("event's not been fired ", listener2.eventHappened == null);
-        assertTrue("event's not been fired ", listener3.eventHappened == null);
+        assertNull("event's not been fired ", listener1.eventHappened);
+        assertNull("event's not been fired ", listener2.eventHappened);
+        assertNull("event's not been fired ", listener3.eventHappened);
         listener1.eventHappened = null;
         listener2.eventHappened = null;
 
@@ -1864,16 +1864,16 @@
     }
 
     public void testIsSelected() {
-        assertEquals("default Selected", false, button.isSelected());
+        assertFalse("default Selected", button.isSelected());
 
         button.setSelected(true);
-        assertEquals("Selected", true, button.isSelected());
+        assertTrue("Selected", button.isSelected());
 
         button.setSelected(false);
-        assertEquals("Selected", false, button.isSelected());
+        assertFalse("Selected", button.isSelected());
 
         button.setSelected(true);
-        assertEquals("Selected", true, button.isSelected());
+        assertTrue("Selected", button.isSelected());
     }
 
     public void testSetRolloverEnabled() {
@@ -1902,16 +1902,16 @@
     }
 
     public void testIsRolloverEnabled() {
-        assertEquals("default RolloverEnabled", false, button.isRolloverEnabled());
+        assertFalse("default RolloverEnabled", button.isRolloverEnabled());
 
         button.setRolloverEnabled(true);
-        assertEquals("RolloverEnabled", true, button.isRolloverEnabled());
+        assertTrue("RolloverEnabled", button.isRolloverEnabled());
 
         button.setRolloverEnabled(false);
-        assertEquals("RolloverEnabled", false, button.isRolloverEnabled());
+        assertFalse("RolloverEnabled", button.isRolloverEnabled());
 
         button.setRolloverEnabled(true);
-        assertEquals("RolloverEnabled", true, button.isRolloverEnabled());
+        assertTrue("RolloverEnabled", button.isRolloverEnabled());
     }
 
     public void testSetFocusPainted() {
@@ -1942,16 +1942,16 @@
     }
 
     public void testIsFocusPainted() {
-        assertEquals("default FocusPainted", true, button.isFocusPainted());
+        assertTrue("default FocusPainted", button.isFocusPainted());
 
         button.setFocusPainted(false);
-        assertEquals("FocusPainted", false, button.isFocusPainted());
+        assertFalse("FocusPainted", button.isFocusPainted());
 
         button.setFocusPainted(true);
-        assertEquals("FocusPainted", true, button.isFocusPainted());
+        assertTrue("FocusPainted", button.isFocusPainted());
 
         button.setFocusPainted(false);
-        assertEquals("FocusPainted", false, button.isFocusPainted());
+        assertFalse("FocusPainted", button.isFocusPainted());
     }
 
     public void testSetContentAreaFilled() {
@@ -1980,16 +1980,16 @@
     }
 
     public void testIsContentAreaFilled() {
-        assertEquals("default ContentAreaFilled", true, button.isContentAreaFilled());
+        assertTrue("default ContentAreaFilled", button.isContentAreaFilled());
 
         button.setContentAreaFilled(false);
-        assertEquals("ContentAreaFilled", false, button.isContentAreaFilled());
+        assertFalse("ContentAreaFilled", button.isContentAreaFilled());
 
         button.setContentAreaFilled(true);
-        assertEquals("ContentAreaFilled", true, button.isContentAreaFilled());
+        assertTrue("ContentAreaFilled", button.isContentAreaFilled());
 
         button.setContentAreaFilled(false);
-        assertEquals("ContentAreaFilled", false, button.isContentAreaFilled());
+        assertFalse("ContentAreaFilled", button.isContentAreaFilled());
     }
 
     public void testSetBorderPainted() {
@@ -2018,16 +2018,16 @@
     }
 
     public void testIsBorderPainted() {
-        assertEquals("default BorderPainted", true, button.isBorderPainted());
+        assertTrue("default BorderPainted", button.isBorderPainted());
 
         button.setBorderPainted(false);
-        assertEquals("BorderPainted", false, button.isBorderPainted());
+        assertFalse("BorderPainted", button.isBorderPainted());
 
         button.setBorderPainted(true);
-        assertEquals("BorderPainted", true, button.isBorderPainted());
+        assertTrue("BorderPainted", button.isBorderPainted());
 
         button.setBorderPainted(false);
-        assertEquals("BorderPainted", false, button.isBorderPainted());
+        assertFalse("BorderPainted", button.isBorderPainted());
     }
 
     /*
@@ -2152,12 +2152,12 @@
 
         button.setDisplayedMnemonicIndex(5);
         listener1.checkPropertyFired(button, "displayedMnemonicIndex", new Integer(2), new Integer(5));
-        assertTrue("state event's not been fired ", listener2.eventHappened == null);
+        assertNull("state event's not been fired ", listener2.eventHappened);
         listener1.reset();
 
         button.setDisplayedMnemonicIndex(5);
         assertFalse("state event's not been fired ", listener1.isChanged());
-        assertTrue("state event's not been fired ", listener2.eventHappened == null);
+        assertNull("state event's not been fired ", listener2.eventHappened);
 
         boolean thrown = false;
         try {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJButtonTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJButtonTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJButtonTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJButtonTest.java Fri Oct 13 03:44:58 2006
@@ -61,18 +61,18 @@
     }
 
     public void testGetAccessibleKeyBinding() {
-        assertEquals("AccessibleKeyBinding ", null, aContext.getAccessibleKeyBinding());
+        assertNull("AccessibleKeyBinding ", aContext.getAccessibleKeyBinding());
     }
 
     public void testGetAccessibleText() {
-        assertEquals("AccessibleText ", null, aContext.getAccessibleText());
+        assertNull("AccessibleText ", aContext.getAccessibleText());
     }
 
     public void testGetToolTipText() {
         String text1 = "do what you feel";
         String text2 = "what you need to do";
         button.setText(text1);
-        assertEquals("ToolTipText ", null, aContext.getToolTipText());
+        assertNull("ToolTipText ", aContext.getToolTipText());
         button.setToolTipText(text2);
         assertEquals("ToolTipText ", text2, aContext.getToolTipText());
     }
@@ -80,7 +80,7 @@
     public void testGetAccessibleIcon() {
         ImageIcon icon1 = new ImageIcon(new BufferedImage(10, 10, BufferedImage.TYPE_BYTE_GRAY));
         ImageIcon icon2 = new ImageIcon(new BufferedImage(10, 10, BufferedImage.TYPE_BYTE_GRAY));
-        assertEquals("AccessibleIcon", null, aContext.getAccessibleIcon());
+        assertNull("AccessibleIcon", aContext.getAccessibleIcon());
 
         button.setIcon(icon1);
         assertEquals("number of AccessibleIcons", 1, aContext.getAccessibleIcon().length);
@@ -143,9 +143,9 @@
     }
 
     public void testDoAccessibleAction() {
-        assertEquals("AccessibleAction result", true, aContext.doAccessibleAction(0));
-        assertEquals("AccessibleAction result", false, aContext.doAccessibleAction(1));
-        assertEquals("AccessibleAction result", false, aContext.doAccessibleAction(-1));
+        assertTrue("AccessibleAction result", aContext.doAccessibleAction(0));
+        assertFalse("AccessibleAction result", aContext.doAccessibleAction(1));
+        assertFalse("AccessibleAction result", aContext.doAccessibleAction(-1));
     }
 
     public void testGetAccessibleName() {
@@ -167,7 +167,7 @@
 
     public void testGetAccessibleActionDescription() {
         assertEquals("AccessibleActionDescription", "click", aContext.getAccessibleActionDescription(0));
-        assertEquals("AccessibleActionDescription", null, aContext.getAccessibleActionDescription(1));
+        assertNull("AccessibleActionDescription", aContext.getAccessibleActionDescription(1));
     }
 
     public void testGetCurrentAccessibleValue() {
@@ -195,23 +195,23 @@
         PropertyChangeController listener = new PropertyChangeController();
         aContext.addPropertyChangeListener(listener);
 
-        assertEquals("returned value", true, aContext.setCurrentAccessibleValue(new Integer(100)));
+        assertTrue("returned value", aContext.setCurrentAccessibleValue(new Integer(100)));
         assertEquals("CurrentAccessibleValue", new Integer(1), aContext.getCurrentAccessibleValue());
-        assertEquals("button selected state", true, button.isSelected());
+        assertTrue("button selected state", button.isSelected());
 
         listener.checkPropertyFired(aContext, "AccessibleState", null, AccessibleState.SELECTED);
         listener.checkPropertyFired(aContext, "AccessibleValue", new Integer(0), new Integer(1));
         listener.reset();
 
-        assertEquals("returned value", true, aContext.setCurrentAccessibleValue(new Integer(0)));
+        assertTrue("returned value", aContext.setCurrentAccessibleValue(new Integer(0)));
         assertEquals("CurrentAccessibleValue", new Integer(0), aContext.getCurrentAccessibleValue());
-        assertEquals("button selected state", false, button.isSelected());
+        assertFalse("button selected state", button.isSelected());
 
         listener.checkPropertyFired(aContext, "AccessibleState", AccessibleState.SELECTED, null);
         listener.checkPropertyFired(aContext, "AccessibleValue", new Integer(1), new Integer(0));
         listener.reset();
 
-        assertEquals("returned value", true, aContext.setCurrentAccessibleValue(new Integer(0)));
+        assertTrue("returned value", aContext.setCurrentAccessibleValue(new Integer(0)));
         assertFalse("no event's fired ", listener.isChanged());
     }
 
@@ -250,47 +250,47 @@
     }
 
     public void testGetCharacterBounds() {
-        assertEquals("CharacterBounds", null, aContext.getCharacterBounds(0));
+        assertNull("CharacterBounds", aContext.getCharacterBounds(0));
         button.setText("text");
-        assertEquals("CharacterBounds", null, aContext.getCharacterBounds(1));
+        assertNull("CharacterBounds", aContext.getCharacterBounds(1));
     }
 
     public void testGetSelectedText() {
-        assertEquals("SelectedText", null, aContext.getSelectedText());
+        assertNull("SelectedText", aContext.getSelectedText());
         button.setText("text");
-        assertEquals("SelectedText", null, aContext.getSelectedText());
+        assertNull("SelectedText", aContext.getSelectedText());
         button.setSelected(true);
-        assertEquals("SelectedText", null, aContext.getSelectedText());
+        assertNull("SelectedText", aContext.getSelectedText());
     }
 
     public void testGetAfterIndex() {
-        assertEquals("AfterIndex", null, aContext.getAfterIndex(AccessibleText.CHARACTER, 0));
-        assertEquals("AfterIndex", null, aContext.getAfterIndex(AccessibleText.WORD, 0));
-        assertEquals("AfterIndex", null, aContext.getAfterIndex(AccessibleText.SENTENCE, 0));
+        assertNull("AfterIndex", aContext.getAfterIndex(AccessibleText.CHARACTER, 0));
+        assertNull("AfterIndex", aContext.getAfterIndex(AccessibleText.WORD, 0));
+        assertNull("AfterIndex", aContext.getAfterIndex(AccessibleText.SENTENCE, 0));
         button.setText("Just give me the light. and start the show");
-        assertEquals("AfterIndex", null, aContext.getAfterIndex(AccessibleText.CHARACTER, 6));
+        assertNull("AfterIndex", aContext.getAfterIndex(AccessibleText.CHARACTER, 6));
     }
 
     public void testGetAtIndex() {
-        assertEquals("AtIndex", null, aContext.getAtIndex(AccessibleText.CHARACTER, 0));
-        assertEquals("AtIndex", null, aContext.getAtIndex(AccessibleText.WORD, 0));
-        assertEquals("AtIndex", null, aContext.getAtIndex(AccessibleText.SENTENCE, 0));
+        assertNull("AtIndex", aContext.getAtIndex(AccessibleText.CHARACTER, 0));
+        assertNull("AtIndex", aContext.getAtIndex(AccessibleText.WORD, 0));
+        assertNull("AtIndex", aContext.getAtIndex(AccessibleText.SENTENCE, 0));
         button.setText("Just give me the light. and start the show");
-        assertEquals("AtIndex", null, aContext.getAtIndex(AccessibleText.CHARACTER, 6));
+        assertNull("AtIndex", aContext.getAtIndex(AccessibleText.CHARACTER, 6));
     }
 
     public void testGetBeforeIndex() {
-        assertEquals("BeforeIndex", null, aContext.getBeforeIndex(AccessibleText.CHARACTER, 0));
-        assertEquals("BeforeIndex", null, aContext.getBeforeIndex(AccessibleText.WORD, 0));
-        assertEquals("BeforeIndex", null, aContext.getBeforeIndex(AccessibleText.SENTENCE, 0));
+        assertNull("BeforeIndex", aContext.getBeforeIndex(AccessibleText.CHARACTER, 0));
+        assertNull("BeforeIndex", aContext.getBeforeIndex(AccessibleText.WORD, 0));
+        assertNull("BeforeIndex", aContext.getBeforeIndex(AccessibleText.SENTENCE, 0));
         button.setText("Just give me the light. and start the show");
-        assertEquals("BeforeIndex", null, aContext.getBeforeIndex(AccessibleText.CHARACTER, 6));
+        assertNull("BeforeIndex", aContext.getBeforeIndex(AccessibleText.CHARACTER, 6));
     }
 
     public void testGetCharacterAttribute() {
-        assertEquals("CharacterAttribute", null, aContext.getCharacterAttribute(0));
+        assertNull("CharacterAttribute", aContext.getCharacterAttribute(0));
         button.setText("text");
-        assertEquals("CharacterAttribute", null, aContext.getCharacterAttribute(1));
+        assertNull("CharacterAttribute", aContext.getCharacterAttribute(1));
     }
 
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJComponentTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJComponentTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/AccessibleJComponentTest.java Fri Oct 13 03:44:58 2006
@@ -88,7 +88,7 @@
         JPanel panel2 = new JPanel();
         JPanel panel3 = new JPanel();
 
-        assertTrue(aContext.getAccessibleChild(0) == null);
+        assertNull(aContext.getAccessibleChild(0));
 
         panel.add(panel1);
         panel.add(panel2);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ActionMapTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ActionMapTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ActionMapTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ActionMapTest.java Fri Oct 13 03:44:58 2006
@@ -125,8 +125,8 @@
         Action action2 = new ActionProxy();
         Action action3 = new ActionProxy();
 
-        assertTrue(map.get("1") == null);
-        assertTrue(map.get("2") == null);
+        assertNull(map.get("1"));
+        assertNull(map.get("2"));
 
         map.put("1", action1);
         map.put("2", action1);
@@ -137,7 +137,7 @@
         assertTrue(map.get("1") == action2);
 
         map.put("1", null);
-        assertTrue(map.get("1") == null);
+        assertNull(map.get("1"));
 
         map.clear();
         ActionMap childMap = new ActionMap();
@@ -160,7 +160,7 @@
         ActionMap parent2 = new ActionMap();
         ActionMap parent3 = null;
 
-        assertTrue(map.getParent() == null);
+        assertNull(map.getParent());
 
         map.setParent(parent1);
         assertTrue(map.getParent() == parent1);
@@ -182,11 +182,11 @@
         assertTrue(map.get("2") == action2);
 
         map.remove("2");
-        assertTrue(map.get("2") == null);
+        assertNull(map.get("2"));
         assertTrue(map.get("1") == action1);
 
         map.remove("1");
-        assertTrue(map.get("1") == null);
+        assertNull(map.get("1"));
         assertTrue(map.size() == 0);
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/BorderFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/BorderFactoryTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/BorderFactoryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/BorderFactoryTest.java Fri Oct 13 03:44:58 2006
@@ -419,7 +419,7 @@
 
         LineBorder border =  (LineBorder)BorderFactory.createLineBorder(color, thickness);
         assertEquals("Thickness coinsides", thickness, border.getThickness());
-        assertEquals("RoundedCorners coinsides", false, border.getRoundedCorners());
+        assertFalse("RoundedCorners coinsides", border.getRoundedCorners());
         assertEquals("Colors coinsides", color, border.getLineColor());
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/Box_FillerTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/Box_FillerTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/Box_FillerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/Box_FillerTest.java Fri Oct 13 03:44:58 2006
@@ -55,9 +55,9 @@
 
         filler = new Box.Filler(null, null, null);
 
-        assertEquals("Minimum size initialized correctly ", null, filler.getMinimumSize());
-        assertEquals("Preferred size initialized correctly ", null, filler.getPreferredSize());
-        assertEquals("Maximum size initialized correctly ", null, filler.getMaximumSize());
+        assertNull("Minimum size initialized correctly ", filler.getMinimumSize());
+        assertNull("Preferred size initialized correctly ", filler.getPreferredSize());
+        assertNull("Maximum size initialized correctly ", filler.getMaximumSize());
 
         assertFalse("Opaqueness initialized correctly", filler.isOpaque());
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ButtonGroupTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ButtonGroupTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ButtonGroupTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ButtonGroupTest.java Fri Oct 13 03:44:58 2006
@@ -55,7 +55,7 @@
 
     public void testButtonGroup() {
         assertEquals("initial number of buttons", 0, group.getButtonCount());
-        assertEquals("initial selection", null, group.getSelection());
+        assertNull("initial selection", group.getSelection());
         assertTrue("initial enumeration isn't null", group.getElements() != null);
         assertFalse("initial enumeration is empty", group.getElements().hasMoreElements());
     }
@@ -68,27 +68,27 @@
         assertSame(group, model.getGroup());
         assertEquals("number of buttons", 1, group.getButtonCount());
         assertEquals("selection", buttons[0].getModel(), group.getSelection());
-        assertEquals("selected model", true, buttons[0].getModel().isSelected());
+        assertTrue("selected model", buttons[0].getModel().isSelected());
 
         group.add(buttons[0]);
         assertEquals("number of buttons", 2, group.getButtonCount());
         assertEquals("selection", buttons[0].getModel(), group.getSelection());
-        assertEquals("selected model", true, buttons[0].getModel().isSelected());
+        assertTrue("selected model", buttons[0].getModel().isSelected());
 
         buttons[3].setSelected(true);
         group.add(buttons[3]);
         assertEquals("number of buttons", 3, group.getButtonCount());
         assertEquals("selection", buttons[0].getModel(), group.getSelection());
-        assertEquals("selected model", true, buttons[0].getModel().isSelected());
-        assertEquals("unselected model", false, buttons[3].getModel().isSelected());
+        assertTrue("selected model", buttons[0].getModel().isSelected());
+        assertFalse("unselected model", buttons[3].getModel().isSelected());
 
         buttons[4].setSelected(true);
         group.add(buttons[4]);
         assertEquals("number of buttons", 4, group.getButtonCount());
         assertEquals("selection", buttons[0].getModel(), group.getSelection());
-        assertEquals("selected model", true, buttons[0].getModel().isSelected());
-        assertEquals("unselected model", false, buttons[4].getModel().isSelected());
-        assertEquals("unselected model", false, buttons[3].getModel().isSelected());
+        assertTrue("selected model", buttons[0].getModel().isSelected());
+        assertFalse("unselected model", buttons[4].getModel().isSelected());
+        assertFalse("unselected model", buttons[3].getModel().isSelected());
         
         group.add(null);
     }
@@ -108,10 +108,10 @@
 
         group.remove(buttons[0]);
         assertEquals("number of buttons", 3, group.getButtonCount());
-        assertEquals("selection", null, group.getSelection());
+        assertNull("selection", group.getSelection());
 
         buttons[0].setSelected(true);
-        assertEquals("selection", null, group.getSelection());
+        assertNull("selection", group.getSelection());
 
         group.remove(buttons[0]);
         assertEquals("number of buttons", 2, group.getButtonCount());
@@ -121,7 +121,7 @@
         assertEquals("number of buttons", 2, group.getButtonCount());
 
         group.remove(buttons[3]);
-        assertEquals("selection", null, group.getSelection());
+        assertNull("selection", group.getSelection());
         group.remove(buttons[4]);
         assertEquals("number of buttons", 0, group.getButtonCount());
         
@@ -153,10 +153,10 @@
         group.add(buttons[1]);
         group.add(buttons[3]);
         group.add(buttons[4]);
-        assertEquals("initial selection", null, group.getSelection());
+        assertNull("initial selection", group.getSelection());
 
         group.setSelected(buttons[0].getModel(), false);
-        assertEquals("selection", null, group.getSelection());
+        assertNull("selection", group.getSelection());
 
         group.setSelected(buttons[4].getModel(), true);
         assertEquals("selection", buttons[4].getModel(), group.getSelection());
@@ -228,16 +228,16 @@
         group.add(buttons[0]);
         buttons[3].setSelected(true);
         group.add(buttons[3]);
-        assertEquals("selected model", true, group.isSelected(buttons[0].getModel()));
-        assertEquals("unselected model", false, group.isSelected(buttons[3].getModel()));
+        assertTrue("selected model", group.isSelected(buttons[0].getModel()));
+        assertFalse("unselected model", group.isSelected(buttons[3].getModel()));
         assertEquals("selection", buttons[0].getModel(), group.getSelection());
-        assertEquals("selected model", true, buttons[0].getModel().isSelected());
-        assertEquals("unselected model", false, buttons[3].getModel().isSelected());
+        assertTrue("selected model", buttons[0].getModel().isSelected());
+        assertFalse("unselected model", buttons[3].getModel().isSelected());
 
         buttons[1].setSelected(true);
         buttons[2].setSelected(true);
-        assertEquals("selected model", false, group.isSelected(buttons[1].getModel()));
-        assertEquals("selected model", false, group.isSelected(buttons[2].getModel()));
+        assertFalse("selected model", group.isSelected(buttons[1].getModel()));
+        assertFalse("selected model", group.isSelected(buttons[2].getModel()));
 
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultButtonModelTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultButtonModelTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultButtonModelTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultButtonModelTest.java Fri Oct 13 03:44:58 2006
@@ -92,17 +92,17 @@
 
     public void testDefaultButtonModel() {
         assertEquals("default mnemonic ", 0, buttonModel.getMnemonic());
-        assertEquals("default action command ", null, buttonModel.getActionCommand());
+        assertNull("default action command ", buttonModel.getActionCommand());
         assertEquals("default actionListeners array ", 0, buttonModel.getActionListeners().length);
         assertEquals("default changeListeners array ", 0, buttonModel.getChangeListeners().length);
         assertEquals("default itemListeners array ", 0, buttonModel.getItemListeners().length);
-        assertEquals("default group ", null, buttonModel.getGroup());
-        assertEquals("default selected objects array ", null, buttonModel.getSelectedObjects());
-        assertEquals("default armed state ", false, buttonModel.isArmed());
-        assertEquals("default enabled state ", true, buttonModel.isEnabled());
-        assertEquals("default pressed state ", false, buttonModel.isPressed());
-        assertEquals("default rollover state ", false, buttonModel.isRollover());
-        assertEquals("default selected state ", false, buttonModel.isSelected());
+        assertNull("default group ", buttonModel.getGroup());
+        assertNull("default selected objects array ", buttonModel.getSelectedObjects());
+        assertFalse("default armed state ", buttonModel.isArmed());
+        assertTrue("default enabled state ", buttonModel.isEnabled());
+        assertFalse("default pressed state ", buttonModel.isPressed());
+        assertFalse("default rollover state ", buttonModel.isRollover());
+        assertFalse("default selected state ", buttonModel.isSelected());
     }
 
     public void testGetListeners() {
@@ -238,7 +238,7 @@
         ButtonGroup group1 = new ButtonGroup();
         ButtonGroup group2 = new ButtonGroup();
         ButtonGroup group3 = new ButtonGroup();
-        assertEquals("default group ", null, buttonModel.getGroup());
+        assertNull("default group ", buttonModel.getGroup());
 
         buttonModel.setGroup(group1);
         assertEquals("group ", group1, buttonModel.getGroup());
@@ -251,7 +251,7 @@
     }
 
     public void testGetGroup() {
-        assertEquals("default group ", null, buttonModel.getGroup());
+        assertNull("default group ", buttonModel.getGroup());
     }
 
     public void testSetActionCommand() {
@@ -259,7 +259,7 @@
         String command2 = "command2";
         String command3 = "command3";
 
-        assertEquals("default action command ", null, buttonModel.getActionCommand());
+        assertNull("default action command ", buttonModel.getActionCommand());
 
         buttonModel.setActionCommand(command1);
         assertEquals("action command ", command1, buttonModel.getActionCommand());
@@ -272,11 +272,11 @@
     }
 
     public void testGetActionCommand() {
-        assertEquals("default action command ", null, buttonModel.getActionCommand());
+        assertNull("default action command ", buttonModel.getActionCommand());
     }
 
     public void testGetSelectedObjects() {
-        assertEquals("selected objects ", null, buttonModel.getSelectedObjects());
+        assertNull("selected objects ", buttonModel.getSelectedObjects());
     }
 
     public void testRemoveItemListener() {
@@ -372,8 +372,8 @@
         assertEquals("event fired ", event2, listener2.eventHappened);
 
         buttonModel.fireItemStateChanged(null);
-        assertEquals("event fired ", null, listener1.eventHappened);
-        assertEquals("event fired ", null, listener2.eventHappened);
+        assertNull("event fired ", listener1.eventHappened);
+        assertNull("event fired ", listener2.eventHappened);
     }
 
     public void testFireActionPerformed1() {
@@ -395,8 +395,8 @@
         assertEquals("event fired ", event2, listener2.eventHappened);
 
         buttonModel.fireActionPerformed(null);
-        assertEquals("event fired ", null, listener1.eventHappened);
-        assertEquals("event fired ", null, listener2.eventHappened);
+        assertNull("event fired ", listener1.eventHappened);
+        assertNull("event fired ", listener2.eventHappened);
     }
 
     public void testFireActionPerformed2() {
@@ -407,8 +407,8 @@
         buttonModel.addActionListener(listener2);
         buttonModel.setPressed(true);
         buttonModel.setArmed(true);
-        assertTrue("actionListeners aren't triggered", listener1.eventHappened == null);
-        assertTrue("actionListeners aren't triggered", listener1.eventHappened == null);
+        assertNull("actionListeners aren't triggered", listener1.eventHappened);
+        assertNull("actionListeners aren't triggered", listener1.eventHappened);
         buttonModel.setPressed(false);
         assertTrue("actionListeners are triggered", listener1.eventHappened != null);
         assertTrue("actionListeners are triggered", listener2.eventHappened != null);
@@ -581,10 +581,10 @@
         listener4.eventHappened = null;
         buttonModel.setSelected(value2);
         assertEquals("Selected  ", value2, buttonModel.isSelected());
-        assertEquals("event wasn't fired ", null, listener1.eventHappened);
-        assertEquals("event wasn't fired ", null, listener2.eventHappened);
-        assertEquals("event wasn't fired ", null, listener3.eventHappened);
-        assertEquals("event wasn't fired ", null, listener4.eventHappened);
+        assertNull("event wasn't fired ", listener1.eventHappened);
+        assertNull("event wasn't fired ", listener2.eventHappened);
+        assertNull("event wasn't fired ", listener3.eventHappened);
+        assertNull("event wasn't fired ", listener4.eventHappened);
 
         buttonModel.setEnabled(true);
         buttonModel.setSelected(false);
@@ -619,8 +619,8 @@
         listener2.eventHappened = null;
         buttonModel.setRollover(value2);
         assertEquals("Rollover ", value2, buttonModel.isRollover());
-        assertEquals("event wasn't fired ", null, listener1.eventHappened);
-        assertEquals("event wasn't fired ", null, listener2.eventHappened);
+        assertNull("event wasn't fired ", listener1.eventHappened);
+        assertNull("event wasn't fired ", listener2.eventHappened);
 
         buttonModel.setEnabled(true);
         buttonModel.setRollover(false);
@@ -657,8 +657,8 @@
         listener2.eventHappened = null;
         buttonModel.setPressed(value2);
         assertEquals("Pressed ", value2, buttonModel.isPressed());
-        assertEquals("event wasn't fired ", null, listener1.eventHappened);
-        assertEquals("event wasn't fired ", null, listener2.eventHappened);
+        assertNull("event wasn't fired ", listener1.eventHappened);
+        assertNull("event wasn't fired ", listener2.eventHappened);
         buttonModel.setArmed(true);
         buttonModel.setPressed(true);
         listener3.eventHappened = null;
@@ -698,8 +698,8 @@
         listener2.eventHappened = null;
         buttonModel.setEnabled(value2);
         assertEquals("Enabled ", value2, buttonModel.isEnabled());
-        assertEquals("event wasn't fired ", null, listener1.eventHappened);
-        assertEquals("event wasn't fired ", null, listener2.eventHappened);
+        assertNull("event wasn't fired ", listener1.eventHappened);
+        assertNull("event wasn't fired ", listener2.eventHappened);
 
 
         buttonModel.setEnabled(true);
@@ -749,8 +749,8 @@
         listener2.eventHappened = null;
         buttonModel.setArmed(value2);
         assertEquals("Armed ", value2, buttonModel.isArmed());
-        assertEquals("event wasn't fired ", null, listener1.eventHappened);
-        assertEquals("event wasn't fired ", null, listener2.eventHappened);
+        assertNull("event wasn't fired ", listener1.eventHappened);
+        assertNull("event wasn't fired ", listener2.eventHappened);
 
         buttonModel.setEnabled(true);
         buttonModel.setArmed(false);
@@ -797,23 +797,23 @@
     }
 
     public void testIsSelected() {
-        assertEquals("default selected state ", false, buttonModel.isSelected());
+        assertFalse("default selected state ", buttonModel.isSelected());
     }
 
     public void testIsRollover() {
-        assertEquals("default rollover state ", false, buttonModel.isRollover());
+        assertFalse("default rollover state ", buttonModel.isRollover());
     }
 
     public void testIsPressed() {
-        assertEquals("default pressed state ", false, buttonModel.isPressed());
+        assertFalse("default pressed state ", buttonModel.isPressed());
     }
 
     public void testIsEnabled() {
-        assertEquals("default enabled state ", true, buttonModel.isEnabled());
+        assertTrue("default enabled state ", buttonModel.isEnabled());
     }
 
     public void testIsArmed() {
-        assertEquals("default armed state ", false, buttonModel.isArmed());
+        assertFalse("default armed state ", buttonModel.isArmed());
     }
 
     public void testGetMnemonic() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultDesktopManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultDesktopManagerTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultDesktopManagerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultDesktopManagerTest.java Fri Oct 13 03:44:58 2006
@@ -320,7 +320,7 @@
 
         // test ordinary deactivate
         manager.deactivateFrame(frame);
-        assertTrue("deactivated", desktop.getSelectedFrame() == null);
+        assertNull("deactivated", desktop.getSelectedFrame());
 
         // test deactivate of the internal frame without desktop pane
         manager.deactivateFrame(new JInternalFrame());

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultFocusManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultFocusManagerTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultFocusManagerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/DefaultFocusManagerTest.java Fri Oct 13 03:44:58 2006
@@ -76,7 +76,7 @@
 
     //TODO: Is not clear how this method should work
     public void testCompareTabOrder() throws Exception {
-        assertEquals(false, focusManager.compareTabOrder((Component)components.get(1), (Component)components.get(2)));
+        assertFalse(focusManager.compareTabOrder((Component)components.get(1), (Component)components.get(2)));
     }
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ImageIconTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ImageIconTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ImageIconTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/ImageIconTest.java Fri Oct 13 03:44:58 2006
@@ -260,7 +260,7 @@
         assertEquals("image", image1, icon.getImage());
 
         icon = new ImageIcon(image2);
-        assertEquals("description", null, icon.getDescription());
+        assertNull("description", icon.getDescription());
         assertEquals("loaded", MediaTracker.COMPLETE, icon.getImageLoadStatus());
         assertEquals("image", image2, icon.getImage());
     }
@@ -274,7 +274,7 @@
         assertNull("image", icon.getImage());
         assertEquals("height", -1, icon.getIconHeight());
         assertEquals("width", -1, icon.getIconWidth());
-        assertEquals("description", null, icon.getDescription());
+        assertNull("description", icon.getDescription());
         assertEquals("loaded", 0, icon.getImageLoadStatus());
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InputMapTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InputMapTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InputMapTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InputMapTest.java Fri Oct 13 03:44:58 2006
@@ -79,8 +79,8 @@
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
 
-        assertTrue(map.get(keyStroke1) == null);
-        assertTrue(map.get(keyStroke2) == null);
+        assertNull(map.get(keyStroke1));
+        assertNull(map.get(keyStroke2));
 
         map.put(keyStroke1, "1");
         map.put(keyStroke2, "1");
@@ -91,7 +91,7 @@
         assertTrue(map.get(keyStroke2).equals("2"));
 
         map.put(keyStroke2, null);
-        assertTrue(map.get(keyStroke2) == null);
+        assertNull(map.get(keyStroke2));
 
 
         InputMap childMap = new InputMap();
@@ -120,11 +120,11 @@
         assertTrue(map.get(keyStroke2).equals("2"));
 
         map.remove(keyStroke1);
-        assertTrue(map.get(keyStroke1) == null);
+        assertNull(map.get(keyStroke1));
         assertTrue(map.get(keyStroke2).equals("2"));
 
         map.remove(keyStroke2);
-        assertTrue(map.get(keyStroke2) == null);
+        assertNull(map.get(keyStroke2));
         assertTrue(map.size() == 0);
     }
 
@@ -205,7 +205,7 @@
         InputMap parent2 = new InputMap();
         InputMap parent3 = null;
 
-        assertTrue(map.getParent() == null);
+        assertNull(map.getParent());
 
         map.setParent(parent1);
         assertTrue(map.getParent() == parent1);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InternalFrameFocusTraversalPolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InternalFrameFocusTraversalPolicyTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InternalFrameFocusTraversalPolicyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/InternalFrameFocusTraversalPolicyTest.java Fri Oct 13 03:44:58 2006
@@ -101,7 +101,7 @@
      */
     public void testGetInitialComponent() {
         // no components in the frame, shold return null
-        assertTrue("null", policy.getInitialComponent(frame) == null);
+        assertNull("null", policy.getInitialComponent(frame));
 
         // test with 'null' parameter
         boolean ok = false;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/KeyStrokeTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/KeyStrokeTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/KeyStrokeTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/KeyStrokeTest.java Fri Oct 13 03:44:58 2006
@@ -39,39 +39,39 @@
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_INSERT, keyStroke.getKeyCode());
         assertEquals("modifiers are correct", 0, keyStroke.getModifiers());
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke("control DELETE");
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_DELETE, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (keyStroke.getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke("alt shift X");
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_X, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (keyStroke.getModifiers() & InputEvent.ALT_DOWN_MASK) != 0);
         assertTrue("modifiers are correct", (keyStroke.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke("altGraph X");
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_X, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (keyStroke.getModifiers() & InputEvent.ALT_GRAPH_DOWN_MASK) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke("alt shift released X");
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_X, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (keyStroke.getModifiers() & InputEvent.ALT_DOWN_MASK) != 0);
         assertTrue("modifiers are correct", (keyStroke.getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0);
-        assertEquals("onKeyRelease is correct", true, keyStroke.isOnKeyRelease());
+        assertTrue("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke("typed a");
         assertEquals("keyChar's correct", 'a', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertEquals("modifiers are correct", 0, keyStroke.getModifiers());
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke("typed a");
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke("typed a");
@@ -86,19 +86,19 @@
         assertEquals("keyChar's correct", 'A', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.ALT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke(new Character('t'), InputEvent.CTRL_DOWN_MASK);
         assertEquals("keyChar's correct", 't', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.CTRL_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke(new Character('_'), InputEvent.SHIFT_DOWN_MASK);
         assertEquals("keyChar's correct", '_', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.SHIFT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(new Character('_'), InputEvent.SHIFT_DOWN_MASK);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(new Character('_'), InputEvent.SHIFT_DOWN_MASK);
@@ -113,21 +113,21 @@
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_B, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.SHIFT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         event = new KeyEvent(source, KeyEvent.KEY_RELEASED, 0, InputEvent.SHIFT_DOWN_MASK, KeyEvent.VK_C, 'C');
         keyStroke = KeyStroke.getKeyStrokeForEvent(event);
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_C, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.SHIFT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", true, keyStroke.isOnKeyRelease());
+        assertTrue("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         event = new KeyEvent(source, KeyEvent.KEY_TYPED, 0, InputEvent.SHIFT_DOWN_MASK, KeyEvent.VK_UNDEFINED, 'T');
         keyStroke = KeyStroke.getKeyStrokeForEvent(event);
         assertEquals("keyChar's correct", 'T', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_UNDEFINED, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.SHIFT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         KeyStroke keyStroke1 = KeyStroke.getKeyStrokeForEvent(event);
         KeyStroke keyStroke2 = KeyStroke.getKeyStrokeForEvent(event);
@@ -142,19 +142,19 @@
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_0, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.ALT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", true, keyStroke.isOnKeyRelease());
+        assertTrue("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_DOWN_MASK, false);
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_A, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.CTRL_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, InputEvent.SHIFT_DOWN_MASK, true);
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_SHIFT, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.SHIFT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", true, keyStroke.isOnKeyRelease());
+        assertTrue("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, InputEvent.SHIFT_DOWN_MASK, true);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, InputEvent.SHIFT_DOWN_MASK, true);
@@ -169,19 +169,19 @@
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_0, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.ALT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_DOWN_MASK);
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_A, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.CTRL_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, InputEvent.SHIFT_DOWN_MASK);
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", KeyEvent.VK_SHIFT, keyStroke.getKeyCode());
         assertTrue("modifiers are correct", (InputEvent.SHIFT_DOWN_MASK & keyStroke.getModifiers()) != 0);
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, InputEvent.SHIFT_DOWN_MASK);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_SHIFT, InputEvent.SHIFT_DOWN_MASK);
@@ -199,19 +199,19 @@
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertEquals("modifiers are correct", 0, keyStroke.getModifiers());
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke('a', true);
         assertEquals("keyChar's correct", 'a', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertEquals("modifiers are correct", 0, keyStroke.getModifiers());
-        assertEquals("onKeyRelease is correct", true, keyStroke.isOnKeyRelease());
+        assertTrue("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke('T', true);
         assertEquals("keyChar's correct", 'T', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertEquals("modifiers are correct", 0, keyStroke.getModifiers());
-        assertEquals("onKeyRelease is correct", true, keyStroke.isOnKeyRelease());
+        assertTrue("onKeyRelease is correct", keyStroke.isOnKeyRelease());
     }
 
     /*
@@ -222,19 +222,19 @@
         assertEquals("keyChar's correct", KeyEvent.CHAR_UNDEFINED, keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertEquals("modifiers are correct", 0, keyStroke.getModifiers());
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke('a');
         assertEquals("keyChar's correct", 'a', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertEquals("modifiers are correct", 0, keyStroke.getModifiers());
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         keyStroke = KeyStroke.getKeyStroke('T');
         assertEquals("keyChar's correct", 'T', keyStroke.getKeyChar());
         assertEquals("keyCode's correct", 0, keyStroke.getKeyCode());
         assertEquals("modifiers are correct", 0, keyStroke.getModifiers());
-        assertEquals("onKeyRelease is correct", false, keyStroke.isOnKeyRelease());
+        assertFalse("onKeyRelease is correct", keyStroke.isOnKeyRelease());
 
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke('a');
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke('a');

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java?view=diff&rev=463638&r1=463637&r2=463638
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/LookAndFeelTest.java Fri Oct 13 03:44:58 2006
@@ -220,20 +220,20 @@
         JButton comp2 = new JButton();
 
         LookAndFeel.installProperty(comp1, "opaque", Boolean.TRUE);
-        assertEquals("opaque", true, comp1.isOpaque());
+        assertTrue("opaque", comp1.isOpaque());
         LookAndFeel.installProperty(comp1, "opaque", Boolean.FALSE);
-        assertEquals("opaque", false, comp1.isOpaque());
+        assertFalse("opaque", comp1.isOpaque());
         comp1.setOpaque(true);
         LookAndFeel.installProperty(comp1, "opaque", Boolean.FALSE);
-        assertEquals("opaque", true, comp1.isOpaque());
+        assertTrue("opaque", comp1.isOpaque());
 
         LookAndFeel.installProperty(comp2, "opaque", Boolean.TRUE);
-        assertEquals("opaque", true, comp2.isOpaque());
+        assertTrue("opaque", comp2.isOpaque());
         LookAndFeel.installProperty(comp2, "opaque", Boolean.FALSE);
-        assertEquals("opaque", false, comp2.isOpaque());
+        assertFalse("opaque", comp2.isOpaque());
         comp1.setOpaque(true);
         LookAndFeel.installProperty(comp2, "opaque", Boolean.FALSE);
-        assertEquals("opaque", false, comp2.isOpaque());
+        assertFalse("opaque", comp2.isOpaque());
 
         try {
             LookAndFeel.installProperty(comp1, "iconTextGap", Boolean.TRUE);



Mime
View raw message