--- jsr166/src/test/tck/AtomicStampedReferenceTest.java	2003/12/28 21:56:18	1.6
+++ jsr166/src/test/tck/AtomicStampedReferenceTest.java	2009/11/17 06:58:50	1.12
@@ -2,25 +2,25 @@
  * 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. 
+ * Other contributors include Andrew Wright, Jeffrey Hayes,
+ * Pat Fisher, Mike Judd.
  */
 
 import junit.framework.*;
 import java.util.concurrent.atomic.*;
 
-public class AtomicStampedReferenceTest extends JSR166TestCase{
+public class AtomicStampedReferenceTest extends JSR166TestCase {
     public static void main (String[] args) {
         junit.textui.TestRunner.run (suite());
     }
     public static Test suite() {
         return new TestSuite(AtomicStampedReferenceTest.class);
     }
-    
+
     /**
-     * constructeor initializes to given reference and stamp
+     * constructor initializes to given reference and stamp
      */
-    public void testConstructor(){
+    public void testConstructor() {
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
 	assertEquals(one,ai.getReference());
 	assertEquals(0, ai.getStamp());
@@ -33,7 +33,7 @@ public class AtomicStampedReferenceTest
     /**
      *  get returns the last values of reference and stamp set
      */
-    public void testGetSet(){
+    public void testGetSet() {
         int[] mark = new int[1];
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
 	assertEquals(one,ai.getReference());
@@ -55,7 +55,7 @@ public class AtomicStampedReferenceTest
     /**
      *  attemptStamp succeeds in single thread
      */
-    public void testAttemptStamp(){
+    public void testAttemptStamp() {
         int[] mark = new int[1];
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
         assertEquals(0, ai.getStamp());
@@ -69,7 +69,7 @@ public class AtomicStampedReferenceTest
      * compareAndSet succeeds in changing values if equal to expected reference
      * and stamp else fails
      */
-    public void testCompareAndSet(){
+    public void testCompareAndSet() {
         int[] mark = new int[1];
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
 	assertEquals(one, ai.get(mark));
@@ -93,64 +93,58 @@ public class AtomicStampedReferenceTest
      * compareAndSet in one thread enables another waiting for reference value
      * to succeed
      */
-    public void testCompareAndSetInMultipleThreads() {
+    public void testCompareAndSetInMultipleThreads() throws Exception {
         final AtomicStampedReference ai = new AtomicStampedReference(one, 0);
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    while(!ai.compareAndSet(two, three, 0, 0)) Thread.yield();
-                }});
-        try {
-            t.start();
-            assertTrue(ai.compareAndSet(one, two, 0, 0));
-            t.join(LONG_DELAY_MS);
-            assertFalse(t.isAlive());
-            assertEquals(ai.getReference(), three);
-            assertEquals(ai.getStamp(), 0);
-        }
-        catch(Exception e) {
-            unexpectedException();
-        }
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() {
+                while (!ai.compareAndSet(two, three, 0, 0))
+                    Thread.yield();
+            }});
+
+        t.start();
+        assertTrue(ai.compareAndSet(one, two, 0, 0));
+        t.join(LONG_DELAY_MS);
+        assertFalse(t.isAlive());
+        assertEquals(ai.getReference(), three);
+        assertEquals(ai.getStamp(), 0);
     }
 
     /**
      * compareAndSet in one thread enables another waiting for stamp value
      * to succeed
      */
-    public void testCompareAndSetInMultipleThreads2() {
+    public void testCompareAndSetInMultipleThreads2() throws Exception {
         final AtomicStampedReference ai = new AtomicStampedReference(one, 0);
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    while(!ai.compareAndSet(one, one, 1, 2)) Thread.yield();
-                }});
-        try {
-            t.start();
-            assertTrue(ai.compareAndSet(one, one, 0, 1));
-            t.join(LONG_DELAY_MS);
-            assertFalse(t.isAlive());
-            assertEquals(ai.getReference(), one);
-            assertEquals(ai.getStamp(), 2);
-        }
-        catch(Exception e) {
-            unexpectedException();
-        }
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() {
+                while (!ai.compareAndSet(one, one, 1, 2))
+                    Thread.yield();
+            }});
+
+        t.start();
+        assertTrue(ai.compareAndSet(one, one, 0, 1));
+        t.join(LONG_DELAY_MS);
+        assertFalse(t.isAlive());
+        assertEquals(ai.getReference(), one);
+        assertEquals(ai.getStamp(), 2);
     }
 
     /**
      * repeated weakCompareAndSet succeeds in changing values when equal
-     * to expected 
+     * to expected
      */
-    public void testWeakCompareAndSet(){
+    public void testWeakCompareAndSet() {
         int[] mark = new int[1];
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
 	assertEquals(one, ai.get(mark));
         assertEquals(0, ai.getStamp ());
 	assertEquals(0, mark[0]);
 
-        while(!ai.weakCompareAndSet(one, two, 0, 0));
+        while (!ai.weakCompareAndSet(one, two, 0, 0));
 	assertEquals(two, ai.get(mark));
 	assertEquals(0, mark[0]);
 
-        while(!ai.weakCompareAndSet(two, m3, 0, 1));
+        while (!ai.weakCompareAndSet(two, m3, 0, 1));
 	assertEquals(m3, ai.get(mark));
 	assertEquals(1, mark[0]);
     }