harmony-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?view=rev&rev=463630
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/text/DefaultCaretTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKitTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponentTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_MultithreadedTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/SegmentTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/StyleConstantsTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/TextActionTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultCaretTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultCaretTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultCaretTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultCaretTest.java Fri Oct 13 03:24:03 2006
@@ -246,7 +246,7 @@
 
         dc.deinstall(jta);
 
-        assertEquals(null, dc.getComponent());
+        assertNull(dc.getComponent());
         assertEquals(i, jta.getListeners(MouseListener.class).length + 1);
         assertEquals(j, jta.getListeners(MouseMotionListener.class).length + 1);
         assertEquals(k, jta.getListeners(FocusListener.class).length + 1);
@@ -978,7 +978,7 @@
 
         assertEquals("Dot=(4, Backward) Mark=(4, Backward)", dc1.toString());
         assertTrue(jta.equals(dc.getComponent()));
-        assertEquals(true, dc1.isSelectionVisible());
+        assertTrue(dc1.isSelectionVisible());
         assertEquals(100, dc1.getBlinkRate());
         assertTrue(dc1.getMagicCaretPosition().equals(new Point(200, 300)));
         assertTrue(dc1.getSelectionPainter() instanceof DefaultHighlighter.DefaultHighlightPainter);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKitTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKitTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKitTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKitTest.java Fri Oct 13 03:24:03 2006
@@ -43,7 +43,7 @@
     }
 
     public void testCreateCaret() {
-        assertEquals("Caret", null, kit.createCaret());
+        assertNull("Caret", kit.createCaret());
     }
 
     public void testCreateDefaultDocument() {
@@ -51,9 +51,9 @@
         assertTrue("document's type", doc instanceof PlainDocument);
         assertEquals("document's length", 0, doc.getLength());
         assertEquals("number of root elements", 2, doc.getRootElements().length);
-        assertEquals("document's title", null, doc
+        assertNull("document's title", doc
                 .getProperty(Document.TitleProperty));
-        assertEquals("document's StreamDescription", null, doc
+        assertNull("document's StreamDescription", doc
                 .getProperty(Document.StreamDescriptionProperty));
     }
 
@@ -94,7 +94,7 @@
     }
 
     public void testGetViewFactory() {
-        assertEquals("ViewFactory", null, kit.getViewFactory());
+        assertNull("ViewFactory", kit.getViewFactory());
     }
 
     public void testActionSharing() {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java Fri Oct 13 03:24:03 2006
@@ -188,7 +188,7 @@
         JTextArea c = getInitedComponent(10, 15, text);
         assertEquals("selected text ", "89\nas", c.getSelectedText());
         performAction(c, action);
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
     }
 
     public void testToggleComponentOrientationPerformed() throws Exception {
@@ -279,49 +279,49 @@
         Action action = getAction(DefaultEditorKit.pageDownAction);
         JTextArea c = getInitedComponent(4, 6, text);
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 35, c.getCaretPosition());
 
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 48, c.getCaretPosition());
 
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 56, c.getCaretPosition());
 
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 78, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.pageUpAction);
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 50, c.getCaretPosition());
 
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 35, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.pageUpAction);
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 6, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.pageUpAction);
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 6, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.pageDownAction);
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 35, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.pageUpAction);
         c = getInitedComponent(0, text);
         performAction(c, action, null);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionPageDownAction);
@@ -346,7 +346,7 @@
 
         c = getInitedComponent(10, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 10, c.getCaretPosition());
     }
 
@@ -374,12 +374,12 @@
         Action action = getAction(DefaultEditorKit.endParagraphAction);
         JTextArea c = getInitedComponent(6, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 14, c.getCaretPosition());
 
         c = getInitedComponent(16, text);
         performAction(c, action);
-        assertEquals("resulted string", null, c.getSelectedText());
+        assertNull("resulted string", c.getSelectedText());
         assertEquals("caret position", 19, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionEndParagraphAction);
