--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2003/09/14 20:42:40	1.2
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2003/10/25 16:02:13	1.5
@@ -17,48 +17,55 @@ 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");
+                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "y");
+            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");
+                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
+            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");
+                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
+            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");
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
         x = one;
 	assertEquals(one,a.get(this));
 	a.set(this,two);
@@ -67,8 +74,11 @@ 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");
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
         x = one;
 	assertTrue(a.compareAndSet(this,one,two));
 	assertTrue(a.compareAndSet(this,two,m4));
@@ -79,8 +89,36 @@ 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(AtomicReferenceFieldUpdaterTest.class, 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");
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
         x = one;
 	while(!a.weakCompareAndSet(this,one,two));
 	while(!a.weakCompareAndSet(this,two,m4));
@@ -89,8 +127,11 @@ 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");
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
         x = one;
 	assertEquals(one,a.getAndSet(this, zero));
 	assertEquals(zero,a.getAndSet(this,m10));