--- jsr166/src/test/tck/AtomicReferenceTest.java	2009/11/16 04:57:10	1.10
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2009/11/21 02:07:26	1.14
@@ -21,122 +21,115 @@ public class AtomicReferenceTest extends
     /**
      * constructor initializes to given value
      */
-    public void testConstructor(){
+    public void testConstructor() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.get());
+        assertEquals(one,ai.get());
     }
 
     /**
      * default constructed initializes to null
      */
-    public void testConstructor2(){
+    public void testConstructor2() {
         AtomicReference ai = new AtomicReference();
-	assertNull(ai.get());
+        assertNull(ai.get());
     }
 
     /**
      * get returns the last value set
      */
-    public void testGetSet(){
+    public void testGetSet() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.get());
-	ai.set(two);
-	assertEquals(two,ai.get());
-	ai.set(m3);
-	assertEquals(m3,ai.get());
+        assertEquals(one,ai.get());
+        ai.set(two);
+        assertEquals(two,ai.get());
+        ai.set(m3);
+        assertEquals(m3,ai.get());
     }
 
     /**
      * get returns the last value lazySet in same thread
      */
-    public void testGetLazySet(){
+    public void testGetLazySet() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.get());
-	ai.lazySet(two);
-	assertEquals(two,ai.get());
-	ai.lazySet(m3);
-	assertEquals(m3,ai.get());
+        assertEquals(one,ai.get());
+        ai.lazySet(two);
+        assertEquals(two,ai.get());
+        ai.lazySet(m3);
+        assertEquals(m3,ai.get());
     }
 
     /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
-    public void testCompareAndSet(){
+    public void testCompareAndSet() {
         AtomicReference ai = new AtomicReference(one);
-	assertTrue(ai.compareAndSet(one,two));
-	assertTrue(ai.compareAndSet(two,m4));
-	assertEquals(m4,ai.get());
-	assertFalse(ai.compareAndSet(m5,seven));
-	assertFalse((seven.equals(ai.get())));
-	assertTrue(ai.compareAndSet(m4,seven));
-	assertEquals(seven,ai.get());
+        assertTrue(ai.compareAndSet(one,two));
+        assertTrue(ai.compareAndSet(two,m4));
+        assertEquals(m4,ai.get());
+        assertFalse(ai.compareAndSet(m5,seven));
+        assertFalse((seven.equals(ai.get())));
+        assertTrue(ai.compareAndSet(m4,seven));
+        assertEquals(seven,ai.get());
     }
 
     /**
      * compareAndSet in one thread enables another waiting for value
      * to succeed
      */
-    public void testCompareAndSetInMultipleThreads() {
+    public void testCompareAndSetInMultipleThreads() throws Exception {
         final AtomicReference ai = new AtomicReference(one);
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    while (!ai.compareAndSet(two, three)) Thread.yield();
-                }});
-        try {
-            t.start();
-            assertTrue(ai.compareAndSet(one, two));
-            t.join(LONG_DELAY_MS);
-            assertFalse(t.isAlive());
-            assertEquals(ai.get(), three);
-        }
-        catch (Exception e) {
-            unexpectedException();
-        }
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() {
+                while (!ai.compareAndSet(two, three))
+                    Thread.yield();
+            }});
+
+        t.start();
+        assertTrue(ai.compareAndSet(one, two));
+        t.join(LONG_DELAY_MS);
+        assertFalse(t.isAlive());
+        assertEquals(ai.get(), three);
     }
 
     /**
      * repeated weakCompareAndSet succeeds in changing value when equal
      * to expected
      */
-    public void testWeakCompareAndSet(){
+    public void testWeakCompareAndSet() {
         AtomicReference ai = new AtomicReference(one);
-	while (!ai.weakCompareAndSet(one,two));
-	while (!ai.weakCompareAndSet(two,m4));
-	assertEquals(m4,ai.get());
+        while (!ai.weakCompareAndSet(one,two));
+        while (!ai.weakCompareAndSet(two,m4));
+        assertEquals(m4,ai.get());
         while (!ai.weakCompareAndSet(m4,seven));
-	assertEquals(seven,ai.get());
+        assertEquals(seven,ai.get());
     }
 
     /**
      * getAndSet returns previous value and sets to given value
      */
-    public void testGetAndSet(){
+    public void testGetAndSet() {
         AtomicReference ai = new AtomicReference(one);
-	assertEquals(one,ai.getAndSet(zero));
-	assertEquals(zero,ai.getAndSet(m10));
-	assertEquals(m10,ai.getAndSet(one));
+        assertEquals(one,ai.getAndSet(zero));
+        assertEquals(zero,ai.getAndSet(m10));
+        assertEquals(m10,ai.getAndSet(one));
     }
 
     /**
      * a deserialized serialized atomic holds same value
      */
-    public void testSerialization() {
+    public void testSerialization() throws Exception {
         AtomicReference l = new AtomicReference();
 
-        try {
-            l.set(one);
-            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
-            out.writeObject(l);
-            out.close();
-
-            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
-            AtomicReference r = (AtomicReference) in.readObject();
-            assertEquals(l.get(), r.get());
-        } catch (Exception e){
-            unexpectedException();
-        }
+        l.set(one);
+        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
+        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
+        out.writeObject(l);
+        out.close();
+
+        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
+        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
+        AtomicReference r = (AtomicReference) in.readObject();
+        assertEquals(l.get(), r.get());
     }
 
     /**