--- jsr166/src/test/tck/AtomicLongTest.java	2003/09/07 20:39:11	1.2
+++ jsr166/src/test/tck/AtomicLongTest.java	2004/01/09 20:07:36	1.8
@@ -1,15 +1,16 @@
 /*
- * 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.*;
 import java.util.concurrent.atomic.*;
 import java.io.*;
 
-public class AtomicLongTest extends TestCase {
+public class AtomicLongTest extends JSR166TestCase {
     public static void main (String[] args) {
         junit.textui.TestRunner.run (suite());
     }
@@ -17,16 +18,25 @@ public class AtomicLongTest extends Test
         return new TestSuite(AtomicLongTest.class);
     }
 
+    /**
+     * constructor initializes to given value
+     */
     public void testConstructor(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(1,ai.get());
     }
 
+    /**
+     * default constructed initializes to zero
+     */
     public void testConstructor2(){
         AtomicLong ai = new AtomicLong();
 	assertEquals(0,ai.get());
     }
 
+    /**
+     * get returns the last value set
+     */
     public void testGetSet(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(1,ai.get());
@@ -36,6 +46,9 @@ public class AtomicLongTest extends Test
 	assertEquals(-3,ai.get());
 	
     }
+    /**
+     * compareAndSet succeeds in changing value if equal to expected else fails
+     */
     public void testCompareAndSet(){
         AtomicLong ai = new AtomicLong(1);
 	assertTrue(ai.compareAndSet(1,2));
@@ -47,6 +60,32 @@ public class AtomicLongTest extends Test
 	assertEquals(7,ai.get());
     }
 
+    /**
+     * compareAndSet in one thread enables another waiting for value
+     * to succeed
+     */
+    public void testCompareAndSetInMultipleThreads() {
+        final AtomicLong ai = new AtomicLong(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(){
         AtomicLong ai = new AtomicLong(1);
 	while(!ai.weakCompareAndSet(1,2));
@@ -56,6 +95,9 @@ public class AtomicLongTest extends Test
 	assertEquals(7,ai.get());
     }
 
+    /**
+     * getAndSet returns previous value and sets to given value
+     */
     public void testGetAndSet(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(1,ai.getAndSet(0));
@@ -63,6 +105,9 @@ public class AtomicLongTest extends Test
 	assertEquals(-10,ai.getAndSet(1));
     }
 
+    /**
+     * getAndAdd returns previous value and adds given value
+     */
     public void testGetAndAdd(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(1,ai.getAndAdd(2));
@@ -71,6 +116,9 @@ public class AtomicLongTest extends Test
 	assertEquals(-1,ai.get());
     }
 
+    /**
+     * getAndDecrement returns previous value and decrements
+     */
     public void testGetAndDecrement(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(1,ai.getAndDecrement());
@@ -78,6 +126,9 @@ public class AtomicLongTest extends Test
 	assertEquals(-1,ai.getAndDecrement());
     }
 
+    /**
+     * getAndIncrement returns previous value and increments
+     */
     public void testGetAndIncrement(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(1,ai.getAndIncrement());
@@ -89,6 +140,9 @@ public class AtomicLongTest extends Test
 	assertEquals(1,ai.get());
     }
 
+    /**
+     * addAndGet adds given value to current, and returns current value
+     */
     public void testAddAndGet(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(3,ai.addAndGet(2));
@@ -97,6 +151,9 @@ public class AtomicLongTest extends Test
 	assertEquals(-1,ai.get());
     }
 
+    /**
+     * decrementAndGet decrements and returns current value
+     */
     public void testDecrementAndGet(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(0,ai.decrementAndGet());
@@ -105,6 +162,9 @@ public class AtomicLongTest extends Test
 	assertEquals(-2,ai.get());
     }
 
+    /**
+     * incrementAndGet increments and returns current value
+     */
     public void testIncrementAndGet(){
         AtomicLong ai = new AtomicLong(1);
 	assertEquals(2,ai.incrementAndGet());
@@ -116,6 +176,9 @@ public class AtomicLongTest extends Test
 	assertEquals(1,ai.get());
     }
 
+    /**
+     * a deserialized serialized atomic holds same value
+     */
     public void testSerialization() {
         AtomicLong l = new AtomicLong();
 
@@ -131,9 +194,18 @@ public class AtomicLongTest extends Test
             AtomicLong r = (AtomicLong) in.readObject();
             assertEquals(l.get(), r.get());
         } catch(Exception e){
-            e.printStackTrace();
-            fail("unexpected exception");
+            unexpectedException();
         }
     }
 
+    /**
+     * toString returns current value.
+     */ 
+    public void testToString() {
+        AtomicLong ai = new AtomicLong();
+        for (long i = -12; i < 6; ++i) {
+            ai.set(i);
+            assertEquals(ai.toString(), Long.toString(i));
+        }
+    }
 }