--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2009/11/16 05:30:07	1.13
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2010/09/16 00:52:49	1.19
@@ -31,8 +31,7 @@ public class AtomicReferenceFieldUpdater
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "y");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
 
@@ -45,8 +44,7 @@ public class AtomicReferenceFieldUpdater
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
@@ -58,8 +56,7 @@ public class AtomicReferenceFieldUpdater
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
@@ -73,11 +70,11 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-	assertEquals(one,a.get(this));
-	a.set(this,two);
-	assertEquals(two,a.get(this));
-	a.set(this,m3);
-	assertEquals(m3,a.get(this));
+        assertSame(one,a.get(this));
+        a.set(this,two);
+        assertSame(two,a.get(this));
+        a.set(this,m3);
+        assertSame(m3,a.get(this));
     }
 
     /**
@@ -91,11 +88,11 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-	assertEquals(one,a.get(this));
-	a.lazySet(this,two);
-	assertEquals(two,a.get(this));
-	a.lazySet(this,m3);
-	assertEquals(m3,a.get(this));
+        assertSame(one,a.get(this));
+        a.lazySet(this,two);
+        assertSame(two,a.get(this));
+        a.lazySet(this,m3);
+        assertSame(m3,a.get(this));
     }
 
     /**
@@ -109,20 +106,20 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-	assertTrue(a.compareAndSet(this,one,two));
-	assertTrue(a.compareAndSet(this,two,m4));
-	assertEquals(m4,a.get(this));
-	assertFalse(a.compareAndSet(this,m5,seven));
-	assertFalse((seven == a.get(this)));
-	assertTrue(a.compareAndSet(this,m4,seven));
-	assertEquals(seven,a.get(this));
+        assertTrue(a.compareAndSet(this, one, two));
+        assertTrue(a.compareAndSet(this, two, m4));
+        assertSame(m4, a.get(this));
+        assertFalse(a.compareAndSet(this, m5, seven));
+        assertFalse(seven == a.get(this));
+        assertTrue(a.compareAndSet(this, m4, seven));
+        assertSame(seven,a.get(this));
     }
 
     /**
      * compareAndSet in one thread enables another waiting for value
      * to succeed
      */
-    public void testCompareAndSetInMultipleThreads() {
+    public void testCompareAndSetInMultipleThreads() throws Exception {
         x = one;
         final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
         try {
@@ -131,20 +128,17 @@ public class AtomicReferenceFieldUpdater
             return;
         }
 
-        Thread t = new Thread(new Runnable() {
-                public void run() {
-                    while (!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three)) Thread.yield();
-                }});
-        try {
-            t.start();
-            assertTrue(a.compareAndSet(this, one, two));
-            t.join(LONG_DELAY_MS);
-            assertFalse(t.isAlive());
-            assertEquals(a.get(this), three);
-        }
-        catch (Exception e) {
-            unexpectedException();
-        }
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() {
+                while (!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three))
+                    Thread.yield();
+            }});
+
+        t.start();
+        assertTrue(a.compareAndSet(this, one, two));
+        t.join(LONG_DELAY_MS);
+        assertFalse(t.isAlive());
+        assertSame(a.get(this), three);
     }
 
     /**
@@ -159,11 +153,11 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-	while (!a.weakCompareAndSet(this,one,two));
-	while (!a.weakCompareAndSet(this,two,m4));
-	assertEquals(m4,a.get(this));
-	while (!a.weakCompareAndSet(this,m4,seven));
-	assertEquals(seven,a.get(this));
+        while (!a.weakCompareAndSet(this,one,two));
+        while (!a.weakCompareAndSet(this,two,m4));
+        assertSame(m4,a.get(this));
+        while (!a.weakCompareAndSet(this,m4,seven));
+        assertSame(seven,a.get(this));
     }
 
     /**
@@ -177,9 +171,9 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-	assertEquals(one,a.getAndSet(this, zero));
-	assertEquals(zero,a.getAndSet(this,m10));
-	assertEquals(m10,a.getAndSet(this,1));
+        assertSame(one,a.getAndSet(this, zero));
+        assertSame(zero,a.getAndSet(this,m10));
+        assertSame(m10,a.getAndSet(this,1));
     }
 
 }