--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2011/05/31 16:16:23	1.23
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2013/04/01 20:58:58	1.26
@@ -21,14 +21,17 @@ public class AtomicReferenceFieldUpdater
         return new TestSuite(AtomicReferenceFieldUpdaterTest.class);
     }
 
+    AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> updaterFor(String fieldName) {
+        return AtomicReferenceFieldUpdater.newUpdater
+            (AtomicReferenceFieldUpdaterTest.class, Integer.class, fieldName);
+    }
+
     /**
      * Construction with non-existent field throws RuntimeException
      */
     public void testConstructor() {
         try {
-            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
-                a = AtomicReferenceFieldUpdater.newUpdater
-                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "y");
+            updaterFor("y");
             shouldThrow();
         } catch (RuntimeException success) {}
     }
@@ -38,9 +41,7 @@ public class AtomicReferenceFieldUpdater
      */
     public void testConstructor2() {
         try {
-            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
-                a = AtomicReferenceFieldUpdater.newUpdater
-                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
+            updaterFor("z");
             shouldThrow();
         } catch (RuntimeException success) {}
     }
@@ -50,9 +51,7 @@ public class AtomicReferenceFieldUpdater
      */
     public void testConstructor3() {
         try {
-            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
-                a = AtomicReferenceFieldUpdater.newUpdater
-                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
+            updaterFor("w");
             shouldThrow();
         } catch (RuntimeException success) {}
     }
@@ -62,17 +61,13 @@ public class AtomicReferenceFieldUpdater
      */
     public void testGetSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = one;
-        assertSame(one,a.get(this));
-        a.set(this,two);
-        assertSame(two,a.get(this));
-        a.set(this,m3);
-        assertSame(m3,a.get(this));
+        a = updaterFor("x");
+        x = one;
+        assertSame(one, a.get(this));
+        a.set(this, two);
+        assertSame(two, a.get(this));
+        a.set(this, m3);
+        assertSame(m3, a.get(this));
     }
 
     /**
@@ -80,17 +75,13 @@ public class AtomicReferenceFieldUpdater
      */
     public void testGetLazySet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = one;
-        assertSame(one,a.get(this));
-        a.lazySet(this,two);
-        assertSame(two,a.get(this));
-        a.lazySet(this,m3);
-        assertSame(m3,a.get(this));
+        a = updaterFor("x");
+        x = one;
+        assertSame(one, a.get(this));
+        a.lazySet(this, two);
+        assertSame(two, a.get(this));
+        a.lazySet(this, m3);
+        assertSame(m3, a.get(this));
     }
 
     /**
@@ -98,11 +89,7 @@ public class AtomicReferenceFieldUpdater
      */
     public void testCompareAndSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
+        a = updaterFor("x");
         x = one;
         assertTrue(a.compareAndSet(this, one, two));
         assertTrue(a.compareAndSet(this, two, m4));
@@ -110,7 +97,7 @@ public class AtomicReferenceFieldUpdater
         assertFalse(a.compareAndSet(this, m5, seven));
         assertFalse(seven == a.get(this));
         assertTrue(a.compareAndSet(this, m4, seven));
-        assertSame(seven,a.get(this));
+        assertSame(seven, a.get(this));
     }
 
     /**
@@ -120,11 +107,7 @@ public class AtomicReferenceFieldUpdater
     public void testCompareAndSetInMultipleThreads() throws Exception {
         x = one;
         final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
+        a = updaterFor("x");
 
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
@@ -136,7 +119,7 @@ public class AtomicReferenceFieldUpdater
         assertTrue(a.compareAndSet(this, one, two));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertSame(a.get(this), three);
+        assertSame(three, a.get(this));
     }
 
     /**
@@ -145,17 +128,13 @@ public class AtomicReferenceFieldUpdater
      */
     public void testWeakCompareAndSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = one;
-        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));
+        a = updaterFor("x");
+        x = one;
+        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));
     }
 
     /**
@@ -163,15 +142,11 @@ public class AtomicReferenceFieldUpdater
      */
     public void testGetAndSet() {
         AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = one;
-        assertSame(one,a.getAndSet(this, zero));
-        assertSame(zero,a.getAndSet(this,m10));
-        assertSame(m10,a.getAndSet(this,1));
+        a = updaterFor("x");
+        x = one;
+        assertSame(one, a.getAndSet(this, zero));
+        assertSame(zero, a.getAndSet(this, m10));
+        assertSame(m10, a.getAndSet(this, 1));
     }
 
 }