--- jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2003/09/20 18:20:07	1.3
+++ jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2009/11/16 05:30:07	1.9
@@ -1,30 +1,26 @@
 /*
- * 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.*;
 
-public class AtomicMarkableReferenceTest extends JSR166TestCase{
+public class AtomicMarkableReferenceTest extends JSR166TestCase {
     public static void main (String[] args) {
         junit.textui.TestRunner.run (suite());
     }
     public static Test suite() {
         return new TestSuite(AtomicMarkableReferenceTest.class);
     }
-    
-    static final Integer zero = new Integer(0);
-    static final Integer one = new Integer(1);
-    static final Integer two = new Integer(2);
-    static final Integer m3  = new Integer(-3);
 
     /**
-     *
+     *  constructor initializes to given reference and mark
      */
-    public void testConstructor(){
+    public void testConstructor() {
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
 	assertEquals(one,ai.getReference());
 	assertFalse(ai.isMarked());
@@ -35,9 +31,9 @@ public class AtomicMarkableReferenceTest
     }
 
     /**
-     *
+     *  get returns the last values of reference and mark set
      */
-    public void testGetSet(){
+    public void testGetSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
 	assertEquals(one,ai.getReference());
@@ -57,9 +53,9 @@ public class AtomicMarkableReferenceTest
     }
 
     /**
-     *
+     * attemptMark succeeds in single thread
      */
-    public void testAttemptMark(){
+    public void testAttemptMark() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
         assertFalse(ai.isMarked());
@@ -70,9 +66,10 @@ public class AtomicMarkableReferenceTest
     }
 
     /**
-     *
+     * compareAndSet succeeds in changing values if equal to expected reference
+     * and mark else fails
      */
-    public void testCompareAndSet(){
+    public void testCompareAndSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
 	assertEquals(one, ai.get(mark));
@@ -93,20 +90,67 @@ public class AtomicMarkableReferenceTest
     }
 
     /**
-     *
+     * compareAndSet in one thread enables another waiting for reference value
+     * to succeed
      */
-    public void testWeakCompareAndSet(){
+    public void testCompareAndSetInMultipleThreads() {
+        final AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    while (!ai.compareAndSet(two, three, false, false)) Thread.yield();
+                }});
+        try {
+            t.start();
+            assertTrue(ai.compareAndSet(one, two, false, false));
+            t.join(LONG_DELAY_MS);
+            assertFalse(t.isAlive());
+            assertEquals(ai.getReference(), three);
+            assertFalse(ai.isMarked());
+        }
+        catch (Exception e) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * compareAndSet in one thread enables another waiting for mark value
+     * to succeed
+     */
+    public void testCompareAndSetInMultipleThreads2() {
+        final AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
+        Thread t = new Thread(new Runnable() {
+                public void run() {
+                    while (!ai.compareAndSet(one, one, true, false)) Thread.yield();
+                }});
+        try {
+            t.start();
+            assertTrue(ai.compareAndSet(one, one, false, true));
+            t.join(LONG_DELAY_MS);
+            assertFalse(t.isAlive());
+            assertEquals(ai.getReference(), one);
+            assertFalse(ai.isMarked());
+        }
+        catch (Exception e) {
+            unexpectedException();
+        }
+    }
+
+    /**
+     * repeated weakCompareAndSet succeeds in changing values when equal
+     * to expected
+     */
+    public void testWeakCompareAndSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
 	assertEquals(one, ai.get(mark));
         assertFalse(ai.isMarked());
 	assertFalse(mark[0]);
 
-        while(!ai.weakCompareAndSet(one, two, false, false));
+        while (!ai.weakCompareAndSet(one, two, false, false));
 	assertEquals(two, ai.get(mark));
 	assertFalse(mark[0]);
 
-        while(!ai.weakCompareAndSet(two, m3, false, true));
+        while (!ai.weakCompareAndSet(two, m3, false, true));
 	assertEquals(m3, ai.get(mark));
 	assertTrue(mark[0]);
     }