harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r463633 - in /incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf: ./ basic/ metal/
Date Fri, 13 Oct 2006 10:34:10 GMT
Author: hindessm
Date: Fri Oct 13 03:34:05 2006
New Revision: 463633

URL: http://svn.apache.org/viewvc?view=rev&rev=463633
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/common/javax/swing/plaf/ComponentUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonListenerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicCheckBoxUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicInternalFrameUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPanelUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicRadioButtonUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTextUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicToolBarUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalCheckBoxUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameTitlePaneTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalRadioButtonUITest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalToggleButtonUITest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/ComponentUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/ComponentUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/ComponentUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/ComponentUITest.java
Fri Oct 13 03:34:05 2006
@@ -66,17 +66,17 @@
 
     public void testGetPreferredSize() {
         JPanel panel = new JPanel();
-        assertTrue(componentUI.getPreferredSize(panel) == null);
+        assertNull(componentUI.getPreferredSize(panel));
     }
 
     public void testGetMinimumSize() {
         JPanel panel = new JPanel();
-        assertTrue(componentUI.getMinimumSize(panel) == null);
+        assertNull(componentUI.getMinimumSize(panel));
     }
 
     public void testGetMaximumSize() {
         JPanel panel = new JPanel();
-        assertTrue(componentUI.getMaximumSize(panel) == null);
+        assertNull(componentUI.getMaximumSize(panel));
     }
 
     // "contains" method is beeing tested by MyComponentTest.testContainsintint()
@@ -87,7 +87,7 @@
         JPanel panel = new JPanel();
 
         Accessible child = componentUI.getAccessibleChild(panel, 0);
-        assertTrue(child == null);
+        assertNull(child);
 
         JPanel panel1 = new JPanel();
         JPanel panel2 = new JPanel();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonListenerTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonListenerTest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonListenerTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonListenerTest.java
Fri Oct 13 03:34:05 2006
@@ -139,11 +139,11 @@
             assertEquals("Armed", Boolean.FALSE, changeListener.states.get(1));
             assertEquals("Pressed", Boolean.FALSE, changeListener.states.get(2));
             assertEquals("Armed", Boolean.FALSE, changeListener.states.get(3));
-            assertEquals("Pressed", false, button.getModel().isPressed());
+            assertFalse("Pressed", button.getModel().isPressed());
         }
 
-        assertEquals("Armed", false, button.getModel().isArmed());
-        assertEquals("Rollover", true, button.getModel().isRollover());
+        assertFalse("Armed", button.getModel().isArmed());
+        assertTrue("Rollover", button.getModel().isRollover());
     }
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicButtonUITest.java
Fri Oct 13 03:34:05 2006
@@ -189,10 +189,10 @@
 
         ui.uninstallUI(button);
         assertTrue("there are no property listeners", button.getPropertyChangeListeners().length
== 0);
-        assertTrue("there ain't no border", null == button.getBorder());
+        assertNull("there ain't no border", button.getBorder());
         assertTrue("there are no change listeners", button.getChangeListeners().length ==
0);
         assertTrue("no RegisteredKeyStrokes installed", button.getRegisteredKeyStrokes().length
== 0);
-        assertEquals("opaque", true, button.isOpaque());
+        assertTrue("opaque", button.isOpaque());
 
         button.setOpaque(false);
         ui.installUI(button);
@@ -210,7 +210,7 @@
     public void testInstallUninstallUI2() {
         JButton button = new JButton();
         BasicButtonUI buttonUI = new BasicButtonUI();
-        assertEquals("opaque", true, button.isOpaque());
+        assertTrue("opaque", button.isOpaque());
         UIManager.put("Button.background", new ColorUIResource(Color.red));
         UIManager.put("Button.foreground", new ColorUIResource(Color.yellow));
         Font font = new FontUIResource(button.getFont().deriveFont(100f));

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicCheckBoxUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicCheckBoxUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicCheckBoxUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicCheckBoxUITest.java
Fri Oct 13 03:34:05 2006
@@ -150,7 +150,7 @@
         assertEquals("background", Color.blue, button.getBackground());
         assertEquals("foreground", Color.cyan, button.getForeground());
         assertEquals("font", font, button.getFont());
-        assertEquals("border", null, button.getBorder());
+        assertNull("border", button.getBorder());
     }
 
     public void testInstallDefaults() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicInternalFrameUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicInternalFrameUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicInternalFrameUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicInternalFrameUITest.java
Fri Oct 13 03:34:05 2006
@@ -116,7 +116,7 @@
         ui.uninstallComponents();
         assertFalse("titlePane uninstalled",
                     belongs(ui.titlePane, frame.getComponents()));
