--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2015/11/09 18:42:41	1.34
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2021/01/26 13:33:05	1.38
@@ -12,11 +12,11 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase {
-    volatile Integer x = null;
-    protected volatile Integer protectedField;
-    private volatile Integer privateField;
+    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) {
@@ -26,60 +26,9 @@ public class AtomicReferenceFieldUpdater
         return new TestSuite(AtomicReferenceFieldUpdaterTest.class);
     }
 
-    // for testing subclass access
-    static class AtomicReferenceFieldUpdaterTestSubclass extends AtomicReferenceFieldUpdaterTest {
-        public void checkPrivateAccess() {
-            try {
-                AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest,Integer> a =
-                    AtomicReferenceFieldUpdater.newUpdater
-                    (AtomicReferenceFieldUpdaterTest.class, Integer.class, "privateField");
-                shouldThrow();
-            } catch (RuntimeException success) {
-                assertNotNull(success.getCause());
-            }
-        }
-
-        public void checkCompareAndSetProtectedSub() {
-            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest,Integer> a =
-                AtomicReferenceFieldUpdater.newUpdater
-                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "protectedField");
-            this.protectedField = 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));
-            assertSame(seven, a.get(this));
-        }
-    }
-
-    static class UnrelatedClass {
-        public void checkPackageAccess(AtomicReferenceFieldUpdaterTest obj) {
-            obj.x = one;
-            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest,Integer> a =
-                AtomicReferenceFieldUpdater.newUpdater
-                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
-            assertSame(one, a.get(obj));
-            assertTrue(a.compareAndSet(obj, one, two));
-            assertSame(two, a.get(obj));
-        }
-
-        public void checkPrivateAccess(AtomicReferenceFieldUpdaterTest obj) {
-            try {
-                AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest,Integer> a =
-                    AtomicReferenceFieldUpdater.newUpdater
-                    (AtomicReferenceFieldUpdaterTest.class, Integer.class, "privateField");
-                throw new AssertionError("should throw");
-            } catch (RuntimeException success) {
-                assertNotNull(success.getCause());
-            }
-        }
-    }
-
-    static AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> updaterFor(String fieldName) {
+    static AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> updaterFor(String fieldName) {
         return AtomicReferenceFieldUpdater.newUpdater
-            (AtomicReferenceFieldUpdaterTest.class, Integer.class, fieldName);
+            (AtomicReferenceFieldUpdaterTest.class, Item.class, fieldName);
     }
 
     /**
@@ -128,9 +77,8 @@ public class AtomicReferenceFieldUpdater
      * construction using private field from subclass throws RuntimeException
      */
     public void testPrivateFieldInSubclass() {
-        AtomicReferenceFieldUpdaterTestSubclass s =
-            new AtomicReferenceFieldUpdaterTestSubclass();
-        s.checkPrivateAccess();
+        new NonNestmates.AtomicReferenceFieldUpdaterTestSubclass()
+            .checkPrivateAccess();
     }
 
     /**
@@ -138,61 +86,70 @@ public class AtomicReferenceFieldUpdater
      * private access is not
      */
     public void testUnrelatedClassAccess() {
-        new UnrelatedClass().checkPackageAccess(this);
-        new UnrelatedClass().checkPrivateAccess(this);
+        new NonNestmates().checkPackageAccess(this);
+        new NonNestmates().checkPrivateAccess(this);
     }
 
     /**
      * get returns the last value set or assigned
      */
     public void testGetSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
+        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;
+        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;
+        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;
+        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> a;
         a = updaterFor("x");
 
         Thread t = new Thread(new CheckedRunnable() {
@@ -209,17 +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;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Item> a;
         a = updaterFor("x");
         x = one;
         do {} while (!a.weakCompareAndSet(this, one, two));
-        do {} while (!a.weakCompareAndSet(this, two, m4));
-        assertSame(m4, a.get(this));
-        do {} while (!a.weakCompareAndSet(this, m4, seven));
+        do {} while (!a.weakCompareAndSet(this, two, minusFour));
+        assertSame(minusFour, a.get(this));
+        do {} while (!a.weakCompareAndSet(this, minusFour, seven));
         assertSame(seven, a.get(this));
     }
 
@@ -227,12 +183,12 @@ public class AtomicReferenceFieldUpdater
      * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
+        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));
     }
 
 }