--- jsr166/src/test/tck/AtomicReferenceTest.java	2014/12/31 19:05:42	1.22
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2017/08/04 03:30:21	1.29
@@ -13,7 +13,7 @@ import junit.framework.TestSuite;
 
 public class AtomicReferenceTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicReferenceTest.class);
@@ -98,10 +98,10 @@ public class AtomicReferenceTest extends
      */
     public void testWeakCompareAndSet() {
         AtomicReference ai = new AtomicReference(one);
-        while (!ai.weakCompareAndSet(one, two));
-        while (!ai.weakCompareAndSet(two, m4));
+        do {} while (!ai.weakCompareAndSet(one, two));
+        do {} while (!ai.weakCompareAndSet(two, m4));
         assertSame(m4, ai.get());
-        while (!ai.weakCompareAndSet(m4, seven));
+        do {} while (!ai.weakCompareAndSet(m4, seven));
         assertSame(seven, ai.get());
     }
 
@@ -116,7 +116,7 @@ public class AtomicReferenceTest extends
     }
 
     /**
-     * a deserialized serialized atomic holds same value
+     * a deserialized/reserialized atomic holds same value
      */
     public void testSerialization() throws Exception {
         AtomicReference x = new AtomicReference();
@@ -126,7 +126,7 @@ public class AtomicReferenceTest extends
         AtomicReference z = serialClone(x);
         assertNotSame(y, z);
         assertEquals(one, x.get());
-        assertEquals(null, y.get());
+        assertNull(y.get());
         assertEquals(one, z.get());
     }
 
@@ -134,7 +134,7 @@ public class AtomicReferenceTest extends
      * toString returns current value.
      */
     public void testToString() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
+        AtomicReference<Integer> ai = new AtomicReference<>(one);
         assertEquals(one.toString(), ai.toString());
         ai.set(two);
         assertEquals(two.toString(), ai.toString());