--- jsr166/src/test/tck/AtomicLongArrayTest.java	2003/09/20 18:20:07	1.4
+++ jsr166/src/test/tck/AtomicLongArrayTest.java	2003/12/27 19:26:43	1.6
@@ -1,8 +1,9 @@
 /*
- * Written by members of JCP JSR-166 Expert Group and released to the
- * public domain. Use, modify, and redistribute this code in any way
- * without acknowledgement. Other contributors include Andrew Wright,
- * Jeffrey Hayes, Pat Fischer, Mike Judd.
+ * 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
+ * Other contributors include Andrew Wright, Jeffrey Hayes, 
+ * Pat Fisher, Mike Judd. 
  */
 
 import junit.framework.*;
@@ -18,7 +19,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * constructor creates array of given size with all elements zero
      */
     public void testConstructor(){
         AtomicLongArray ai = new AtomicLongArray(SIZE);
@@ -27,7 +28,30 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * get and set for out of bound indices throw IndexOutOfBoundsException
+     */
+    public void testIndexing(){
+        AtomicLongArray ai = new AtomicLongArray(SIZE);
+        try {
+            ai.get(SIZE);
+        } catch(IndexOutOfBoundsException success){
+        }
+        try {
+            ai.get(-1);
+        } catch(IndexOutOfBoundsException success){
+        }
+        try {
+            ai.set(SIZE, 0);
+        } catch(IndexOutOfBoundsException success){
+        }
+        try {
+            ai.set(-1, 0);
+        } catch(IndexOutOfBoundsException success){
+        }
+    }
+
+    /**
+     * get returns the last value set at index
      */
     public void testGetSet(){
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -42,7 +66,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * compareAndSet succeeds in changing value if equal to expected else fails
      */
     public void testCompareAndSet(){
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -59,7 +83,31 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * compareAndSet in one thread enables another waiting for value
+     * to succeed
+     */
+    public void testCompareAndSetInMultipleThreads() {
+        final AtomicLongArray a = new AtomicLongArray(1);
+        a.set(0, 1);
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    while(!a.compareAndSet(0, 2, 3)) Thread.yield();
+                }});
+        try {
+            t.start();
+            assertTrue(a.compareAndSet(0, 1, 2));
+            t.join(LONG_DELAY_MS);
+            assertFalse(t.isAlive());
+            assertEquals(a.get(0), 3);
+        }
+        catch(Exception e) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * repeated weakCompareAndSet succeeds in changing value when equal
+     * to expected 
      */
     public void testWeakCompareAndSet(){
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -74,7 +122,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     *  getAndSet returns previous value and sets to given value at given index
      */
     public void testGetAndSet(){
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -87,7 +135,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     *  getAndAdd returns previous value and adds given value
      */
     public void testGetAndAdd(){
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -101,7 +149,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * getAndDecrement returns previous value and decrements
      */
     public void testGetAndDecrement(){
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -114,7 +162,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * getAndIncrement returns previous value and increments
      */
     public void testGetAndIncrement(){
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -131,7 +179,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     *  addAndGet adds given value to current, and returns current value
      */
     public void testAddAndGet() {
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -145,7 +193,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * decrementAndGet decrements and returns current value
      */
     public void testDecrementAndGet(){
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -159,7 +207,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * incrementAndGet increments and returns current value
      */
     public void testIncrementAndGet() {
         AtomicLongArray ai = new AtomicLongArray(SIZE); 
@@ -200,7 +248,8 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * Multiple threads using same array of counters successfully
+     * update a number of times equal to total count
      */
     public void testCountingInMultipleThreads() {
         try {
@@ -223,7 +272,7 @@ public class AtomicLongArrayTest extends
     }
 
     /**
-     *
+     * a deserialized serialized array holds same values
      */
     public void testSerialization() {
         AtomicLongArray l = new AtomicLongArray(SIZE);