--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2015/04/25 04:55:30	1.33
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2017/09/20 00:59:17	1.37
@@ -13,6 +13,8 @@ import junit.framework.TestSuite;
 
 public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase {
     volatile Integer x = null;
+    protected volatile Integer protectedField;
+    private volatile Integer privateField;
     Object z;
     Integer w;
     volatile int i;
@@ -24,7 +26,7 @@ public class AtomicReferenceFieldUpdater
         return new TestSuite(AtomicReferenceFieldUpdaterTest.class);
     }
 
-    AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> updaterFor(String fieldName) {
+    static AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> updaterFor(String fieldName) {
         return AtomicReferenceFieldUpdater.newUpdater
             (AtomicReferenceFieldUpdaterTest.class, Integer.class, fieldName);
     }
@@ -72,6 +74,23 @@ public class AtomicReferenceFieldUpdater
     }
 
     /**
+     * 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() {
@@ -100,7 +119,7 @@ public class AtomicReferenceFieldUpdater
     }
 
     /**
-     * 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;
@@ -110,12 +129,21 @@ public class AtomicReferenceFieldUpdater
         assertTrue(a.compareAndSet(this, two, m4));
         assertSame(m4, a.get(this));
         assertFalse(a.compareAndSet(this, m5, seven));
-        assertFalse(seven == a.get(this));
+        assertNotSame(seven, a.get(this));
         assertTrue(a.compareAndSet(this, m4, 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
      */
@@ -138,8 +166,7 @@ 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;