--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2011/05/27 19:39:07	1.20
+++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2013/04/01 20:58:58	1.24
@@ -6,9 +6,8 @@
  * Pat Fisher, Mike Judd.
  */
 
-import java.util.concurrent.atomic.*;
 import junit.framework.*;
-import java.util.*;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 
 public class AtomicLongFieldUpdaterTest extends JSR166TestCase {
     volatile long x = 0;
@@ -22,14 +21,17 @@ public class AtomicLongFieldUpdaterTest
         return new TestSuite(AtomicLongFieldUpdaterTest.class);
     }
 
+    AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> updaterFor(String fieldName) {
+        return AtomicLongFieldUpdater.newUpdater
+            (AtomicLongFieldUpdaterTest.class, fieldName);
+    }
+
     /**
      * Construction with non-existent field throws RuntimeException
      */
     public void testConstructor() {
         try {
-            AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest>
-                a = AtomicLongFieldUpdater.newUpdater
-                (AtomicLongFieldUpdaterTest.class, "y");
+            updaterFor("y");
             shouldThrow();
         } catch (RuntimeException success) {}
     }
@@ -39,9 +41,7 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testConstructor2() {
         try {
-            AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest>
-                a = AtomicLongFieldUpdater.newUpdater
-                (AtomicLongFieldUpdaterTest.class, "z");
+            updaterFor("z");
             shouldThrow();
         } catch (RuntimeException success) {}
     }
@@ -51,9 +51,7 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testConstructor3() {
         try {
-            AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest>
-                a = AtomicLongFieldUpdater.newUpdater
-                (AtomicLongFieldUpdaterTest.class, "w");
+            updaterFor("w");
             shouldThrow();
         } catch (RuntimeException success) {}
     }
