--- jsr166/src/test/tck/AtomicLongTest.java	2009/11/22 18:55:56	1.17
+++ jsr166/src/test/tck/AtomicLongTest.java	2011/05/27 16:43:23	1.21
@@ -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/
  * Other contributors include Andrew Wright, Jeffrey Hayes,
  * Pat Fisher, Mike Judd.
  */
@@ -11,8 +11,8 @@ import java.util.concurrent.atomic.*;
 import java.io.*;
 
 public class AtomicLongTest extends JSR166TestCase {
-    public static void main (String[] args) {
-        junit.textui.TestRunner.run (suite());
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
         return new TestSuite(AtomicLongTest.class);
@@ -73,7 +73,7 @@ public class AtomicLongTest extends JSR1
         assertTrue(ai.compareAndSet(2,-4));
         assertEquals(-4,ai.get());
         assertFalse(ai.compareAndSet(-5,7));
-        assertFalse((7 == ai.get()));
+        assertEquals(-4,ai.get());
         assertTrue(ai.compareAndSet(-4,7));
         assertEquals(7,ai.get());
     }
@@ -241,7 +241,7 @@ public class AtomicLongTest extends JSR1
         assertEquals(0L, ai.longValue());
         for (long x : VALUES) {
             ai.set(x);
-            assertEquals((long)x, ai.longValue());
+            assertEquals(x, ai.longValue());
         }
     }