--- jsr166/src/test/tck/AtomicStampedReferenceTest.java	2009/11/16 05:30:07	1.10
+++ jsr166/src/test/tck/AtomicStampedReferenceTest.java	2009/11/21 02:07:26	1.13
@@ -22,11 +22,11 @@ public class AtomicStampedReferenceTest
      */
     public void testConstructor() {
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
-	assertEquals(one,ai.getReference());
-	assertEquals(0, ai.getStamp());
+        assertEquals(one,ai.getReference());
+        assertEquals(0, ai.getStamp());
         AtomicStampedReference a2 = new AtomicStampedReference(null, 1);
-	assertNull(a2.getReference());
-	assertEquals(1, a2.getStamp());
+        assertNull(a2.getReference());
+        assertEquals(1, a2.getStamp());
 
     }
 
@@ -36,18 +36,18 @@ public class AtomicStampedReferenceTest
     public void testGetSet() {
         int[] mark = new int[1];
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
-	assertEquals(one,ai.getReference());
-	assertEquals(0, ai.getStamp());
+        assertEquals(one,ai.getReference());
+        assertEquals(0, ai.getStamp());
         assertEquals(one, ai.get(mark));
         assertEquals(0, mark[0]);
-	ai.set(two, 0);
-	assertEquals(two,ai.getReference());
-	assertEquals(0, ai.getStamp());
+        ai.set(two, 0);
+        assertEquals(two,ai.getReference());
+        assertEquals(0, ai.getStamp());
         assertEquals(two, ai.get(mark));
         assertEquals(0, mark[0]);
-	ai.set(one, 1);
-	assertEquals(one,ai.getReference());
-	assertEquals(1, ai.getStamp());
+        ai.set(one, 1);
+        assertEquals(one,ai.getReference());
+        assertEquals(1, ai.getStamp());
         assertEquals(one, ai.get(mark));
         assertEquals(1,mark[0]);
     }
@@ -60,7 +60,7 @@ public class AtomicStampedReferenceTest
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
         assertEquals(0, ai.getStamp());
         assertTrue(ai.attemptStamp(one, 1));
-	assertEquals(1, ai.getStamp());
+        assertEquals(1, ai.getStamp());
         assertEquals(one, ai.get(mark));
         assertEquals(1, mark[0]);
     }
@@ -72,67 +72,61 @@ public class AtomicStampedReferenceTest
     public void testCompareAndSet() {
         int[] mark = new int[1];
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
-	assertEquals(one, ai.get(mark));
+        assertEquals(one, ai.get(mark));
         assertEquals(0, ai.getStamp());
-	assertEquals(0, mark[0]);
+        assertEquals(0, mark[0]);
 
         assertTrue(ai.compareAndSet(one, two, 0, 0));
-	assertEquals(two, ai.get(mark));
-	assertEquals(0, mark[0]);
+        assertEquals(two, ai.get(mark));
+        assertEquals(0, mark[0]);
 
         assertTrue(ai.compareAndSet(two, m3, 0, 1));
-	assertEquals(m3, ai.get(mark));
-	assertEquals(1, mark[0]);
+        assertEquals(m3, ai.get(mark));
+        assertEquals(1, mark[0]);
 
         assertFalse(ai.compareAndSet(two, m3, 1, 1));
-	assertEquals(m3, ai.get(mark));
-	assertEquals(1, mark[0]);
+        assertEquals(m3, ai.get(mark));
+        assertEquals(1, mark[0]);
     }
 
     /**
      * 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);
     }
 
     /**
@@ -142,17 +136,17 @@ public class AtomicStampedReferenceTest
     public void testWeakCompareAndSet() {
         int[] mark = new int[1];
         AtomicStampedReference ai = new AtomicStampedReference(one, 0);
-	assertEquals(one, ai.get(mark));
+        assertEquals(one, ai.get(mark));
         assertEquals(0, ai.getStamp ());
-	assertEquals(0, mark[0]);
+        assertEquals(0, mark[0]);
 
         while (!ai.weakCompareAndSet(one, two, 0, 0));
-	assertEquals(two, ai.get(mark));
-	assertEquals(0, mark[0]);
+        assertEquals(two, ai.get(mark));
+        assertEquals(0, mark[0]);
 
         while (!ai.weakCompareAndSet(two, m3, 0, 1));
-	assertEquals(m3, ai.get(mark));
-	assertEquals(1, mark[0]);
+        assertEquals(m3, ai.get(mark));
+        assertEquals(1, mark[0]);
     }
 
 }