--- jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2009/11/16 05:30:07	1.9
+++ jsr166/src/test/tck/AtomicMarkableReferenceTest.java	2015/04/25 04:55:30	1.22
@@ -1,54 +1,55 @@
 /*
  * 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
+ * http://creativecommons.org/publicdomain/zero/1.0/
  * Other contributors include Andrew Wright, Jeffrey Hayes,
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicMarkableReference;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class AtomicMarkableReferenceTest extends JSR166TestCase {
-    public static void main (String[] args) {
-        junit.textui.TestRunner.run (suite());
+    public static void main(String[] args) {
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicMarkableReferenceTest.class);
     }
 
     /**
-     *  constructor initializes to given reference and mark
+     * constructor initializes to given reference and mark
      */
     public void testConstructor() {
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
-	assertEquals(one,ai.getReference());
-	assertFalse(ai.isMarked());
+        assertSame(one, ai.getReference());
+        assertFalse(ai.isMarked());
         AtomicMarkableReference a2 = new AtomicMarkableReference(null, true);
-	assertNull(a2.getReference());
-	assertTrue(a2.isMarked());
-
+        assertNull(a2.getReference());
+        assertTrue(a2.isMarked());
     }
 
     /**
-     *  get returns the last values of reference and mark set
+     * get returns the last values of reference and mark set
      */
     public void testGetSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
-	assertEquals(one,ai.getReference());
-	assertFalse(ai.isMarked());
-        assertEquals(one, ai.get(mark));
-        assertFalse(mark[0]);
-	ai.set(two, false);
-	assertEquals(two,ai.getReference());
-	assertFalse(ai.isMarked());
-        assertEquals(two, ai.get(mark));
-        assertFalse(mark[0]);
-	ai.set(one, true);
-	assertEquals(one,ai.getReference());
-	assertTrue(ai.isMarked());
-        assertEquals(one, ai.get(mark));
+        assertSame(one, ai.getReference());
+        assertFalse(ai.isMarked());
+        assertSame(one, ai.get(mark));
+        assertFalse(mark[0]);
+        ai.set(two, false);
+        assertSame(two, ai.getReference());
+        assertFalse(ai.isMarked());
+        assertSame(two, ai.get(mark));
+        assertFalse(mark[0]);
+        ai.set(one, true);
+        assertSame(one, ai.getReference());
+        assertTrue(ai.isMarked());
+        assertSame(one, ai.get(mark));
         assertTrue(mark[0]);
     }
 
@@ -60,8 +61,8 @@ public class AtomicMarkableReferenceTest
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
         assertFalse(ai.isMarked());
         assertTrue(ai.attemptMark(one, true));
-	assertTrue(ai.isMarked());
-        assertEquals(one, ai.get(mark));
+        assertTrue(ai.isMarked());
+        assertSame(one, ai.get(mark));
         assertTrue(mark[0]);
     }
 
@@ -72,67 +73,61 @@ public class AtomicMarkableReferenceTest
     public void testCompareAndSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
-	assertEquals(one, ai.get(mark));
+        assertSame(one, ai.get(mark));
         assertFalse(ai.isMarked());
-	assertFalse(mark[0]);
+        assertFalse(mark[0]);
 
         assertTrue(ai.compareAndSet(one, two, false, false));
-	assertEquals(two, ai.get(mark));
-	assertFalse(mark[0]);
+        assertSame(two, ai.get(mark));
+        assertFalse(mark[0]);
 
         assertTrue(ai.compareAndSet(two, m3, false, true));
-	assertEquals(m3, ai.get(mark));
-	assertTrue(mark[0]);
+        assertSame(m3, ai.get(mark));
+        assertTrue(mark[0]);
 
         assertFalse(ai.compareAndSet(two, m3, true, true));
-	assertEquals(m3, ai.get(mark));
-	assertTrue(mark[0]);
+        assertSame(m3, ai.get(mark));
+        assertTrue(mark[0]);
     }
 
     /**
      * compareAndSet in one thread enables another waiting for reference value
      * to succeed
      */
-    public void testCompareAndSetInMultipleThreads() {
+    public void testCompareAndSetInMultipleThreads() throws Exception {
         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();
-        }
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() {
+                while (!ai.compareAndSet(two, three, false, false))
+                    Thread.yield();
+            }});
+
+        t.start();
+        assertTrue(ai.compareAndSet(one, two, false, false));
+        t.join(LONG_DELAY_MS);
+        assertFalse(t.isAlive());
+        assertSame(three, ai.getReference());
+        assertFalse(ai.isMarked());
     }
 
     /**
      * compareAndSet in one thread enables another waiting for mark value
      * to succeed
      */
-    public void testCompareAndSetInMultipleThreads2() {
+    public void testCompareAndSetInMultipleThreads2() throws Exception {
         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();
-        }
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() {
+                while (!ai.compareAndSet(one, one, true, false))
+                    Thread.yield();
+            }});
+
+        t.start();
+        assertTrue(ai.compareAndSet(one, one, false, true));
+        t.join(LONG_DELAY_MS);
+        assertFalse(t.isAlive());
+        assertSame(one, ai.getReference());
+        assertFalse(ai.isMarked());
     }
 
     /**
@@ -142,17 +137,17 @@ public class AtomicMarkableReferenceTest
     public void testWeakCompareAndSet() {
         boolean[] mark = new boolean[1];
         AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
-	assertEquals(one, ai.get(mark));
+        assertSame(one, ai.get(mark));
         assertFalse(ai.isMarked());
-	assertFalse(mark[0]);
+        assertFalse(mark[0]);
 
-        while (!ai.weakCompareAndSet(one, two, false, false));
-	assertEquals(two, ai.get(mark));
-	assertFalse(mark[0]);
+        do {} while (!ai.weakCompareAndSet(one, two, false, false));
+        assertSame(two, ai.get(mark));
+        assertFalse(mark[0]);
 
-        while (!ai.weakCompareAndSet(two, m3, false, true));
-	assertEquals(m3, ai.get(mark));
-	assertTrue(mark[0]);
+        do {} while (!ai.weakCompareAndSet(two, m3, false, true));
+        assertSame(m3, ai.get(mark));
+        assertTrue(mark[0]);
     }
 
 }