--- jsr166/src/test/tck/TimeUnitTest.java	2011/03/15 19:47:07	1.19
+++ jsr166/src/test/tck/TimeUnitTest.java	2011/05/27 19:12:09	1.20
@@ -6,7 +6,6 @@
  * Pat Fisher, Mike Judd.
  */
 
-
 import junit.framework.*;
 import java.util.concurrent.*;
 import java.io.*;
@@ -49,7 +48,6 @@ public class TimeUnitTest extends JSR166
                          TimeUnit.SECONDS.convert(1000000000L*t,
                                                   TimeUnit.NANOSECONDS));
 
-
             assertEquals(1000L*t*60*60*24,
                          TimeUnit.MILLISECONDS.convert(t,
                                                   TimeUnit.DAYS));
@@ -279,7 +277,6 @@ public class TimeUnitTest extends JSR166
         }
     }
 
-
     /**
      * convert saturates positive too-large values to Long.MAX_VALUE
      * and negative to LONG.MIN_VALUE
@@ -322,15 +319,19 @@ public class TimeUnitTest extends JSR166
                      TimeUnit.MILLISECONDS.toNanos(-Long.MAX_VALUE / 3));
     }
 
-
     /**
-     * toString returns string containing common name of unit
+     * toString returns name of unit
      */
     public void testToString() {
-        String s = TimeUnit.SECONDS.toString();
-        assertTrue(s.indexOf("ECOND") >= 0);
+        assertEquals("SECONDS", TimeUnit.SECONDS.toString());
     }
 
+    /**
+     * name returns name of unit
+     */
+    public void testName() {
+        assertEquals("SECONDS", TimeUnit.SECONDS.name());
+    }
 
     /**
      * Timed wait without holding lock throws
@@ -371,7 +372,6 @@ public class TimeUnitTest extends JSR166
         t.join();
     }
 
-
     /**
      * timedJoin throws InterruptedException when interrupted
      */