--- jsr166/src/test/tck/AtomicLongTest.java	2011/05/31 16:16:23	1.22
+++ jsr166/src/test/tck/AtomicLongTest.java	2014/12/31 19:21:20	1.28
@@ -6,9 +6,11 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.concurrent.atomic.AtomicLong;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicLongTest extends JSR166TestCase {
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -28,7 +30,7 @@ public class AtomicLongTest extends JSR1
      */
     public void testConstructor() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(1,ai.get());
+        assertEquals(1, ai.get());
     }
 
     /**
@@ -36,7 +38,7 @@ public class AtomicLongTest extends JSR1
      */
     public void testConstructor2() {
         AtomicLong ai = new AtomicLong();
-        assertEquals(0,ai.get());
+        assertEquals(0, ai.get());
     }
 
     /**
@@ -44,11 +46,11 @@ public class AtomicLongTest extends JSR1
      */
     public void testGetSet() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(1,ai.get());
+        assertEquals(1, ai.get());
         ai.set(2);
-        assertEquals(2,ai.get());
+        assertEquals(2, ai.get());
         ai.set(-3);
-        assertEquals(-3,ai.get());
+        assertEquals(-3, ai.get());
     }
 
     /**
@@ -56,11 +58,11 @@ public class AtomicLongTest extends JSR1
      */
     public void testGetLazySet() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(1,ai.get());
+        assertEquals(1, ai.get());
         ai.lazySet(2);
-        assertEquals(2,ai.get());
+        assertEquals(2, ai.get());
         ai.lazySet(-3);
-        assertEquals(-3,ai.get());
+        assertEquals(-3, ai.get());
     }
 
     /**
@@ -68,13 +70,13 @@ public class AtomicLongTest extends JSR1
      */
     public void testCompareAndSet() {
         AtomicLong ai = new AtomicLong(1);
-        assertTrue(ai.compareAndSet(1,2));
-        assertTrue(ai.compareAndSet(2,-4));
-        assertEquals(-4,ai.get());
-        assertFalse(ai.compareAndSet(-5,7));
-        assertEquals(-4,ai.get());
-        assertTrue(ai.compareAndSet(-4,7));
-        assertEquals(7,ai.get());
+        assertTrue(ai.compareAndSet(1, 2));
+        assertTrue(ai.compareAndSet(2, -4));
+        assertEquals(-4, ai.get());
+        assertFalse(ai.compareAndSet(-5, 7));
+        assertEquals(-4, ai.get());
+        assertTrue(ai.compareAndSet(-4, 7));
+        assertEquals(7, ai.get());
     }
 
     /**
@@ -93,7 +95,7 @@ public class AtomicLongTest extends JSR1
         assertTrue(ai.compareAndSet(1, 2));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(ai.get(), 3);
+        assertEquals(3, ai.get());
     }
 
     /**
@@ -102,11 +104,11 @@ public class AtomicLongTest extends JSR1
      */
     public void testWeakCompareAndSet() {
         AtomicLong ai = new AtomicLong(1);
-        while (!ai.weakCompareAndSet(1,2));
-        while (!ai.weakCompareAndSet(2,-4));
-        assertEquals(-4,ai.get());
-        while (!ai.weakCompareAndSet(-4,7));
-        assertEquals(7,ai.get());
+        do {} while (!ai.weakCompareAndSet(1, 2));
+        do {} while (!ai.weakCompareAndSet(2, -4));
+        assertEquals(-4, ai.get());
+        do {} while (!ai.weakCompareAndSet(-4, 7));
+        assertEquals(7, ai.get());
     }
 
     /**
@@ -114,9 +116,9 @@ public class AtomicLongTest extends JSR1
      */
     public void testGetAndSet() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(1,ai.getAndSet(0));
-        assertEquals(0,ai.getAndSet(-10));
-        assertEquals(-10,ai.getAndSet(1));
+        assertEquals(1, ai.getAndSet(0));
+        assertEquals(0, ai.getAndSet(-10));
+        assertEquals(-10, ai.getAndSet(1));
     }
 
     /**
@@ -124,10 +126,10 @@ public class AtomicLongTest extends JSR1
      */
     public void testGetAndAdd() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(1,ai.getAndAdd(2));
