--- jsr166/src/test/tck/AtomicReferenceTest.java	2003/09/14 20:42:40	1.3
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2004/01/09 20:07:36	1.7
@@ -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.*;
@@ -17,16 +18,25 @@ public class AtomicReferenceTest extends
         return new TestSuite(AtomicReferenceTest.class);
     }
 
+    /**
+     * constructor initializes to given value
+     */
     public void testConstructor(){
         AtomicReference ai = new AtomicReference(one);
 	assertEquals(one,ai.get());
     }
 
+    /**
+     * default constructed initializes to null
+     */
     public void testConstructor2(){
         AtomicReference ai = new AtomicReference();
 	assertNull(ai.get());
     }
 
+    /**
+     * get returns the last value set
+     */
     public void testGetSet(){
         AtomicReference ai = new AtomicReference(one);
 	assertEquals(one,ai.get());
@@ -36,6 +46,9 @@ public class AtomicReferenceTest extends
 	assertEquals(m3,ai.get());
 	
     }
+    /**
+     * compareAndSet succeeds in changing value if equal to expected else fails
+     */
     public void testCompareAndSet(){
         AtomicReference ai = new AtomicReference(one);
 	assertTrue(ai.compareAndSet(one,two));
@@ -47,6 +60,32 @@ public class AtomicReferenceTest extends
 	assertEquals(seven,ai.get());
     }
 
+    /**
+     * compareAndSet in one thread enables another waiting for value
+     * to succeed
+     */
+    public void testCompareAndSetInMultipleThreads() {
+        final AtomicReference ai = new AtomicReference(one);
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    while(!ai.compareAndSet(two, three)) Thread.yield();
+                }});
+        try {
+            t.start();
+            assertTrue(ai.compareAndSet(one, two));
+            t.join(LONG_DELAY_MS);
+            assertFalse(t.isAlive());
+            assertEquals(ai.get(), three);
+        }
+        catch(Exception e) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * repeated weakCompareAndSet succeeds in changing value when equal
+     * to expected 
+     */
     public void testWeakCompareAndSet(){
         AtomicReference ai = new AtomicReference(one);
 	while(!ai.weakCompareAndSet(one,two));
@@ -56,6 +95,9 @@ public class AtomicReferenceTest extends
 	assertEquals(seven,ai.get());
     }
 
+    /**
+     * getAndSet returns previous value and sets to given value
+     */
     public void testGetAndSet(){
         AtomicReference ai = new AtomicReference(one);
 	assertEquals(one,ai.getAndSet(zero));
@@ -63,6 +105,9 @@ public class AtomicReferenceTest extends
 	assertEquals(m10,ai.getAndSet(one));
     }
 
+    /**
+     * a deserialized serialized atomic holds same value
+     */
     public void testSerialization() {
         AtomicReference l = new AtomicReference();
 
@@ -78,10 +123,19 @@ public class AtomicReferenceTest extends
             AtomicReference r = (AtomicReference) in.readObject();
             assertEquals(l.get(), r.get());
         } catch(Exception e){
-            e.printStackTrace();
-            fail("unexpected exception");
+            unexpectedException();
         }
     }
 
+    /**
+     * toString returns current value.
+     */ 
+    public void testToString() {
+        AtomicReference<Integer> ai = new AtomicReference<Integer>(one); 
+        assertEquals(ai.toString(), one.toString());
+        ai.set(two);
+        assertEquals(ai.toString(), two.toString());
+    }
+
 }