--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2011/06/10 20:17:11	1.25
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2021/01/26 13:33:05	1.38
@@ -6,125 +6,151 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase {
-    volatile Integer x = null;
+    volatile Item x = null;
+    protected volatile Item protectedField;
+    private volatile Item privateField;
     Object z;
-    Integer w;
+    Item w;
+    volatile int i;
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicReferenceFieldUpdaterTest.class);
     }
 
+    static AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> updaterFor(String fieldName) {
+        return AtomicReferenceFieldUpdater.newUpdater
+            (AtomicReferenceFieldUpdaterTest.class, Item.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) {}
+        } catch (RuntimeException success) {
+            assertNotNull(success.getCause());
+        }
     }
 
     /**
-     * construction with field not of given type throws RuntimeException
+     * construction with field not of given type throws ClassCastException
      */
     public void testConstructor2() {
         try {
-            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
-                a = AtomicReferenceFieldUpdater.newUpdater
-                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
+            updaterFor("z");
             shouldThrow();
-        } catch (RuntimeException success) {}
+        } catch (ClassCastException success) {}
     }
 
     /**
-     * Constructor with non-volatile field throws exception
+     * Constructor with non-volatile field throws IllegalArgumentException
      */
     public void testConstructor3() {
         try {
-            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
-                a = AtomicReferenceFieldUpdater.newUpdater
-                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
+            updaterFor("w");
             shouldThrow();
-        } catch (RuntimeException success) {}
+        } catch (IllegalArgumentException success) {}
+    }
+
+    /**
+     * Constructor with non-reference field throws ClassCastException
+     */
+    public void testConstructor4() {
+        try {
+            updaterFor("i");
+            shouldThrow();
+        } catch (ClassCastException success) {}
+    }
+
+    /**
+     * construction using private field from subclass throws RuntimeException
+     */
+    public void testPrivateFieldInSubclass() {
+        new NonNestmates.AtomicReferenceFieldUpdaterTestSubclass()
+            .checkPrivateAccess();
+    }
+
+    /**
+     * construction from unrelated class; package access is allowed,
+     * private access is not
+     */
+    public void testUnrelatedClassAccess() {
+        new NonNestmates().checkPackageAccess(this);
+        new NonNestmates().checkPrivateAccess(this);
     }
 
     /**
      * get returns the last value set or assigned
      */
     public void testGetSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> a;
+        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));
+        a.set(this, minusThree);
+        assertSame(minusThree, a.get(this));
     }
 
     /**
      * get returns the last value lazySet by same thread
      */
     public void testGetLazySet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> a;
+        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));
+        a.lazySet(this, minusThree);
+        assertSame(minusThree, a.get(this));
     }
 
     /**
-     * compareAndSet succeeds in changing value if equal to expected else fails
+     * compareAndSet succeeds in changing value if same as expected else fails
      */
     public void testCompareAndSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> a;
+        a = updaterFor("x");
         x = one;
         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));
+        assertTrue(a.compareAndSet(this, two, minusFour));
+        assertSame(minusFour, a.get(this));
+        assertFalse(a.compareAndSet(this, minusFive, seven));
+        assertNotSame(seven, a.get(this));
+        assertTrue(a.compareAndSet(this, minusFour, seven));
         assertSame(seven, a.get(this));
     }
 
     /**
+     * compareAndSet succeeds in changing protected field value if
+     * same as expected else fails
+     */
+    public void testCompareAndSetProtectedInSubclass() {
+        new NonNestmates.AtomicReferenceFieldUpdaterTestSubclass()
+            .checkCompareAndSetProtectedSub();
+    }
+
+    /**
      * compareAndSet in one thread enables another waiting for value
      * to succeed
      */
     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;
-        }
+        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> a;
+        a = updaterFor("x");
 
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
@@ -140,21 +166,16 @@ public class AtomicReferenceFieldUpdater
     }
 
     /**
-     * repeated weakCompareAndSet succeeds in changing value when equal
-     * to expected
+     * repeated weakCompareAndSet succeeds in changing value when same as expected
      */
     public void testWeakCompareAndSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> a;
+        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));
+        do {} while (!a.weakCompareAndSet(this, one, two));
+        do {} while (!a.weakCompareAndSet(this, two, minusFour));
+        assertSame(minusFour, a.get(this));
+        do {} while (!a.weakCompareAndSet(this, minusFour, seven));
         assertSame(seven, a.get(this));
     }
 
@@ -162,16 +183,12 @@ public class AtomicReferenceFieldUpdater
      * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
-        try {
-            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-        } catch (RuntimeException ok) {
-            return;
-        }
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> a;
+        a = updaterFor("x");
         x = one;
         assertSame(one, a.getAndSet(this, zero));
-        assertSame(zero, a.getAndSet(this, m10));
-        assertSame(m10, a.getAndSet(this, 1));
+        assertSame(zero, a.getAndSet(this, minusTen));
+        assertSame(minusTen, a.getAndSet(this, one));
     }
 
 }