@@ -395,7 +395,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("resulted string", null, c.getSelectedText());
+        assertNull("resulted string", c.getSelectedText());
     }
 
     public void testBeginParagraphActionPerformed() throws Exception {
@@ -403,12 +403,12 @@
         Action action = getAction(DefaultEditorKit.beginParagraphAction);
         JTextArea c = getInitedComponent(6, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         c = getInitedComponent(16, text);
         performAction(c, action);
-        assertEquals("resulted string", null, c.getSelectedText());
+        assertNull("resulted string", c.getSelectedText());
         assertEquals("caret position", 14, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionBeginParagraphAction);
@@ -424,7 +424,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("resulted string", null, c.getSelectedText());
+        assertNull("resulted string", c.getSelectedText());
     }
 
     public void testBeginWordActionPerformed() throws Exception {
@@ -432,17 +432,17 @@
         Action action = getAction(DefaultEditorKit.beginWordAction);
         JTextArea c = getInitedComponent(13, 15, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 13, c.getCaretPosition());
 
         c = getInitedComponent(1, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         c = getInitedComponent(0, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionBeginWordAction);
@@ -463,7 +463,7 @@
 
         c = getInitedComponent(0, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
     }
 
@@ -472,17 +472,17 @@
         Action action = getAction(DefaultEditorKit.endWordAction);
         JTextArea c = getInitedComponent(13, 15, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 17, c.getCaretPosition());
 
         c = getInitedComponent(25, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 26, c.getCaretPosition());
 
         c = getInitedComponent(26, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 26, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionEndWordAction);
@@ -498,7 +498,7 @@
 
         c = getInitedComponent(26, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 26, c.getCaretPosition());
     }
 
@@ -507,23 +507,23 @@
         Action action = getAction(DefaultEditorKit.previousWordAction);
         JTextArea c = getInitedComponent(13, 15, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 13, c.getCaretPosition());
 
         c = getInitedComponent(1, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         c = getInitedComponent(0, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionPreviousWordAction);
         c = getInitedComponent(13, 17, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 13, c.getCaretPosition());
 
         c = getInitedComponent(15, 17, text);
@@ -538,7 +538,7 @@
 
         c = getInitedComponent(0, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
     }
 
@@ -547,17 +547,17 @@
         Action action = getAction(DefaultEditorKit.nextWordAction);
         JTextArea c = getInitedComponent(13, 15, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 18, c.getCaretPosition());
 
         c = getInitedComponent(25, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 26, c.getCaretPosition());
 
         c = getInitedComponent(26, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 26, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionNextWordAction);
@@ -573,7 +573,7 @@
 
         c = getInitedComponent(26, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 26, c.getCaretPosition());
     }
 
@@ -582,12 +582,12 @@
         String text = "0123456789\n12341234\n12341234";
         JTextArea c = getInitedComponent(14, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 11, c.getCaretPosition());
 
         c = getInitedComponent(8, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionBeginLineAction);
@@ -598,7 +598,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
     }
 
@@ -607,12 +607,12 @@
         String text = "0123456789\n12341234\n12341234";
         JTextArea c = getInitedComponent(14, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 19, c.getCaretPosition());
 
         c = getInitedComponent(10, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 10, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionEndLineAction);
@@ -623,7 +623,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
     }
 
@@ -632,12 +632,12 @@
         String text = "0123456789\n12341234\n12341234";
         JTextArea c = getInitedComponent(8, 14, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 28, c.getCaretPosition());
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionEndAction);
@@ -649,7 +649,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
     }
 
@@ -658,12 +658,12 @@
         String text = "0123456789\n12341234\n12341234";
         JTextArea c = getInitedComponent(8, 14, text);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
 
         action = getAction(DefaultEditorKit.selectionBeginAction);
@@ -675,7 +675,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("selected string", null, c.getSelectedText());
+        assertNull("selected string", c.getSelectedText());
         assertEquals("caret position", 0, c.getCaretPosition());
     }
 
