--- jsr166/src/test/tck/EntryTest.java	2009/11/21 02:07:26	1.3
+++ jsr166/src/test/tck/EntryTest.java	2011/05/27 19:41:25	1.8
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 import junit.framework.*;
@@ -11,7 +11,7 @@ import java.io.*;
 
 public class EntryTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
         return new TestSuite(EntryTest.class);
@@ -22,7 +22,6 @@ public class EntryTest extends JSR166Tes
     static final String k2 = "2";
     static final String v2 = "b";
 
-
     /**
      * A new SimpleEntry(k, v) holds k, v.
      */
@@ -41,7 +40,6 @@ public class EntryTest extends JSR166Tes
         assertEquals(v1, s.getValue());
     }
 
-
     /**
      * A new SimpleEntry(entry(k, v)) holds k, v.
      */
@@ -87,22 +85,21 @@ public class EntryTest extends JSR166Tes
     public void testNotEquals() {
         Map.Entry e2 = new AbstractMap.SimpleEntry(k1, v1);
         Map.Entry e = new AbstractMap.SimpleEntry(k2, v1);
-        assertFalse(e2.equals( e));
+        assertFalse(e2.equals(e));
         e = new AbstractMap.SimpleEntry(k1, v2);
-        assertFalse(e2.equals( e));
+        assertFalse(e2.equals(e));
         e = new AbstractMap.SimpleEntry(k2, v2);
-        assertFalse(e2.equals( e));
+        assertFalse(e2.equals(e));
 
         Map.Entry s2 = new AbstractMap.SimpleImmutableEntry(k1, v1);
         Map.Entry s = new AbstractMap.SimpleImmutableEntry(k2, v1);
-        assertFalse(s2.equals( s));
+        assertFalse(s2.equals(s));
         s = new AbstractMap.SimpleImmutableEntry(k1, v2);
-        assertFalse(s2.equals( s));
+        assertFalse(s2.equals(s));
         s = new AbstractMap.SimpleImmutableEntry(k2, v2);
-        assertFalse(s2.equals( s));
+        assertFalse(s2.equals(s));
     }
 
-
     /**
      * getValue returns last setValue for SimpleEntry
      */
@@ -113,7 +110,7 @@ public class EntryTest extends JSR166Tes
         assertEquals(v1, e.getValue());
         e.setValue(k2);
         assertEquals(k2, e.getValue());
-        assertFalse(e2.equals( e));
+        assertFalse(e2.equals(e));
     }
 
     /**
@@ -126,7 +123,7 @@ public class EntryTest extends JSR166Tes
         assertEquals(v1, s.getValue());
         try {
             s.setValue(k2);
-            fail();
+            shouldThrow();
         } catch (UnsupportedOperationException success) {}
     }
 }