--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2009/11/02 20:28:31	1.11
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2009/12/01 09:56:28	1.18
@@ -10,12 +10,12 @@ import java.util.concurrent.atomic.*;
 import junit.framework.*;
 import java.util.*;
 
-public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase{
+public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase {
     volatile Integer x = null;
     Object z;
     Integer w;
 
-    public static void main(String[] args){
+    public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
@@ -25,47 +25,44 @@ public class AtomicReferenceFieldUpdater
     /**
      * Construction with non-existent field throws RuntimeException
      */
-    public void testConstructor(){
-        try{
+    public void testConstructor() {
+        try {
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "y");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
 
     /**
      * construction with field not of given type throws RuntimeException
      */
-    public void testConstructor2(){
-        try{
+    public void testConstructor2() {
+        try {
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
      * Constructor with non-volatile field throws exception
      */
-    public void testConstructor3(){
-        try{
+    public void testConstructor3() {
+        try {
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
      *  get returns the last value set or assigned
      */
-    public void testGetSet(){
+    public void testGetSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
         try {
             a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
@@ -73,17 +70,17 @@ 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));
     }
 
     /**
      *  get returns the last value lazySet by same thread
      */
-    public void testGetLazySet(){
+    public void testGetLazySet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
         try {
             a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
@@ -91,17 +88,17 @@ 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));
     }
 
     /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
-    public void testCompareAndSet(){
+    public void testCompareAndSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
         try {
             a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
@@ -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,27 +128,24 @@ 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);
     }
 
     /**
      * repeated weakCompareAndSet succeeds in changing value when equal
      * to expected
      */
-    public void testWeakCompareAndSet(){
+    public void testWeakCompareAndSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
         try {
             a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
@@ -159,17 +153,17 @@ 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));
     }
 
     /**
      * getAndSet returns previous value and sets to given value
      */
-    public void testGetAndSet(){
+    public void testGetAndSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
         try {
             a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
@@ -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));
     }
 
 }