--- jsr166/src/test/tck/AtomicIntegerTest.java	2003/09/07 20:39:11	1.2
+++ jsr166/src/test/tck/AtomicIntegerTest.java	2003/09/25 11:02:41	1.5
@@ -9,7 +9,7 @@ import junit.framework.*;
 import java.util.concurrent.atomic.*;
 import java.io.*;
 
-public class AtomicIntegerTest extends TestCase {
+public class AtomicIntegerTest extends JSR166TestCase {
     public static void main (String[] args) {
         junit.textui.TestRunner.run (suite());
     }
@@ -17,16 +17,25 @@ public class AtomicIntegerTest extends T
         return new TestSuite(AtomicIntegerTest.class);
     }
 
+    /**
+     * constructor initializes to given value
+     */
     public void testConstructor(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(1,ai.get());
     }
 
+    /**
+     * default constructed intializes to zero
+     */
     public void testConstructor2(){
         AtomicInteger ai = new AtomicInteger();
 	assertEquals(0,ai.get());
     }
 
+    /**
+     * get returns the last value set
+     */
     public void testGetSet(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(1,ai.get());
@@ -36,6 +45,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(-3,ai.get());
 	
     }
+    /**
+     * compareAndSet succeeds in changing value if equal to expected else fails
+     */
     public void testCompareAndSet(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertTrue(ai.compareAndSet(1,2));
@@ -47,6 +59,32 @@ public class AtomicIntegerTest extends T
 	assertEquals(7,ai.get());
     }
 
+    /**
+     * compareAndSet in one thread enables another waiting for value
+     * to succeed
+     */
+    public void testCompareAndSetInMultipleThreads() {
+        final AtomicInteger ai = new AtomicInteger(1);
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    while(!ai.compareAndSet(2, 3)) Thread.yield();
+                }});
+        try {
+            t.start();
+            assertTrue(ai.compareAndSet(1, 2));
+            t.join(LONG_DELAY_MS);
+            assertFalse(t.isAlive());
+            assertEquals(ai.get(), 3);
+        }
+        catch(Exception e) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * repeated weakCompareAndSet succeeds in changing value when equal
+     * to expected 
+     */
     public void testWeakCompareAndSet(){
         AtomicInteger ai = new AtomicInteger(1);
 	while(!ai.weakCompareAndSet(1,2));
@@ -56,6 +94,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(7,ai.get());
     }
 
+    /**
+     * getAndSet returns previous value and sets to given value
+     */
     public void testGetAndSet(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(1,ai.getAndSet(0));
@@ -63,6 +104,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(-10,ai.getAndSet(1));
     }
 
+    /**
+     * getAndAdd returns previous value and adds given value
+     */
     public void testGetAndAdd(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(1,ai.getAndAdd(2));
@@ -71,6 +115,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(-1,ai.get());
     }
 
+    /**
+     * getAndDecrement returns previous value and decrements
+     */
     public void testGetAndDecrement(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(1,ai.getAndDecrement());
@@ -78,6 +125,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(-1,ai.getAndDecrement());
     }
 
+    /**
+     * getAndIncrement returns previous value and increments
+     */
     public void testGetAndIncrement(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(1,ai.getAndIncrement());
@@ -89,6 +139,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(1,ai.get());
     }
 
+    /**
+     * addAndGet adds given value to current, and returns current value
+     */
     public void testAddAndGet(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(3,ai.addAndGet(2));
@@ -97,6 +150,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(-1,ai.get());
     }
 
+    /**
+     * decrementAndGet decrements and returns current value
+     */
     public void testDecrementAndGet(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(0,ai.decrementAndGet());
@@ -105,6 +161,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(-2,ai.get());
     }
 
+    /**
+     * incrementAndGet increments and returns current value
+     */
     public void testIncrementAndGet(){
         AtomicInteger ai = new AtomicInteger(1);
 	assertEquals(2,ai.incrementAndGet());
@@ -116,6 +175,9 @@ public class AtomicIntegerTest extends T
 	assertEquals(1,ai.get());
     }
 
+    /**
+     * a deserialized serialized atomic holds same value
+     */
     public void testSerialization() {
         AtomicInteger l = new AtomicInteger();
 
@@ -131,8 +193,7 @@ public class AtomicIntegerTest extends T
             AtomicInteger r = (AtomicInteger) in.readObject();
             assertEquals(l.get(), r.get());
         } catch(Exception e){
-            e.printStackTrace();
-            fail("unexpected exception");
+            unexpectedException();
         }
     }