--- jsr166/src/test/tck/AtomicLongArrayTest.java	2010/10/09 19:30:34	1.18
+++ jsr166/src/test/tck/AtomicLongArrayTest.java	2011/06/10 20:01:21	1.23
@@ -1,15 +1,14 @@
 /*
  * 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 junit.framework.*;
-import java.util.concurrent.atomic.*;
-import java.io.*;
-import java.util.*;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicLongArray;
 
 public class AtomicLongArrayTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -25,7 +24,7 @@ public class AtomicLongArrayTest extends
     public void testConstructor() {
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i)
-            assertEquals(0,ai.get(i));
+            assertEquals(0, ai.get(i));
     }
 
     /**
@@ -43,7 +42,7 @@ public class AtomicLongArrayTest extends
      * constructor with array is of same size and has all elements
      */
     public void testConstructor2() {
-        long[] a = { 17L, 3L, -42L, 99L, -7L};
+        long[] a = { 17L, 3L, -42L, 99L, -7L };
         AtomicLongArray ai = new AtomicLongArray(a);
         assertEquals(a.length, ai.length());
         for (int i = 0; i < a.length; ++i)
@@ -84,11 +83,11 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertEquals(1,ai.get(i));
+            assertEquals(1, ai.get(i));
             ai.set(i, 2);
-            assertEquals(2,ai.get(i));
+            assertEquals(2, ai.get(i));
             ai.set(i, -3);
-            assertEquals(-3,ai.get(i));
+            assertEquals(-3, ai.get(i));
         }
     }
 
@@ -99,11 +98,11 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.lazySet(i, 1);
-            assertEquals(1,ai.get(i));
+            assertEquals(1, ai.get(i));
             ai.lazySet(i, 2);
-            assertEquals(2,ai.get(i));
+            assertEquals(2, ai.get(i));
             ai.lazySet(i, -3);
-            assertEquals(-3,ai.get(i));
+            assertEquals(-3, ai.get(i));
         }
     }
 
@@ -114,13 +113,13 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertTrue(ai.compareAndSet(i, 1,2));
-            assertTrue(ai.compareAndSet(i, 2,-4));
-            assertEquals(-4,ai.get(i));
-            assertFalse(ai.compareAndSet(i, -5,7));
-            assertEquals(-4,ai.get(i));
-            assertTrue(ai.compareAndSet(i, -4,7));
-            assertEquals(7,ai.get(i));
+            assertTrue(ai.compareAndSet(i, 1, 2));
+            assertTrue(ai.compareAndSet(i, 2, -4));
+            assertEquals(-4, ai.get(i));
+            assertFalse(ai.compareAndSet(i, -5, 7));
+            assertEquals(-4, ai.get(i));
+            assertTrue(ai.compareAndSet(i, -4, 7));
+            assertEquals(7, ai.get(i));
         }
     }
 
@@ -152,11 +151,11 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            while (!ai.weakCompareAndSet(i, 1,2));
-            while (!ai.weakCompareAndSet(i, 2,-4));
-            assertEquals(-4,ai.get(i));
-            while (!ai.weakCompareAndSet(i, -4,7));
-            assertEquals(7,ai.get(i));
+            while (!ai.weakCompareAndSet(i, 1, 2));
+            while (!ai.weakCompareAndSet(i, 2, -4));
+            assertEquals(-4, ai.get(i));
+            while (!ai.weakCompareAndSet(i, -4, 7));
+            assertEquals(7, ai.get(i));
         }
     }
 
@@ -167,9 +166,9 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertEquals(1,ai.getAndSet(i,0));
-            assertEquals(0,ai.getAndSet(i,-10));
-            assertEquals(-10,ai.getAndSet(i,1));
+            assertEquals(1, ai.getAndSet(i, 0));
+            assertEquals(0, ai.getAndSet(i, -10));
+            assertEquals(-10, ai.getAndSet(i, 1));
         }
     }
 
@@ -180,10 +179,10 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertEquals(1,ai.getAndAdd(i,2));
-            assertEquals(3,ai.get(i));
-            assertEquals(3,ai.getAndAdd(i,-4));
-            assertEquals(-1,ai.get(i));
+            assertEquals(1, ai.getAndAdd(i, 2));
+            assertEquals(3, ai.get(i));
+            assertEquals(3, ai.getAndAdd(i, -4));
+            assertEquals(-1, ai.get(i));
         }
     }
 
