--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2003/09/14 20:42:40	1.2
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2003/09/25 11:02:41	1.4
@@ -17,46 +17,53 @@ public class AtomicReferenceFieldUpdater
     public static void main(String[] args){
         junit.textui.TestRunner.run(suite());
     }
-
-   
     public static Test suite() {
         return new TestSuite(AtomicReferenceFieldUpdaterTest.class);
     }
 
+    /**
+     * Contruction with non-existent field throws RuntimeException
+     */
     public void testConstructor(){
         try{
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (getClass(), Integer.class, "y");
-            fail("Exception not thrown");
+            shouldThrow();
         }
-
         catch (RuntimeException rt) {}
     }
 
 
+    /**
+     * construction with field not of given type throws RuntimeException
+     */
     public void testConstructor2(){
         try{
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (getClass(), Integer.class, "z");
-            fail("Exception not thrown");
+            shouldThrow();
         }
-
         catch (RuntimeException rt) {}
     }
 
+    /**
+     * Constructor with non-volatile field throws exception
+     */
     public void testConstructor3(){
         try{
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (getClass(), Integer.class, "w");
-            fail("Exception not thrown");
+            shouldThrow();
         }
-
         catch (RuntimeException rt) {}
     }
 
+    /**
+     *  get returns the last value set or assigned
+     */
     public void testGetSet(){
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), Integer.class, "x");
         x = one;
@@ -67,6 +74,9 @@ public class AtomicReferenceFieldUpdater
 	assertEquals(-3,a.get(this));
 	
     }
+    /**
+     * compareAndSet succeeds in changing value if equal to expected else fails
+     */
     public void testCompareAndSet(){
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), Integer.class, "x");
         x = one;
@@ -79,6 +89,34 @@ public class AtomicReferenceFieldUpdater
 	assertEquals(seven,a.get(this));
     }
 
+    /**
+     * compareAndSet in one thread enables another waiting for value
+     * to succeed
+     */
+    public void testCompareAndSetInMultipleThreads() {
+        x = one;
+        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), Integer.class, "x");
+
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    while(!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three)) Thread.yield();
+                }});
+        try {
+            t.start();
+            assertTrue(a.compareAndSet(this, one, two));
+            t.join(LONG_DELAY_MS);
+            assertFalse(t.isAlive());
+            assertEquals(a.get(this), three);
+        }
+        catch(Exception e) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * repeated weakCompareAndSet succeeds in changing value when equal
+     * to expected 
+     */
     public void testWeakCompareAndSet(){
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), Integer.class, "x");
         x = one;
@@ -89,6 +127,9 @@ public class AtomicReferenceFieldUpdater
 	assertEquals(seven,a.get(this));
     }
 
+    /**
+     * getAndSet returns previous value and sets to given value
+     */
     public void testGetAndSet(){
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), Integer.class, "x");
         x = one;