-        assertTrue("northPane == null", ui.getNorthPane() == null);
+        assertNull("northPane == null", ui.getNorthPane());
     }
 
     /*
@@ -149,17 +149,17 @@
         ui.uninstallDefaults();
 
         assertTrue("background", frame.getBackground() != null);
-        assertTrue("border", frame.getBorder() == null);
-        assertTrue("frameIcon", frame.getFrameIcon() == null);
-        assertTrue("layout", frame.getLayout() == null);
-        assertTrue("layout", ui.internalFrameLayout == null);
+        assertNull("border", frame.getBorder());
+        assertNull("frameIcon", frame.getFrameIcon());
+        assertNull("layout", frame.getLayout());
+        assertNull("layout", ui.internalFrameLayout);
 
         // test uninstallDefaults() with user-set values
         frame.setBorder(BorderFactory.createEmptyBorder());
         frame.setLayout(new BorderLayout());
         ui.uninstallDefaults();
         assertTrue("background", frame.getBorder() != null);
-        assertTrue("layout", frame.getLayout() == null);
+        assertNull("layout", frame.getLayout());
     }
 
     /*
@@ -172,15 +172,15 @@
         frame.setUI(ui);
         ui.uninstallKeyboardActions();
         int listenersCount = frame.getInternalFrameListeners().length;
-        assertTrue("no UIActionMap", SwingUtilities.getUIActionMap(frame) == null);
+        assertNull("no UIActionMap", SwingUtilities.getUIActionMap(frame));
 
         ui.installKeyboardActions();
         assertTrue("UIActionMap installed",
                    SwingUtilities.getUIActionMap(frame) != null);
         assertTrue("internalFrameListener istalled",
                 frame.getInternalFrameListeners().length == listenersCount + 1);
-        assertTrue("inputMap not installed", SwingUtilities.getUIInputMap(frame,
-                   JComponent.WHEN_IN_FOCUSED_WINDOW) == null);
+        assertNull("inputMap not installed", SwingUtilities.getUIInputMap(frame,
+                   JComponent.WHEN_IN_FOCUSED_WINDOW));
     }
 
     /*
@@ -199,11 +199,11 @@
                   JComponent.WHEN_IN_FOCUSED_WINDOW) != null);
 
         ui.uninstallKeyboardActions();
-        assertTrue("no UIActionMap", SwingUtilities.getUIActionMap(frame) == null);
+        assertNull("no UIActionMap", SwingUtilities.getUIActionMap(frame));
         assertTrue("internalFrameListener unistalled",
                 frame.getInternalFrameListeners().length == listenersCount - 1);
-        assertTrue("inputMap uninstalled", SwingUtilities.getUIInputMap(frame,
-                   JComponent.WHEN_IN_FOCUSED_WINDOW) == null);
+        assertNull("inputMap uninstalled", SwingUtilities.getUIInputMap(frame,
+                   JComponent.WHEN_IN_FOCUSED_WINDOW));
     }
 
     /*
@@ -301,8 +301,8 @@
     public void testSetupMenuOpenKey() {
         frame.setUI(ui);
 
-        assertTrue("inputMap not installed", SwingUtilities.getUIInputMap(frame,
-                   JComponent.WHEN_IN_FOCUSED_WINDOW) == null);
+        assertNull("inputMap not installed", SwingUtilities.getUIInputMap(frame,
+                   JComponent.WHEN_IN_FOCUSED_WINDOW));
 
         // "InternalFrame.windowBindings" is empty - inputMap is not installed
         final String key = "InternalFrame.windowBindings";
@@ -350,8 +350,8 @@
     public void testCreateWestPane() {
         frame.setUI(ui);
 
-        assertTrue("null", ui.createWestPane(frame) == null);
-        assertTrue("null", ui.createWestPane(null) == null);
+        assertNull("null", ui.createWestPane(frame));
+        assertNull("null", ui.createWestPane(null));
     }
 
     /*
@@ -360,8 +360,8 @@
     public void testCreateSouthPane() {
         frame.setUI(ui);
 
-        assertTrue("null", ui.createSouthPane(frame) == null);
-        assertTrue("null", ui.createSouthPane(null) == null);
+        assertNull("null", ui.createSouthPane(frame));
+        assertNull("null", ui.createSouthPane(null));
     }
 
     /*
@@ -385,8 +385,8 @@
     public void testCreateEastPane() {
         frame.setUI(ui);
 
-        assertTrue("null", ui.createEastPane(frame) == null);
-        assertTrue("null", ui.createEastPane(null) == null);
+        assertNull("null", ui.createEastPane(frame));
+        assertNull("null", ui.createEastPane(null));
     }
 
     /*
@@ -629,7 +629,7 @@
         JButton comp = new JButton("ok");
 
         // null by default
-        assertTrue("null by default", ui.getWestPane() == null);
+        assertNull("null by default", ui.getWestPane());
 
         // general setting
         ui.setWestPane(comp);
@@ -639,7 +639,7 @@
 
         // setting to null
         ui.setWestPane(null);
-        assertTrue("was set", ui.getWestPane() == null);
+        assertNull("was set", ui.getWestPane());
     }
 
     /*
@@ -652,7 +652,7 @@
         JButton comp = new JButton("ok");
 
         // null by default
-        assertTrue("null by default", ui.getSouthPane() == null);
+        assertNull("null by default", ui.getSouthPane());
 
         // general setting
         ui.setSouthPane(comp);
@@ -662,7 +662,7 @@
 
         // setting to null
         ui.setSouthPane(null);
-        assertTrue("was set", ui.getSouthPane() == null);
+        assertNull("was set", ui.getSouthPane());
     }
 
     /*
@@ -685,7 +685,7 @@
 
         // setting to null
         ui.setNorthPane(null);
-        assertTrue("was set", ui.getNorthPane() == null);
+        assertNull("was set", ui.getNorthPane());
     }
 
     /*
@@ -698,7 +698,7 @@
         JButton comp = new JButton("ok");
 
         // null by default
-        assertTrue("null by default", ui.getEastPane() == null);
+        assertNull("null by default", ui.getEastPane());
 
         // general setting
         ui.setEastPane(comp);
@@ -708,7 +708,7 @@
 
         // setting to null
         ui.setEastPane(null);
-        assertTrue("was set", ui.getEastPane() == null);
+        assertNull("was set", ui.getEastPane());
     }
 
     /*
@@ -818,7 +818,7 @@
 
         DesktopManager manager2 = ui.getDesktopManager();
         assertTrue("the same object", manager1 == manager2);
-        assertTrue("no desktop pane", frame.getDesktopPane() == null);
+        assertNull("no desktop pane", frame.getDesktopPane());
 
         // the desktop pane is set
         JDesktopPane desktop = new JDesktopPane();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicOptionPaneUI_ButtonAreaLayoutTest.java
Fri Oct 13 03:34:05 2006
@@ -55,12 +55,12 @@
         layout = new BasicOptionPaneUI.ButtonAreaLayout(syncAll1, padding1);
         assertEquals("syncAll", syncAll1, layout.getSyncAllWidths());
         assertEquals("padding", padding1, layout.getPadding());
-        assertEquals("CentersChildren", true, layout.getCentersChildren());
+        assertTrue("CentersChildren", layout.getCentersChildren());
 
         layout = new BasicOptionPaneUI.ButtonAreaLayout(syncAll2, padding2);
         assertEquals("syncAll", syncAll2, layout.getSyncAllWidths());
         assertEquals("padding", padding2, layout.getPadding());
-        assertEquals("CentersChildren", true, layout.getCentersChildren());
+        assertTrue("CentersChildren", layout.getCentersChildren());
     }
 
     public void testSetGetSyncAllWidths() {
@@ -90,7 +90,7 @@
         boolean centersChildren2 = false;
 
         layout = new BasicOptionPaneUI.ButtonAreaLayout(true, 0);
-        assertEquals("CentersChildren", true, layout.getCentersChildren());
+        assertTrue("CentersChildren", layout.getCentersChildren());
 
         layout.setCentersChildren(centersChildren1);
         assertEquals("CentersChildren", centersChildren1, layout.getCentersChildren());

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPanelUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPanelUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPanelUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicPanelUITest.java
Fri Oct 13 03:34:05 2006
@@ -83,7 +83,7 @@
 
     public void testInstallUI() {
         JPanel panel = new JPanel();
-        assertEquals("opaque", true, panel.isOpaque());
+        assertTrue("opaque", panel.isOpaque());
         UIManager.put("Panel.background", new ColorUIResource(Color.red));
         UIManager.put("Panel.foreground", new ColorUIResource(Color.yellow));
         Border border2 = new BorderUIResource(BorderFactory.createEmptyBorder());
@@ -95,7 +95,7 @@
         assertEquals(Color.red, panel.getBackground());
         assertEquals(Color.yellow, panel.getForeground());
         assertEquals(border2, panel.getBorder());
-        assertEquals("opaque", false, panel.isOpaque());
+        assertFalse("opaque", panel.isOpaque());
 
         Border border1 = BorderFactory.createEmptyBorder();
         panel.setBorder(border1);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicRadioButtonUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicRadioButtonUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicRadioButtonUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicRadioButtonUITest.java
Fri Oct 13 03:34:05 2006
@@ -155,7 +155,7 @@
         assertEquals("background", Color.blue, button.getBackground());
         assertEquals("foreground", Color.cyan, button.getForeground());
         assertEquals("font", font, button.getFont());
-        assertEquals("border", null, button.getBorder());
+        assertNull("border", button.getBorder());
         assertEquals("margin", margin, button.getMargin());
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTabbedPaneUITest.java
Fri Oct 13 03:34:05 2006
@@ -254,11 +254,11 @@
     }
 
     public void testGetMaximumSize() {
-        assertEquals(null, ui.getMaximumSize(tabbed));
+        assertNull(ui.getMaximumSize(tabbed));
     }
 
     public void testGetMinimumSize() {
-        assertEquals(null, ui.getMinimumSize(tabbed));
+        assertNull(ui.getMinimumSize(tabbed));
     }
 
     public void testGetNextTabIndex() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTextUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTextUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTextUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicTextUITest.java
Fri Oct 13 03:34:05 2006
@@ -280,7 +280,7 @@
         assertEquals(jta, rootView.getContainer());
         assertEquals(doc.getLength() + 1, rootView.getEndOffset());
         assertEquals(ui, rootView.getViewFactory());
-        assertEquals(null, rootView.getParent());
+        assertNull(rootView.getParent());
         /*
          * Next Functionality is not required try { rootView.setParent(new
          * PlainView(rootElement)); } catch (Error error) { bWasException =

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicToolBarUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicToolBarUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicToolBarUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/basic/BasicToolBarUITest.java
Fri Oct 13 03:34:05 2006
@@ -269,7 +269,7 @@
 
         toolBar.setFloatable(false);
         ui.dragTo(position1, origin);
-        assertTrue(ui.dragWindow == null);
+        assertNull(ui.dragWindow);
         toolBar.setFloatable(true);
 
         ui.dragTo(position1, origin);
@@ -296,7 +296,7 @@
         toolBar.setFloatable(false);
         ui.dragTo(position1, origin);
         ui.floatAt(position1, origin);
-        assertTrue(ui.floatingWindow == null);
+        assertNull(ui.floatingWindow);
         toolBar.setFloatable(true);
 
         ui.dragTo(position1, origin);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalCheckBoxUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalCheckBoxUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalCheckBoxUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalCheckBoxUITest.java
Fri Oct 13 03:34:05 2006
@@ -121,7 +121,7 @@
         assertEquals("focusColor ", Color.yellow, publicUI.getFocusColor());
         assertEquals("disabledTextColor ", Color.red, publicUI.getDisabledTextColor());
         assertEquals("font", font, button.getFont());
-        assertEquals("border", null, button.getBorder());
+        assertNull("border", button.getBorder());
         assertEquals("icon", icon, publicUI.getDefaultIcon());
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameTitlePaneTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameTitlePaneTest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameTitlePaneTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameTitlePaneTest.java
Fri Oct 13 03:34:05 2006
@@ -176,8 +176,8 @@
         TestMetalInternalFrameTitlePane pane = new TestMetalInternalFrameTitlePane(frame);
         pane.assembleSystemMenu();
 
-        assertTrue("windowMenu == null", pane.getWindowMenu() == null);
-        assertTrue("menuBar == null", pane.getMenuBar() == null);
+        assertNull("windowMenu == null", pane.getWindowMenu());
+        assertNull("menuBar == null", pane.getMenuBar());
     }
 
     /*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalInternalFrameUITest.java
Fri Oct 13 03:34:05 2006
@@ -174,7 +174,7 @@
         ui.uninstallComponents();
         assertFalse("titlePane uninstalled",
                     belongs(ui.getNorthPane(), frame.getComponents()));
-        assertTrue("northPane == null", ui.getNorthPane() == null);
+        assertNull("northPane == null", ui.getNorthPane());
     }
 
     /*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalRadioButtonUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalRadioButtonUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalRadioButtonUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalRadioButtonUITest.java
Fri Oct 13 03:34:05 2006
@@ -119,7 +119,7 @@
         assertEquals("focusColor ", Color.yellow, publicUI.getFocusColor());
         assertEquals("disabledTextColor ", Color.red, publicUI.getDisabledTextColor());
         assertEquals("font", font, button.getFont());
-        assertEquals("border", null, button.getBorder());
+        assertNull("border", button.getBorder());
         assertEquals("icon", icon, publicUI.getDefaultIcon());
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalToggleButtonUITest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalToggleButtonUITest.java?view=diff&rev=463633&r1=463632&r2=463633
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalToggleButtonUITest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/plaf/metal/MetalToggleButtonUITest.java
Fri Oct 13 03:34:05 2006
@@ -162,7 +162,7 @@
         assertEquals("focusColor ", Color.yellow, publicUI.getFocusColor());
         assertEquals("disabledTextColor ", Color.red, publicUI.getDisabledTextColor());
         assertEquals("font", font, button.getFont());
-        assertEquals("border", null, button.getBorder());
+        assertNull("border", button.getBorder());
     }
 
 }



Mime
View raw message