@@ -194,9 +193,9 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertEquals(1,ai.getAndDecrement(i));
-            assertEquals(0,ai.getAndDecrement(i));
-            assertEquals(-1,ai.getAndDecrement(i));
+            assertEquals(1, ai.getAndDecrement(i));
+            assertEquals(0, ai.getAndDecrement(i));
+            assertEquals(-1, ai.getAndDecrement(i));
         }
     }
 
@@ -207,13 +206,13 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertEquals(1,ai.getAndIncrement(i));
-            assertEquals(2,ai.get(i));
-            ai.set(i,-2);
-            assertEquals(-2,ai.getAndIncrement(i));
-            assertEquals(-1,ai.getAndIncrement(i));
-            assertEquals(0,ai.getAndIncrement(i));
-            assertEquals(1,ai.get(i));
+            assertEquals(1, ai.getAndIncrement(i));
+            assertEquals(2, ai.get(i));
+            ai.set(i, -2);
+            assertEquals(-2, ai.getAndIncrement(i));
+            assertEquals(-1, ai.getAndIncrement(i));
+            assertEquals(0, ai.getAndIncrement(i));
+            assertEquals(1, ai.get(i));
         }
     }
 
@@ -224,10 +223,10 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertEquals(3,ai.addAndGet(i,2));
-            assertEquals(3,ai.get(i));
-            assertEquals(-1,ai.addAndGet(i,-4));
-            assertEquals(-1,ai.get(i));
+            assertEquals(3, ai.addAndGet(i, 2));
+            assertEquals(3, ai.get(i));
+            assertEquals(-1, ai.addAndGet(i, -4));
+            assertEquals(-1, ai.get(i));
         }
     }
 
@@ -238,10 +237,10 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertEquals(0,ai.decrementAndGet(i));
-            assertEquals(-1,ai.decrementAndGet(i));
-            assertEquals(-2,ai.decrementAndGet(i));
-            assertEquals(-2,ai.get(i));
+            assertEquals(0, ai.decrementAndGet(i));
+            assertEquals(-1, ai.decrementAndGet(i));
+            assertEquals(-2, ai.decrementAndGet(i));
+            assertEquals(-2, ai.get(i));
         }
     }
 
@@ -252,13 +251,13 @@ public class AtomicLongArrayTest extends
         AtomicLongArray ai = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, 1);
-            assertEquals(2,ai.incrementAndGet(i));
-            assertEquals(2,ai.get(i));
+            assertEquals(2, ai.incrementAndGet(i));
+            assertEquals(2, ai.get(i));
             ai.set(i, -2);
-            assertEquals(-1,ai.incrementAndGet(i));
-            assertEquals(0,ai.incrementAndGet(i));
-            assertEquals(1,ai.incrementAndGet(i));
-            assertEquals(1,ai.get(i));
+            assertEquals(-1, ai.incrementAndGet(i));
+            assertEquals(0, ai.incrementAndGet(i));
+            assertEquals(1, ai.incrementAndGet(i));
+            assertEquals(1, ai.get(i));
         }
     }
 
@@ -309,20 +308,14 @@ public class AtomicLongArrayTest extends
      * a deserialized serialized array holds same values
      */
     public void testSerialization() throws Exception {
-        AtomicLongArray l = new AtomicLongArray(SIZE);
+        AtomicLongArray x = new AtomicLongArray(SIZE);
         for (int i = 0; i < SIZE; ++i)
-            l.set(i, -i);
-
-        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
-        out.writeObject(l);
-        out.close();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
-        AtomicLongArray r = (AtomicLongArray) in.readObject();
+            x.set(i, -i);
+        AtomicLongArray y = serialClone(x);
+        assertTrue(x != y);
+        assertEquals(x.length(), y.length());
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(l.get(i), r.get(i));
+            assertEquals(x.get(i), y.get(i));
         }
     }
 
@@ -330,10 +323,9 @@ public class AtomicLongArrayTest extends
      * toString returns current value.
      */
     public void testToString() {
-        long[] a = { 17, 3, -42, 99, -7};
+        long[] a = { 17, 3, -42, 99, -7 };
         AtomicLongArray ai = new AtomicLongArray(a);
         assertEquals(Arrays.toString(a), ai.toString());
     }
 
-
 }