--- jsr166/src/test/tck/AtomicReferenceArrayTest.java	2003/09/25 11:02:41	1.5
+++ jsr166/src/test/tck/AtomicReferenceArrayTest.java	2005/05/25 14:27:37	1.10
@@ -1,13 +1,15 @@
 /*
- * 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.*;
 import java.util.concurrent.atomic.*;
 import java.io.*;
+import java.util.*;
 
 public class AtomicReferenceArrayTest extends JSR166TestCase 
 {
@@ -29,6 +31,31 @@ 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(){
@@ -67,6 +94,21 @@ public class AtomicReferenceArrayTest ex
     }
 
     /**
+     * get returns the last value lazySet at index by same thread
+     */
+    public void testGetLazySet(){
+        AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
+        for (int i = 0; i < SIZE; ++i) {
+            ai.lazySet(i, one);
+            assertEquals(one,ai.get(i));
+            ai.lazySet(i, two);
+            assertEquals(two,ai.get(i));
+            ai.lazySet(i, m3);
+            assertEquals(m3,ai.get(i));
+        }
+    }
+
+    /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
     public void testCompareAndSet(){
@@ -162,4 +204,13 @@ public class AtomicReferenceArrayTest ex
         }
     }
 
+
+    /**
+     * toString returns current value.
+     */ 
+    public void testToString() {
+        Integer[] a = { two, one, three, four, seven};
+        AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(a);
+        assertEquals(Arrays.toString(a), ai.toString());
+    }
 }