@@ -696,7 +696,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("resulted string", null, c.getSelectedText());
+        assertNull("resulted string", c.getSelectedText());
     }
 
     public void testSelectLineActionPerformed() throws Exception {
@@ -713,7 +713,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("resulted string", null, c.getSelectedText());
+        assertNull("resulted string", c.getSelectedText());
     }
 
     public void testSelectParagraphActionPerformed() throws Exception {
@@ -748,7 +748,7 @@
 
         c = getInitedComponent(0, null);
         performAction(c, action);
-        assertEquals("resulted string", null, c.getSelectedText());
+        assertNull("resulted string", c.getSelectedText());
     }
 
     public void testDeleteNextCharActionPerformed() throws Exception {
@@ -877,17 +877,17 @@
         JTextArea c = getInitedComponent(8, text);
         performAction(c, action, null);
         assertEquals("caret position", 9, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(text.length(), text);
         performAction(c, action, null);
         assertEquals("caret position", text.length(), c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(5, 7, text);
         performAction(c, action, null);
         assertEquals("caret position", 8, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
     }
 
     public void testNextVisualPositionActionPerformedCaretBackward() throws Exception {
@@ -896,17 +896,17 @@
         JTextArea c = getInitedComponent(8, text);
         performAction(c, action);
         assertEquals("caret position", 7, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(0, text);
         performAction(c, action);
         assertEquals("caret position", 0, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(5, 7, text);
         performAction(c, action);
         assertEquals("caret position", 6, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
     }
 
     public void testNextVisualPositionActionPerformedSelectionForward() throws Exception {
@@ -920,7 +920,7 @@
         c = getInitedComponent(text.length(), text);
         performAction(c, action);
         assertEquals("caret position", text.length(), c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(3, 7, text);
         performAction(c, action);
@@ -939,7 +939,7 @@
         c = getInitedComponent(0, text);
         performAction(c, action);
         assertEquals("caret position", 0, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(8, 5, text);
         performAction(c, action);
@@ -953,16 +953,16 @@
         JTextArea c = getInitedComponent(15, text);
         performAction(c, action);
         assertEquals("caret position", 2, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         performAction(c, action);
         assertEquals("caret position", 2, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(24, 26, text);
         performAction(c, action);
         assertEquals("caret position", 17, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
     }
 
     public void testNextVisualPositionActionPerformedCaretDown() throws Exception {
@@ -973,14 +973,14 @@
         assertEquals("magic caret pos", new Point(48, 0), c.getCaret()
                      .getMagicCaretPosition());
         assertEquals("caret position", 17, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(text.length(), text);
         performAction(c, action);
         assertEquals("magic caret pos", 48, c.getCaret()
                      .getMagicCaretPosition().x);
         assertEquals("caret position", text.length(), c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(5, 7, text);
         performAction(c, action);
@@ -990,7 +990,7 @@
         assertEquals("magic caret pos", new Point(42, 0), c.getCaret()
                      .getMagicCaretPosition());
         assertEquals("caret position", 25, c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
     }
 
     public void testNextVisualPositionActionPerformedSelectionUp() throws Exception {
@@ -1022,7 +1022,7 @@
         c = getInitedComponent(text.length(), text);
         performAction(c, action);
         assertEquals("caret position", text.length(), c.getCaretPosition());
-        assertEquals("selected text ", null, c.getSelectedText());
+        assertNull("selected text ", c.getSelectedText());
 
         c = getInitedComponent(5, 7, text);
         performAction(c, action);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/DefaultHighlighter_DefaultHighlightPainterTest.java Fri Oct 13 03:24:03 2006
@@ -118,7 +118,7 @@
         assertEquals(Color.red,lp.getColor());
         lp = new DefaultHighlighter.DefaultHighlightPainter(null);
         assertNotNull(lp);
-        assertEquals(null,lp.getColor());
+        assertNull(lp.getColor());
     }
 
     private String incString(final String s, final int i ){

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponentTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponentTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponentTest.java Fri Oct 13 03:24:03 2006
@@ -440,10 +440,10 @@
         jtc.select(5, 8);
         jtc.replaceSelection(null);
         assertEquals("JTextponent", jtc.getText());
-        assertEquals(null, jtc.getSelectedText());
+        assertNull(jtc.getSelectedText());
         jtc.select(5, 8);
         jtc.replaceSelection("XXX");
-        assertEquals(null, jtc.getSelectedText());
+        assertNull(jtc.getSelectedText());
         assertEquals("JTextXXXent", jtc.getText());
 
         jtc.setText("JTextComponent");
@@ -594,21 +594,21 @@
 
     public void testSetIsEditable() throws Exception {
 
-        assertEquals(true, jtc.isEditable());
+        assertTrue(jtc.isEditable());
         jtc.setEditable(false);
         assertEqualsPropertyChangeEvent("editable", new Boolean(true),
                 new Boolean(false), pChListener.event);
-        assertEquals(false, jtc.isEditable());
+        assertFalse(jtc.isEditable());
 
     }
 
     public void testSetGetDragEnabled() throws Exception {
         /*
          * class RunnableCase0 extends RunnableWrap { public void run() {
-         * assertEquals(false,jtc.getDragEnabled());
+         * assertFalse(jtc.getDragEnabled());
          * assertNotNull(jtc.getTransferHandler()); TransferHandler th =
          * jtc.getTransferHandler(); jtc.setDragEnabled(true);
-         * assertEquals(true,jtc.getDragEnabled());
+         * assertTrue(jtc.getDragEnabled());
          * assertNotNull(jtc.getTransferHandler());
          * assertEquals(th,jtc.getTransferHandler());
          * jtc.setText("JTextComponent"); jtc.select(5,8); } }
@@ -704,7 +704,7 @@
 
         jtc.setSelectionStart(8);
         jtc.setSelectionEnd(5);
-        assertEquals(null, jtc.getSelectedText());
+        assertNull(jtc.getSelectedText());
         assertEquals(5, jtc.getSelectionStart());
         assertEquals(5, jtc.getSelectionEnd());
         assertEquals(5, jtc.getCaret().getDot());
@@ -733,7 +733,7 @@
         assertEquals(3, jtc.getCaret().getMark());
         assertEquals(3, jtc.getSelectionStart());
         assertEquals(3, jtc.getSelectionEnd());
-        assertEquals(null, jtc.getSelectedText());
+        assertNull(jtc.getSelectedText());
 
         jtc.setSelectionStart(8);
         assertEquals(8, jtc.getCaret().getDot());
@@ -875,14 +875,14 @@
 //        jtc.setCaretPosition(5);
 //        jtc.paste();
 //        assertEquals("XXX", getClipboardString(jtc));
-//        assertEquals(null, jtc.getSelectedText());
+//        assertNull(jtc.getSelectedText());
 //        assertEquals("JTextXXXComponent", jtc.getText());
 //
 //        jtc.select(10, 14);
 //        setClipboardString(jtc, "YYY");
 //        jtc.paste();
 //        assertEquals("YYY", getClipboardString(jtc));
-//        assertEquals(null, jtc.getSelectedText());
+//        assertNull(jtc.getSelectedText());
 //        assertEquals("JTextXXXCoYYYent", jtc.getText());
 //
 //        jtc.select(14, 16);
@@ -890,7 +890,7 @@
 //        jtc.paste();
 //        assertEquals("", getClipboardString(jtc));
 //        //TODO ??
-//        assertEquals(null, jtc.getSelectedText());
+//        assertNull(jtc.getSelectedText());
 //        assertEquals("JTextXXXCoYYYe", jtc.getText());
     }
 
@@ -902,13 +902,13 @@
 //        setClipboardString(jtc, "XXX");
 //        jtc.cut();
 //        assertEquals("XXX", getClipboardString(jtc));
-//        assertEquals(null, jtc.getSelectedText());
+//        assertNull(jtc.getSelectedText());
 //        assertEquals("JTextComponent", jtc.getText());
 //
 //        jtc.select(4, 8);
 //        jtc.cut();
 //        assertEquals("tCom", getClipboardString(jtc));
-//        assertEquals(null, jtc.getSelectedText());
+//        assertNull(jtc.getSelectedText());
 //        assertEquals("JTexponent", jtc.getText());
     }
 
@@ -943,7 +943,7 @@
 //        setClipboardString(jtc, "XXX");
 //        jtc.copy();
 //        assertEquals("XXX", getClipboardString(jtc));
-//        assertEquals(null, jtc.getSelectedText());
+//        assertNull(jtc.getSelectedText());
 //        assertEquals("JTextComponent", jtc.getText());
 //
 //        jtc.select(4, 8);
@@ -966,23 +966,23 @@
         Keymap keyMap5 = JTextComponent.addKeymap("Fifth", keyMap2);
         assertEquals(keyMap, keyMap1.getResolveParent());
         assertEquals(keyMap2.getResolveParent(), keyMap1);
-        assertEquals(keyMap3.getResolveParent(), null);
-        assertEquals(keyMap4.getResolveParent(), null);
+        assertNull(keyMap3.getResolveParent());
+        assertNull(keyMap4.getResolveParent());
         assertEquals(keyMap1, JTextComponent.getKeymap("First"));
         assertEquals(keyMap2, JTextComponent.getKeymap("Second"));
         assertEquals(keyMap3, JTextComponent.getKeymap("Third"));
-        assertEquals(null, JTextComponent.getKeymap("Fourth"));
+        assertNull(JTextComponent.getKeymap("Fourth"));
 
         JTextComponent.removeKeymap("First");
-        assertEquals(null, JTextComponent.getKeymap("First"));
+        assertNull(JTextComponent.getKeymap("First"));
         //assertEquals(keyMap,JTextComponent.getKeymap("Second").//TODO
         //      getResolveParent());
         JTextComponent.removeKeymap("Second");
         JTextComponent.removeKeymap("Third");
         JTextComponent.removeKeymap("Fifth");
-        assertEquals(null, JTextComponent.getKeymap("Second"));
-        assertEquals(null, JTextComponent.getKeymap("Third"));
-        assertEquals(null, JTextComponent.getKeymap("Fifth"));
+        assertNull(JTextComponent.getKeymap("Second"));
+        assertNull(JTextComponent.getKeymap("Third"));
+        assertNull(JTextComponent.getKeymap("Fifth"));
 
     }
 
@@ -1040,7 +1040,7 @@
         assertEquals(actions[1], k.getAction(keyStroke3));
         assertEquals(actions[0], k.getAction(keyStroke5));
         assertEquals(actions[0], k.getAction(keyStroke6));
-        assertEquals(null, k.getAction(keyStroke4));
+        assertNull(k.getAction(keyStroke4));
 
         assertEquals(3, k.getKeyStrokesForAction(actions[0]).length);
         assertEquals(1, k.getKeyStrokesForAction(actions[1]).length);
@@ -1051,7 +1051,7 @@
         isElement(k.getKeyStrokesForAction(actions[0]), keyStroke6, 1);
         isElement(k.getKeyStrokesForAction(actions[1]), keyStroke3, 1);
         isElement(k.getKeyStrokesForAction(actions[2]), keyStroke2, 1);
-        assertEquals(null, k.getKeyStrokesForAction(actions[3]));
+        assertNull(k.getKeyStrokesForAction(actions[3]));
     }
 
     public void testConstants() {
@@ -1110,7 +1110,7 @@
         assertEquals(color, jtc1.getSelectionColor());
         assertEquals(color, jtc1.getSelectedTextColor());
         assertEquals(color, jtc1.getDisabledTextColor());
-        assertEquals(null, jtc1.getSelectedText());
+        assertNull(jtc1.getSelectedText());
         assertEquals(0, jtc1.getCaretPosition());
         assertEquals(new Insets(10, 20, 30, 40), jtc1.getMargin());
         assertNotSame("KeyMap", jtc1.getKeymap().getName());

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java Fri Oct 13 03:24:03 2006
@@ -459,7 +459,7 @@
 
     public void testGetSelectedText() throws Exception {
         jtc.setCaretPosition(5);
-        assertEquals(null, accessible.getSelectedText());
+        assertNull(accessible.getSelectedText());
         jtc.moveCaretPosition(8);
         assertEquals("Com", accessible.getSelectedText());
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java Fri Oct 13 03:24:03 2006
@@ -120,7 +120,7 @@
         assertEquals("test",accessible.getAfterIndex(AccessibleText.WORD,8));
         assertEquals("LALALA\n",
                 accessible.getAfterIndex(AccessibleText.SENTENCE, 8));
-        assertEquals(null,accessible.getAfterIndex(AccessibleText.SENTENCE,
+        assertNull(accessible.getAfterIndex(AccessibleText.SENTENCE,
                 jtc.getDocument().getLength() -2));
 
         assertEquals(" ",accessible.getBeforeIndex(AccessibleText.CHARACTER,4));
@@ -137,7 +137,7 @@
         assertEquals("this",accessible.getBeforeIndex(AccessibleText.WORD,8));
         assertEquals("In\n",
                 accessible.getBeforeIndex(AccessibleText.SENTENCE, 8));
-        assertEquals(null,accessible.getBeforeIndex(AccessibleText.SENTENCE, 1));
+        assertNull(accessible.getBeforeIndex(AccessibleText.SENTENCE, 1));
     }
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_MultithreadedTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_MultithreadedTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/JTextComponent_MultithreadedTest.java Fri Oct 13 03:24:03 2006
@@ -220,8 +220,8 @@
             jf.pack();
         }
 
-        assertEquals(false, jep.getScrollableTracksViewportHeight());
-        assertEquals(false, jep.getScrollableTracksViewportWidth());
+        assertFalse(jep.getScrollableTracksViewportHeight());
+        assertFalse(jep.getScrollableTracksViewportWidth());
         assertEquals(jep.getPreferredSize(), jep
                 .getPreferredScrollableViewportSize());
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/SegmentTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/SegmentTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/SegmentTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/SegmentTest.java Fri Oct 13 03:24:03 2006
@@ -135,14 +135,14 @@
      */
     public void testSegment() {
         s = new Segment();
-        assertEquals(null, s.array);
+        assertNull(s.array);
         assertEquals(0, s.count);
         assertEquals(0, s.offset);
     }
 
     public void testIsPartialReturn() {
         // Default state must be FALSE
-        assertEquals(false, s.isPartialReturn());
+        assertFalse(s.isPartialReturn());
     }
 
     public void testSetIndex() {
@@ -169,7 +169,7 @@
 
     public void testSetPartialReturn() {
         s.setPartialReturn(true);
-        assertEquals(true, s.isPartialReturn());
+        assertTrue(s.isPartialReturn());
     }
 
     /*

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/StyleConstantsTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/StyleConstantsTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/StyleConstantsTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/StyleConstantsTest.java Fri Oct 13 03:24:03 2006
@@ -238,11 +238,11 @@
     }
 
     public void testIsBold() {
-        assertTrue(false == StyleConstants.isBold(SimpleAttributeSet.EMPTY));
+        assertFalse(StyleConstants.isBold(SimpleAttributeSet.EMPTY));
         putAttribute(StyleConstants.Bold, Boolean.TRUE);
-        assertTrue(true == StyleConstants.isBold(attr));
+        assertTrue(StyleConstants.isBold(attr));
         putAttribute(StyleConstants.Bold, Boolean.FALSE);
-        assertTrue(false == StyleConstants.isBold(attr));
+        assertFalse(StyleConstants.isBold(attr));
     }
 
     public void testItalic() {
@@ -255,11 +255,11 @@
     }
 
     public void testIsItalic() {
-        assertTrue(false == StyleConstants.isItalic(SimpleAttributeSet.EMPTY));
+        assertFalse(StyleConstants.isItalic(SimpleAttributeSet.EMPTY));
         putAttribute(StyleConstants.Italic, Boolean.TRUE);
-        assertTrue(true == StyleConstants.isItalic(attr));
+        assertTrue(StyleConstants.isItalic(attr));
         putAttribute(StyleConstants.Italic, Boolean.FALSE);
-        assertTrue(false == StyleConstants.isItalic(attr));
+        assertFalse(StyleConstants.isItalic(attr));
     }
 
     public void testStrikeThrough() {
@@ -272,12 +272,11 @@
     }
 
     public void testIsStrikeThrough() {
-        assertTrue(
-            false == StyleConstants.isStrikeThrough(SimpleAttributeSet.EMPTY));
+        assertFalse(StyleConstants.isStrikeThrough(SimpleAttributeSet.EMPTY));
         putAttribute(StyleConstants.StrikeThrough, Boolean.TRUE);
-        assertTrue(true == StyleConstants.isStrikeThrough(attr));
+        assertTrue(StyleConstants.isStrikeThrough(attr));
         putAttribute(StyleConstants.StrikeThrough, Boolean.FALSE);
-        assertTrue(false == StyleConstants.isStrikeThrough(attr));
+        assertFalse(StyleConstants.isStrikeThrough(attr));
     }
 
     public void testSubscript() {
@@ -290,12 +289,11 @@
     }
 
     public void testIsSubscript() {
-        assertTrue(
-            false == StyleConstants.isSubscript(SimpleAttributeSet.EMPTY));
+        assertFalse(StyleConstants.isSubscript(SimpleAttributeSet.EMPTY));
         putAttribute(StyleConstants.Subscript, Boolean.TRUE);
-        assertTrue(true == StyleConstants.isSubscript(attr));
+        assertTrue(StyleConstants.isSubscript(attr));
         putAttribute(StyleConstants.Subscript, Boolean.FALSE);
-        assertTrue(false == StyleConstants.isSubscript(attr));
+        assertFalse(StyleConstants.isSubscript(attr));
     }
 
     public void testSuperscript() {
@@ -308,12 +306,11 @@
     }
 
     public void testIsSuperscript() {
-        assertTrue(
-            false == StyleConstants.isSuperscript(SimpleAttributeSet.EMPTY));
+        assertFalse(StyleConstants.isSuperscript(SimpleAttributeSet.EMPTY));
         putAttribute(StyleConstants.Superscript, Boolean.TRUE);
-        assertTrue(true == StyleConstants.isSuperscript(attr));
+        assertTrue(StyleConstants.isSuperscript(attr));
         putAttribute(StyleConstants.Superscript, Boolean.FALSE);
-        assertTrue(false == StyleConstants.isSuperscript(attr));
+        assertFalse(StyleConstants.isSuperscript(attr));
     }
 
     public void testUnderline() {
@@ -326,12 +323,11 @@
     }
 
     public void testIsUnderline() {
-        assertTrue(
-            false == StyleConstants.isUnderline(SimpleAttributeSet.EMPTY));
+        assertFalse(StyleConstants.isUnderline(SimpleAttributeSet.EMPTY));
         putAttribute(StyleConstants.Underline, Boolean.TRUE);
-        assertTrue(true == StyleConstants.isUnderline(attr));
+        assertTrue(StyleConstants.isUnderline(attr));
         putAttribute(StyleConstants.Underline, Boolean.FALSE);
-        assertTrue(false == StyleConstants.isUnderline(attr));
+        assertFalse(StyleConstants.isUnderline(attr));
     }
 
     public void testSetFirstLineIndent() {
@@ -417,72 +413,60 @@
     public void testSetBold() {
         attr.removeAttributes(attr);
         StyleConstants.setBold(attr, true);
-        assertTrue(
-            true == ((Boolean)attr.getAttribute(
+        assertTrue(((Boolean)attr.getAttribute(
                         StyleConstants.Bold)).booleanValue());
         StyleConstants.setBold(attr, false);
-        assertTrue(
-            false == ((Boolean)attr.getAttribute(
+        assertFalse(((Boolean)attr.getAttribute(
                          StyleConstants.Bold)).booleanValue());
     }
 
     public void testSetItalic() {
         attr.removeAttributes(attr);
         StyleConstants.setItalic(attr, true);
-        assertTrue(
-            true == ((Boolean)attr.getAttribute(
+        assertTrue(((Boolean)attr.getAttribute(
                         StyleConstants.Italic)).booleanValue());
         StyleConstants.setItalic(attr, false);
-        assertTrue(
-            false == ((Boolean)attr.getAttribute(
+        assertFalse(((Boolean)attr.getAttribute(
                          StyleConstants.Italic)).booleanValue());
     }
 
     public void testSetStrikeThrough() {
         attr.removeAttributes(attr);
         StyleConstants.setStrikeThrough(attr, true);
-        assertTrue(
-            true == ((Boolean)attr.getAttribute(
+        assertTrue(((Boolean)attr.getAttribute(
                         StyleConstants.StrikeThrough)).booleanValue());
         StyleConstants.setStrikeThrough(attr, false);
-        assertTrue(
-            false == ((Boolean)attr.getAttribute(
+        assertFalse(((Boolean)attr.getAttribute(
                          StyleConstants.StrikeThrough)).booleanValue());
     }
 
     public void testSetSubscript() {
         attr.removeAttributes(attr);
         StyleConstants.setSubscript(attr, true);
-        assertTrue(
-            true == ((Boolean)attr.getAttribute(
+        assertTrue(((Boolean)attr.getAttribute(
                         StyleConstants.Subscript)).booleanValue());
         StyleConstants.setSubscript(attr, false);
-        assertTrue(
-            false == ((Boolean)attr.getAttribute(
+        assertFalse(((Boolean)attr.getAttribute(
                          StyleConstants.Subscript)).booleanValue());
     }
 
     public void testSetSuperscript() {
         attr.removeAttributes(attr);
         StyleConstants.setSuperscript(attr, true);
-        assertTrue(
-            true == ((Boolean)attr.getAttribute(
+        assertTrue(((Boolean)attr.getAttribute(
                         StyleConstants.Superscript)).booleanValue());
         StyleConstants.setSuperscript(attr, false);
-        assertTrue(
-            false == ((Boolean)attr.getAttribute(
+        assertFalse(((Boolean)attr.getAttribute(
                          StyleConstants.Superscript)).booleanValue());
     }
 
     public void testSetUnderline() {
         attr.removeAttributes(attr);
         StyleConstants.setUnderline(attr, true);
-        assertTrue(
-            true == ((Boolean)attr.getAttribute(
+        assertTrue(((Boolean)attr.getAttribute(
                         StyleConstants.Underline)).booleanValue());
         StyleConstants.setUnderline(attr, false);
-        assertTrue(
-            false == ((Boolean)attr.getAttribute(
+        assertFalse(((Boolean)attr.getAttribute(
                          StyleConstants.Underline)).booleanValue());
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/TextActionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/TextActionTest.java?view=diff&rev=463630&r1=463629&r2=463630
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/TextActionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/TextActionTest.java Fri Oct 13 03:24:03 2006
@@ -136,7 +136,7 @@
         assertTrue("action is enabled initially", action2.isEnabled());
 
         assertEquals("Number of keys", 0, action3.getKeys().length);
-        assertEquals("name ", null, action3.getValue(Action.NAME));
+        assertNull("name ", action3.getValue(Action.NAME));
         assertTrue("action is enabled initially", action3.isEnabled());
     }
 



Mime
View raw message