--- jsr166/src/test/tck/AtomicReferenceArrayTest.java	2003/09/20 18:20:07	1.4
+++ jsr166/src/test/tck/AtomicReferenceArrayTest.java	2004/01/09 20:07:36	1.8
@@ -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.*;
@@ -19,7 +20,7 @@ public class AtomicReferenceArrayTest ex
     }
 
     /**
-     *
+     * constructor creates array of given size with all elements null
      */
     public void testConstructor(){
         AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(SIZE);
@@ -29,7 +30,55 @@ public class AtomicReferenceArrayTest ex
     }
 
     /**
-     *
+     * constructor with null array throws NPE
+     */
+    public void testConstructor2NPE() {
+        try {
+            Integer[] a = null;
+            AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(a);
+        } catch (NullPointerException success) {
+        } catch (Exception ex) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * constructor with array is of same size and has all elements
+     */
+    public void testConstructor2() {
+        Integer[] a = { two, one, three, four, seven};
+        AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(a);
+        assertEquals(a.length, ai.length());
+        for (int i = 0; i < a.length; ++i) 
+            assertEquals(a[i], ai.get(i));
+    }
+
+
+    /**
+     * get and set for out of bound indices throw IndexOutOfBoundsException
+     */
+    public void testIndexing(){
+        AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(SIZE);
+        try {
+            ai.get(SIZE);
+        } catch(IndexOutOfBoundsException success){
+        }
+        try {
+            ai.get(-1);
+        } catch(IndexOutOfBoundsException success){
+        }
+        try {
+            ai.set(SIZE, null);
+        } catch(IndexOutOfBoundsException success){
+        }
+        try {
+            ai.set(-1, null);
+        } catch(IndexOutOfBoundsException success){
+        }
+    }
+
+    /**
+     * get returns the last value set at index
      */
     public void testGetSet(){
         AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
@@ -44,7 +93,7 @@ public class AtomicReferenceArrayTest ex
     }
 
     /**
-     *
+     * compareAndSet succeeds in changing value if equal to expected else fails
      */
     public void testCompareAndSet(){
         AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
@@ -61,7 +110,31 @@ public class AtomicReferenceArrayTest ex
     }
 
     /**
-     *
+     * compareAndSet in one thread enables another waiting for value
+     * to succeed
+     */
+    public void testCompareAndSetInMultipleThreads() {
+        final AtomicReferenceArray a = new AtomicReferenceArray(1);
+        a.set(0, one);
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    while(!a.compareAndSet(0, two, three)) Thread.yield();
+                }});
+        try {
+            t.start();
+            assertTrue(a.compareAndSet(0, one, two));
+            t.join(LONG_DELAY_MS);
+            assertFalse(t.isAlive());
+            assertEquals(a.get(0), three);
+        }
+        catch(Exception e) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * repeated weakCompareAndSet succeeds in changing value when equal
+     * to expected 
      */
     public void testWeakCompareAndSet(){
         AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
@@ -76,7 +149,7 @@ public class AtomicReferenceArrayTest ex
     }
 
     /**
-     *
+     * getAndSet returns previous value and sets to given value at given index
      */
     public void testGetAndSet(){
         AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
@@ -89,7 +162,7 @@ public class AtomicReferenceArrayTest ex
     }
 
     /**
-     *
+     * a deserialized serialized array holds same values
      */
     public void testSerialization() {
         AtomicReferenceArray l = new AtomicReferenceArray(SIZE); 
@@ -115,4 +188,5 @@ public class AtomicReferenceArrayTest ex
         }
     }
 
+
 }