--- jsr166/src/test/tck/AtomicReferenceTest.java	2016/06/17 01:38:28	1.26
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2016/06/17 19:00:48	1.27
@@ -134,168 +134,10 @@ 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());
     }
 
-    // jdk9
-
-    /**
-     * getPlain returns the last value set
-     */
-    public void testGetPlainSet() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.getPlain());
-        ai.set(two);
-        assertEquals(two, ai.getPlain());
-        ai.set(m3);
-        assertEquals(m3, ai.getPlain());
-    }
-
-    /**
-     * getOpaque returns the last value set
-     */
-    public void testGetOpaqueSet() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.getOpaque());
-        ai.set(two);
-        assertEquals(two, ai.getOpaque());
-        ai.set(m3);
-        assertEquals(m3, ai.getOpaque());
-    }
-
-    /**
-     * getAcquire returns the last value set
-     */
-    public void testGetAcquireSet() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.getAcquire());
-        ai.set(two);
-        assertEquals(two, ai.getAcquire());
-        ai.set(m3);
-        assertEquals(m3, ai.getAcquire());
-    }
-
-    /**
-     * get returns the last value setPlain
-     */
-    public void testGetSetPlain() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.get());
-        ai.setPlain(two);
-        assertEquals(two, ai.get());
-        ai.setPlain(m3);
-        assertEquals(m3, ai.get());
-    }
-
-    /**
-     * get returns the last value setOpaque
-     */
-    public void testGetSetOpaque() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.get());
-        ai.setOpaque(two);
-        assertEquals(two, ai.get());
-        ai.setOpaque(m3);
-        assertEquals(m3, ai.get());
-    }
-
-    /**
-     * get returns the last value setRelease
-     */
-    public void testGetSetRelease() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.get());
-        ai.setRelease(two);
-        assertEquals(two, ai.get());
-        ai.setRelease(m3);
-        assertEquals(m3, ai.get());
-    }
-
-    /**
-     * compareAndExchange succeeds in changing value if equal to
-     * expected else fails
-     */
-    public void testCompareAndExchange() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.compareAndExchange(one, two));
-        assertEquals(two, ai.compareAndExchange(two, m4));
-        assertEquals(m4, ai.get());
-        assertEquals(m4, ai.compareAndExchange(m5, seven));
-        assertEquals(m4, ai.get());
-        assertEquals(m4, ai.compareAndExchange(m4, seven));
-        assertEquals(seven, ai.get());
-    }
-
-    /**
-     * compareAndExchangeAcquire succeeds in changing value if equal to
-     * expected else fails
-     */
-    public void testCompareAndExchangeAcquire() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.compareAndExchangeAcquire(one, two));
-        assertEquals(two, ai.compareAndExchangeAcquire(two, m4));
-        assertEquals(m4, ai.get());
-        assertEquals(m4, ai.compareAndExchangeAcquire(m5, seven));
-        assertEquals(m4, ai.get());
-        assertEquals(m4, ai.compareAndExchangeAcquire(m4, seven));
-        assertEquals(seven, ai.get());
-    }
-
-    /**
-     * compareAndExchangeRelease succeeds in changing value if equal to
-     * expected else fails
-     */
-    public void testCompareAndExchangeRelease() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        assertEquals(one, ai.compareAndExchangeRelease(one, two));
-        assertEquals(two, ai.compareAndExchangeRelease(two, m4));
-        assertEquals(m4, ai.get());
-        assertEquals(m4, ai.compareAndExchangeRelease(m5, seven));
-        assertEquals(m4, ai.get());
-        assertEquals(m4, ai.compareAndExchangeRelease(m4, seven));
-        assertEquals(seven, ai.get());
-    }
-
-    /**
-     * repeated weakCompareAndSetVolatile succeeds in changing value when equal
-     * to expected
-     */
-    public void testWeakCompareAndSetVolatile() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        do {} while (!ai.weakCompareAndSetVolatile(one, two));
-        do {} while (!ai.weakCompareAndSetVolatile(two, m4));
-        assertEquals(m4, ai.get());
-        do {} while (!ai.weakCompareAndSetVolatile(m4, seven));
-        assertEquals(seven, ai.get());
-    }
-
-    /**
-     * repeated weakCompareAndSetAcquire succeeds in changing value when equal
-     * to expected
-     */
-    public void testWeakCompareAndSetAcquire() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        do {} while (!ai.weakCompareAndSetAcquire(one, two));
-        do {} while (!ai.weakCompareAndSetAcquire(two, m4));
-        assertEquals(m4, ai.get());
-        do {} while (!ai.weakCompareAndSetAcquire(m4, seven));
-        assertEquals(seven, ai.get());
-    }
-
-    /**
-     * repeated weakCompareAndSetRelease succeeds in changing value when equal
-     * to expected
-     */
-    public void testWeakCompareAndSetRelease() {
-        AtomicReference<Integer> ai = new AtomicReference<Integer>(one);
-        do {} while (!ai.weakCompareAndSetRelease(one, two));
-        do {} while (!ai.weakCompareAndSetRelease(two, m4));
-        assertEquals(m4, ai.get());
-        do {} while (!ai.weakCompareAndSetRelease(m4, seven));
-        assertEquals(seven, ai.get());
-    }
-
 }