--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2003/08/31 19:24:53	1.1
+++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2003/10/25 16:02:13	1.5
@@ -9,55 +9,63 @@ import java.util.concurrent.atomic.*;
 import junit.framework.*;
 import java.util.*;
 
-public class AtomicLongFieldUpdaterTest extends TestCase{
+public class AtomicLongFieldUpdaterTest extends JSR166TestCase {
     volatile long x = 0;
-    long z;
-    int w;
+    int z;
+    long w;
 
     public static void main(String[] args){
         junit.textui.TestRunner.run(suite());
     }
-
-   
     public static Test suite() {
         return new TestSuite(AtomicLongFieldUpdaterTest.class);
     }
 
+    /**
+     * Contruction with non-existent field throws RuntimeException
+     */
     public void testConstructor(){
         try{
             AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> 
                 a = AtomicLongFieldUpdater.newUpdater
-                (getClass(), "y");
-            fail("Exception not thrown");
+                (AtomicLongFieldUpdaterTest.class, "y");
+            shouldThrow();
         }
-
         catch (RuntimeException rt) {}
     }
 
+    /**
+     * construction with field not of given type throws RuntimeException
+     */
     public void testConstructor2(){
         try{
             AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> 
                 a = AtomicLongFieldUpdater.newUpdater
-                (getClass(), "z");
-            fail("Exception not thrown");
+                (AtomicLongFieldUpdaterTest.class, "z");
+            shouldThrow();
         }
-
         catch (RuntimeException rt) {}
     }
 
+    /**
+     * construction with non-volatile field throws RuntimeException
+     */
     public void testConstructor3(){
         try{
             AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> 
                 a = AtomicLongFieldUpdater.newUpdater
-                (getClass(), "w");
-            fail("Exception not thrown");
+                (AtomicLongFieldUpdaterTest.class, "w");
+            shouldThrow();
         }
 
         catch (RuntimeException rt) {}
     }
 
+    /**
+     *  get returns the last value set or assigned
+     */
     public void testGetSet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertEquals(1,a.get(this));
 	a.set(this,2);
@@ -66,8 +74,11 @@ public class AtomicLongFieldUpdaterTest
 	assertEquals(-3,a.get(this));
 	
     }
+    /**
+     * compareAndSet succeeds in changing value if equal to expected else fails
+     */
     public void testCompareAndSet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertTrue(a.compareAndSet(this,1,2));
 	assertTrue(a.compareAndSet(this,2,-4));
@@ -78,8 +89,37 @@ public class AtomicLongFieldUpdaterTest
 	assertEquals(7,a.get(this));
     }
 
+
+    /**
+     * compareAndSet in one thread enables another waiting for value
+     * to succeed
+     */
+    public void testCompareAndSetInMultipleThreads() {
+        x = 1;
+        final AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest>a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    while(!a.compareAndSet(AtomicLongFieldUpdaterTest.this, 2, 3)) Thread.yield();
+                }});
+        try {
+            t.start();
+            assertTrue(a.compareAndSet(this, 1, 2));
+            t.join(LONG_DELAY_MS);
+            assertFalse(t.isAlive());
+            assertEquals(a.get(this), 3);
+        }
+        catch(Exception e) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * repeated weakCompareAndSet succeeds in changing value when equal
+     * to expected 
+     */
     public void testWeakCompareAndSet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	while(!a.weakCompareAndSet(this,1,2));
         while(!a.weakCompareAndSet(this,2,-4));
@@ -88,16 +128,22 @@ public class AtomicLongFieldUpdaterTest
 	assertEquals(7,a.get(this));
     }
 
+    /**
+     *  getAndSet returns previous value and sets to given value
+     */
     public void testGetAndSet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertEquals(1,a.getAndSet(this, 0));
 	assertEquals(0,a.getAndSet(this,-10));
 	assertEquals(-10,a.getAndSet(this,1));
     }
 
+    /**
+     * getAndAdd returns previous value and adds given value
+     */
     public void testGetAndAdd(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertEquals(1,a.getAndAdd(this,2));
 	assertEquals(3,a.get(this));
@@ -105,16 +151,22 @@ public class AtomicLongFieldUpdaterTest
 	assertEquals(-1,a.get(this));
     }
 
+    /**
+     * getAndDecrement returns previous value and decrements
+     */
     public void testGetAndDecrement(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertEquals(1,a.getAndDecrement(this));
 	assertEquals(0,a.getAndDecrement(this));
 	assertEquals(-1,a.getAndDecrement(this));
     }
 
+    /**
+     * getAndIncrement returns previous value and increments
+     */
     public void testGetAndIncrement(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertEquals(1,a.getAndIncrement(this));
 	assertEquals(2,a.get(this));
@@ -125,8 +177,11 @@ public class AtomicLongFieldUpdaterTest
 	assertEquals(1,a.get(this));
     }
 
+    /**
+     * addAndGet adds given value to current, and returns current value
+     */
     public void testAddAndGet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertEquals(3,a.addAndGet(this,2));
 	assertEquals(3,a.get(this));
@@ -134,8 +189,11 @@ public class AtomicLongFieldUpdaterTest
 	assertEquals(-1,a.get(this));
     }
 
+    /**
+     *  decrementAndGet decrements and returns current value
+     */
     public void testDecrementAndGet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertEquals(0,a.decrementAndGet(this));
 	assertEquals(-1,a.decrementAndGet(this));
@@ -143,8 +201,11 @@ public class AtomicLongFieldUpdaterTest
 	assertEquals(-2,a.get(this));
     }
 
+    /**
+     * incrementAndGet increments and returns current value
+     */
     public void testIncrementAndGet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(getClass(), "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
         x = 1;
 	assertEquals(2,a.incrementAndGet(this));
 	assertEquals(2,a.get(this));