--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2009/11/21 17:38:05	1.16
+++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2011/05/31 16:16:23	1.21
@@ -1,14 +1,13 @@
 /*
  * 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.
  */
 
-import java.util.concurrent.atomic.*;
 import junit.framework.*;
-import java.util.*;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 
 public class AtomicLongFieldUpdaterTest extends JSR166TestCase {
     volatile long x = 0;
@@ -59,7 +58,7 @@ public class AtomicLongFieldUpdaterTest
     }
 
     /**
-     *  get returns the last value set or assigned
+     * get returns the last value set or assigned
      */
     public void testGetSet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
@@ -77,7 +76,7 @@ public class AtomicLongFieldUpdaterTest
     }
 
     /**
-     *  get returns the last value lazySet by same thread
+     * get returns the last value lazySet by same thread
      */
     public void testGetLazySet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
@@ -94,7 +93,6 @@ public class AtomicLongFieldUpdaterTest
         assertEquals(-3,a.get(this));
     }
 
-
     /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
@@ -110,12 +108,11 @@ public class AtomicLongFieldUpdaterTest
         assertTrue(a.compareAndSet(this,2,-4));
         assertEquals(-4,a.get(this));
         assertFalse(a.compareAndSet(this,-5,7));
-        assertFalse((7 == a.get(this)));
+        assertEquals(-4,a.get(this));
         assertTrue(a.compareAndSet(this,-4,7));
         assertEquals(7,a.get(this));
     }
 
-
     /**
      * compareAndSet in one thread enables another waiting for value
      * to succeed
@@ -162,7 +159,7 @@ public class AtomicLongFieldUpdaterTest
     }
 
     /**
-     *  getAndSet returns previous value and sets to given value
+     * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
@@ -248,7 +245,7 @@ public class AtomicLongFieldUpdaterTest
     }
 
     /**
-     *  decrementAndGet decrements and returns current value
+     * decrementAndGet decrements and returns current value
      */
     public void testDecrementAndGet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;