--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2013/05/30 03:28:55	1.29
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2017/09/20 00:59:17	1.37
@@ -6,23 +6,27 @@
  * 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;
+    protected volatile Integer protectedField;
+    private volatile Integer privateField;
     Object z;
     Integer 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);
     }
 
-    AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> updaterFor(String fieldName) {
+    static AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> updaterFor(String fieldName) {
         return AtomicReferenceFieldUpdater.newUpdater
             (AtomicReferenceFieldUpdaterTest.class, Integer.class, fieldName);
     }
@@ -70,10 +74,27 @@ 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() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
         x = one;
         assertSame(one, a.get(this));
@@ -87,7 +108,7 @@ public class AtomicReferenceFieldUpdater
      * get returns the last value lazySet by same thread
      */
     public void testGetLazySet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
         x = one;
         assertSame(one, a.get(this));
@@ -98,28 +119,37 @@ 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;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> 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));
+        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
      */
     public void testCompareAndSetInMultipleThreads() throws Exception {
         x = one;
-        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
 
         Thread t = new Thread(new CheckedRunnable() {
@@ -136,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, Integer> a;
         a = updaterFor("x");
         x = one;
-        while (!a.weakCompareAndSet(this, one, two));
-        while (!a.weakCompareAndSet(this, two, m4));
+        do {} while (!a.weakCompareAndSet(this, one, two));
+        do {} while (!a.weakCompareAndSet(this, two, m4));
         assertSame(m4, a.get(this));
-        while (!a.weakCompareAndSet(this, m4, seven));
+        do {} while (!a.weakCompareAndSet(this, m4, seven));
         assertSame(seven, a.get(this));
     }
 
@@ -154,7 +183,7 @@ public class AtomicReferenceFieldUpdater
      * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
         x = one;
         assertSame(one, a.getAndSet(this, zero));