--- jsr166/src/test/tck/AtomicIntegerArrayTest.java	2010/09/16 00:52:49	1.18
+++ jsr166/src/test/tck/AtomicIntegerArrayTest.java	2011/06/10 20:01:21	1.24
@@ -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.AtomicIntegerArray;
 
 public class AtomicIntegerArrayTest extends JSR166TestCase {
 
@@ -20,14 +19,13 @@ public class AtomicIntegerArrayTest exte
         return new TestSuite(AtomicIntegerArrayTest.class);
     }
 
-
     /**
      * constructor creates array of given size with all elements zero
      */
     public void testConstructor() {
         AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
         for (int i = 0; i < SIZE; ++i)
-            assertEquals(0,ai.get(i));
+            assertEquals(0, ai.get(i));
     }
 
     /**
@@ -45,7 +43,7 @@ public class AtomicIntegerArrayTest exte
      * constructor with array is of same size and has all elements
      */
     public void testConstructor2() {
-        int[] a = { 17, 3, -42, 99, -7};
+        int[] a = { 17, 3, -42, 99, -7 };
         AtomicIntegerArray ai = new AtomicIntegerArray(a);
         assertEquals(a.length, ai.length());
         for (int i = 0; i < a.length; ++i)
@@ -86,11 +84,11 @@ public class AtomicIntegerArrayTest exte
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
@@ -101,11 +99,11 @@ public class AtomicIntegerArrayTest exte
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
@@ -116,13 +114,13 @@ public class AtomicIntegerArrayTest exte
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
@@ -154,38 +152,38 @@ public class AtomicIntegerArrayTest exte
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
     /**
-     *  getAndSet returns previous value and sets to given value at given index
+     * getAndSet returns previous value and sets to given value at given index
      */
     public void testGetAndSet() {
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
     /**
-     *  getAndAdd returns previous value and adds given value
+     * getAndAdd returns previous value and adds given value
      */
     public void testGetAndAdd() {
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
@@ -196,9 +194,9 @@ public class AtomicIntegerArrayTest exte
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
@@ -209,27 +207,27 @@ public class AtomicIntegerArrayTest exte
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
     /**
-     *  addAndGet adds given value to current, and returns current value
+     * addAndGet adds given value to current, and returns current value
      */
     public void testAddAndGet() {
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
@@ -240,27 +238,27 @@ public class AtomicIntegerArrayTest exte
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
     /**
-     *  incrementAndGet increments and returns current value
+     * incrementAndGet increments and returns current value
      */
     public void testIncrementAndGet() {
         AtomicIntegerArray ai = new AtomicIntegerArray(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));
         }
     }
 
@@ -307,34 +305,26 @@ public class AtomicIntegerArrayTest exte
         assertEquals(c1.counts+c2.counts, SIZE * COUNTDOWN);
     }
 
-
     /**
      * a deserialized serialized array holds same values
      */
     public void testSerialization() throws Exception {
-        AtomicIntegerArray l = new AtomicIntegerArray(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));
-        AtomicIntegerArray r = (AtomicIntegerArray) in.readObject();
-        for (int i = 0; i < SIZE; ++i) {
-            assertEquals(l.get(i), r.get(i));
+        AtomicIntegerArray x = new AtomicIntegerArray(SIZE);
+        for (int i = 0; i < SIZE; i++)
+            x.set(i, -i);
+        AtomicIntegerArray y = serialClone(x);
+        assertTrue(x != y);
+        assertEquals(x.length(), y.length());
+        for (int i = 0; i < SIZE; i++) {
+            assertEquals(x.get(i), y.get(i));
         }
     }
 
-
     /**
      * toString returns current value.
      */
     public void testToString() {
-        int[] a = { 17, 3, -42, 99, -7};
+        int[] a = { 17, 3, -42, 99, -7 };
         AtomicIntegerArray ai = new AtomicIntegerArray(a);
         assertEquals(Arrays.toString(a), ai.toString());
     }