@@ -63,17 +61,13 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testGetSet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(1,a.get(this));
-        a.set(this,2);
-        assertEquals(2,a.get(this));
-        a.set(this,-3);
-        assertEquals(-3,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(1, a.get(this));
+        a.set(this, 2);
+        assertEquals(2, a.get(this));
+        a.set(this, -3);
+        assertEquals(-3, a.get(this));
     }
 
     /**
@@ -81,17 +75,13 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testGetLazySet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(1,a.get(this));
-        a.lazySet(this,2);
-        assertEquals(2,a.get(this));
-        a.lazySet(this,-3);
-        assertEquals(-3,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(1, a.get(this));
+        a.lazySet(this, 2);
+        assertEquals(2, a.get(this));
+        a.lazySet(this, -3);
+        assertEquals(-3, a.get(this));
     }
 
     /**
@@ -99,19 +89,15 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testCompareAndSet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertTrue(a.compareAndSet(this,1,2));
-        assertTrue(a.compareAndSet(this,2,-4));
-        assertEquals(-4,a.get(this));
-        assertFalse(a.compareAndSet(this,-5,7));
-        assertEquals(-4,a.get(this));
-        assertTrue(a.compareAndSet(this,-4,7));
-        assertEquals(7,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        assertTrue(a.compareAndSet(this, 1, 2));
+        assertTrue(a.compareAndSet(this, 2, -4));
+        assertEquals(-4, a.get(this));
+        assertFalse(a.compareAndSet(this, -5, 7));
+        assertEquals(-4, a.get(this));
+        assertTrue(a.compareAndSet(this, -4, 7));
+        assertEquals(7, a.get(this));
     }
 
     /**
@@ -120,12 +106,8 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testCompareAndSetInMultipleThreads() throws Exception {
         x = 1;
-        final AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest>a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
+        final AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        a = updaterFor("x");
 
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
@@ -137,7 +119,7 @@ public class AtomicLongFieldUpdaterTest
         assertTrue(a.compareAndSet(this, 1, 2));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertEquals(a.get(this), 3);
+        assertEquals(3, a.get(this));
     }
 
     /**
@@ -146,17 +128,13 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testWeakCompareAndSet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        while (!a.weakCompareAndSet(this,1,2));
-        while (!a.weakCompareAndSet(this,2,-4));
-        assertEquals(-4,a.get(this));
-        while (!a.weakCompareAndSet(this,-4,7));
-        assertEquals(7,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        while (!a.weakCompareAndSet(this, 1, 2));
+        while (!a.weakCompareAndSet(this, 2, -4));
+        assertEquals(-4, a.get(this));
+        while (!a.weakCompareAndSet(this, -4, 7));
+        assertEquals(7, a.get(this));
     }
 
     /**
@@ -164,15 +142,11 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testGetAndSet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(1,a.getAndSet(this, 0));
-        assertEquals(0,a.getAndSet(this,-10));
-        assertEquals(-10,a.getAndSet(this,1));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(1, a.getAndSet(this, 0));
+        assertEquals(0, a.getAndSet(this, -10));
+        assertEquals(-10, a.getAndSet(this, 1));
     }
 
     /**
@@ -180,16 +154,12 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testGetAndAdd() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(1,a.getAndAdd(this,2));
-        assertEquals(3,a.get(this));
-        assertEquals(3,a.getAndAdd(this,-4));
-        assertEquals(-1,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(1, a.getAndAdd(this, 2));
+        assertEquals(3, a.get(this));
+        assertEquals(3, a.getAndAdd(this, -4));
+        assertEquals(-1, a.get(this));
     }
 
     /**
@@ -197,15 +167,11 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testGetAndDecrement() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(1,a.getAndDecrement(this));
-        assertEquals(0,a.getAndDecrement(this));
-        assertEquals(-1,a.getAndDecrement(this));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(1, a.getAndDecrement(this));
+        assertEquals(0, a.getAndDecrement(this));
+        assertEquals(-1, a.getAndDecrement(this));
     }
 
     /**
@@ -213,19 +179,15 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testGetAndIncrement() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(1,a.getAndIncrement(this));
-        assertEquals(2,a.get(this));
-        a.set(this,-2);
-        assertEquals(-2,a.getAndIncrement(this));
-        assertEquals(-1,a.getAndIncrement(this));
-        assertEquals(0,a.getAndIncrement(this));
-        assertEquals(1,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(1, a.getAndIncrement(this));
+        assertEquals(2, a.get(this));
+        a.set(this, -2);
+        assertEquals(-2, a.getAndIncrement(this));
+        assertEquals(-1, a.getAndIncrement(this));
+        assertEquals(0, a.getAndIncrement(this));
+        assertEquals(1, a.get(this));
     }
 
     /**
@@ -233,16 +195,12 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testAddAndGet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(3,a.addAndGet(this,2));
-        assertEquals(3,a.get(this));
-        assertEquals(-1,a.addAndGet(this,-4));
-        assertEquals(-1,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(3, a.addAndGet(this, 2));
+        assertEquals(3, a.get(this));
+        assertEquals(-1, a.addAndGet(this, -4));
+        assertEquals(-1, a.get(this));
     }
 
     /**
@@ -250,16 +208,12 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testDecrementAndGet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(0,a.decrementAndGet(this));
-        assertEquals(-1,a.decrementAndGet(this));
-        assertEquals(-2,a.decrementAndGet(this));
-        assertEquals(-2,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(0, a.decrementAndGet(this));
+        assertEquals(-1, a.decrementAndGet(this));
+        assertEquals(-2, a.decrementAndGet(this));
+        assertEquals(-2, a.get(this));
     }
 
     /**
@@ -267,19 +221,15 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testIncrementAndGet() {
         AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
-        try {
-            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
-        x = 1;
-        assertEquals(2,a.incrementAndGet(this));
-        assertEquals(2,a.get(this));
-        a.set(this,-2);
-        assertEquals(-1,a.incrementAndGet(this));
-        assertEquals(0,a.incrementAndGet(this));
-        assertEquals(1,a.incrementAndGet(this));
-        assertEquals(1,a.get(this));
+        a = updaterFor("x");
+        x = 1;
+        assertEquals(2, a.incrementAndGet(this));
+        assertEquals(2, a.get(this));
+        a.set(this, -2);
+        assertEquals(-1, a.incrementAndGet(this));
+        assertEquals(0, a.incrementAndGet(this));
+        assertEquals(1, a.incrementAndGet(this));
+        assertEquals(1, a.get(this));
     }
 
 }