-        assertEquals(3,ai.get());
-        assertEquals(3,ai.getAndAdd(-4));
-        assertEquals(-1,ai.get());
+        assertEquals(1, ai.getAndAdd(2));
+        assertEquals(3, ai.get());
+        assertEquals(3, ai.getAndAdd(-4));
+        assertEquals(-1, ai.get());
     }
 
     /**
@@ -135,9 +137,9 @@ public class AtomicLongTest extends JSR1
      */
     public void testGetAndDecrement() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(1,ai.getAndDecrement());
-        assertEquals(0,ai.getAndDecrement());
-        assertEquals(-1,ai.getAndDecrement());
+        assertEquals(1, ai.getAndDecrement());
+        assertEquals(0, ai.getAndDecrement());
+        assertEquals(-1, ai.getAndDecrement());
     }
 
     /**
@@ -145,13 +147,13 @@ public class AtomicLongTest extends JSR1
      */
     public void testGetAndIncrement() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(1,ai.getAndIncrement());
-        assertEquals(2,ai.get());
+        assertEquals(1, ai.getAndIncrement());
+        assertEquals(2, ai.get());
         ai.set(-2);
-        assertEquals(-2,ai.getAndIncrement());
-        assertEquals(-1,ai.getAndIncrement());
-        assertEquals(0,ai.getAndIncrement());
-        assertEquals(1,ai.get());
+        assertEquals(-2, ai.getAndIncrement());
+        assertEquals(-1, ai.getAndIncrement());
+        assertEquals(0, ai.getAndIncrement());
+        assertEquals(1, ai.get());
     }
 
     /**
@@ -159,10 +161,10 @@ public class AtomicLongTest extends JSR1
      */
     public void testAddAndGet() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(3,ai.addAndGet(2));
-        assertEquals(3,ai.get());
-        assertEquals(-1,ai.addAndGet(-4));
-        assertEquals(-1,ai.get());
+        assertEquals(3, ai.addAndGet(2));
+        assertEquals(3, ai.get());
+        assertEquals(-1, ai.addAndGet(-4));
+        assertEquals(-1, ai.get());
     }
 
     /**
@@ -170,10 +172,10 @@ public class AtomicLongTest extends JSR1
      */
     public void testDecrementAndGet() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(0,ai.decrementAndGet());
-        assertEquals(-1,ai.decrementAndGet());
-        assertEquals(-2,ai.decrementAndGet());
-        assertEquals(-2,ai.get());
+        assertEquals(0, ai.decrementAndGet());
+        assertEquals(-1, ai.decrementAndGet());
+        assertEquals(-2, ai.decrementAndGet());
+        assertEquals(-2, ai.get());
     }
 
     /**
@@ -181,13 +183,13 @@ public class AtomicLongTest extends JSR1
      */
     public void testIncrementAndGet() {
         AtomicLong ai = new AtomicLong(1);
-        assertEquals(2,ai.incrementAndGet());
-        assertEquals(2,ai.get());
+        assertEquals(2, ai.incrementAndGet());
+        assertEquals(2, ai.get());
         ai.set(-2);
-        assertEquals(-1,ai.incrementAndGet());
-        assertEquals(0,ai.incrementAndGet());
-        assertEquals(1,ai.incrementAndGet());
-        assertEquals(1,ai.get());
+        assertEquals(-1, ai.incrementAndGet());
+        assertEquals(0, ai.incrementAndGet());
+        assertEquals(1, ai.incrementAndGet());
+        assertEquals(1, ai.get());
     }
 
     /**
@@ -196,9 +198,10 @@ public class AtomicLongTest extends JSR1
     public void testSerialization() throws Exception {
         AtomicLong x = new AtomicLong();
         AtomicLong y = serialClone(x);
-        assertTrue(x != y);
+        assertNotSame(x, y);
         x.set(-22);
         AtomicLong z = serialClone(x);
+        assertNotSame(y, z);
         assertEquals(-22, x.get());
         assertEquals(0, y.get());
         assertEquals(-22, z.get());
@@ -210,9 +213,9 @@ public class AtomicLongTest extends JSR1
     public void testToString() {
         AtomicLong ai = new AtomicLong();
         assertEquals("0", ai.toString());
-        for (long i : VALUES) {
-            ai.set(i);
-            assertEquals(ai.toString(), Long.toString(i));
+        for (long x : VALUES) {
+            ai.set(x);
+            assertEquals(Long.toString(x), ai.toString());
         }
     }