--- jsr166/src/test/tck/AtomicReference9Test.java	2016/10/11 20:38:07	1.2
+++ jsr166/src/test/tck/AtomicReference9Test.java	2021/01/26 13:33:05	1.3
@@ -21,72 +21,72 @@ public class AtomicReference9Test extend
      * getPlain returns the last value set
      */
     public void testGetPlainSet() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
-        assertEquals(one, ai.getPlain());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.getPlain());
         ai.set(two);
-        assertEquals(two, ai.getPlain());
-        ai.set(m3);
-        assertEquals(m3, ai.getPlain());
+        mustEqual(two, ai.getPlain());
+        ai.set(minusThree);
+        mustEqual(minusThree, ai.getPlain());
     }
 
     /**
      * getOpaque returns the last value set
      */
     public void testGetOpaqueSet() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
-        assertEquals(one, ai.getOpaque());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.getOpaque());
         ai.set(two);
-        assertEquals(two, ai.getOpaque());
-        ai.set(m3);
-        assertEquals(m3, ai.getOpaque());
+        mustEqual(two, ai.getOpaque());
+        ai.set(minusThree);
+        mustEqual(minusThree, ai.getOpaque());
     }
 
     /**
      * getAcquire returns the last value set
      */
     public void testGetAcquireSet() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
-        assertEquals(one, ai.getAcquire());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.getAcquire());
         ai.set(two);
-        assertEquals(two, ai.getAcquire());
-        ai.set(m3);
-        assertEquals(m3, ai.getAcquire());
+        mustEqual(two, ai.getAcquire());
+        ai.set(minusThree);
+        mustEqual(minusThree, ai.getAcquire());
     }
 
     /**
      * get returns the last value setPlain
      */
     public void testGetSetPlain() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
-        assertEquals(one, ai.get());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.get());
         ai.setPlain(two);
-        assertEquals(two, ai.get());
-        ai.setPlain(m3);
-        assertEquals(m3, ai.get());
+        mustEqual(two, ai.get());
+        ai.setPlain(minusThree);
+        mustEqual(minusThree, ai.get());
     }
 
     /**
      * get returns the last value setOpaque
      */
     public void testGetSetOpaque() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
-        assertEquals(one, ai.get());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.get());
         ai.setOpaque(two);
-        assertEquals(two, ai.get());
-        ai.setOpaque(m3);
-        assertEquals(m3, ai.get());
+        mustEqual(two, ai.get());
+        ai.setOpaque(minusThree);
+        mustEqual(minusThree, ai.get());
     }
 
     /**
      * get returns the last value setRelease
      */
     public void testGetSetRelease() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
-        assertEquals(one, ai.get());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.get());
         ai.setRelease(two);
-        assertEquals(two, ai.get());
-        ai.setRelease(m3);
-        assertEquals(m3, ai.get());
+        mustEqual(two, ai.get());
+        ai.setRelease(minusThree);
+        mustEqual(minusThree, ai.get());
     }
 
     /**
@@ -94,14 +94,14 @@ public class AtomicReference9Test extend
      * expected else fails
      */
     public void testCompareAndExchange() {
-        AtomicReference<Integer> ai = new AtomicReference<>(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());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.compareAndExchange(one, two));
+        mustEqual(two, ai.compareAndExchange(two, minusFour));
+        mustEqual(minusFour, ai.get());
+        mustEqual(minusFour, ai.compareAndExchange(minusFive, seven));
+        mustEqual(minusFour, ai.get());
+        mustEqual(minusFour, ai.compareAndExchange(minusFour, seven));
+        mustEqual(seven, ai.get());
     }
 
     /**
@@ -109,14 +109,14 @@ public class AtomicReference9Test extend
      * expected else fails
      */
     public void testCompareAndExchangeAcquire() {
-        AtomicReference<Integer> ai = new AtomicReference<>(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());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.compareAndExchangeAcquire(one, two));
+        mustEqual(two, ai.compareAndExchangeAcquire(two, minusFour));
+        mustEqual(minusFour, ai.get());
+        mustEqual(minusFour, ai.compareAndExchangeAcquire(minusFive, seven));
+        mustEqual(minusFour, ai.get());
+        mustEqual(minusFour, ai.compareAndExchangeAcquire(minusFour, seven));
+        mustEqual(seven, ai.get());
     }
 
     /**
@@ -124,14 +124,14 @@ public class AtomicReference9Test extend
      * expected else fails
      */
     public void testCompareAndExchangeRelease() {
-        AtomicReference<Integer> ai = new AtomicReference<>(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());
+        AtomicReference<Item> ai = new AtomicReference<>(one);
+        mustEqual(one, ai.compareAndExchangeRelease(one, two));
+        mustEqual(two, ai.compareAndExchangeRelease(two, minusFour));
+        mustEqual(minusFour, ai.get());
+        mustEqual(minusFour, ai.compareAndExchangeRelease(minusFive, seven));
+        mustEqual(minusFour, ai.get());
+        mustEqual(minusFour, ai.compareAndExchangeRelease(minusFour, seven));
+        mustEqual(seven, ai.get());
     }
 
     /**
@@ -139,12 +139,12 @@ public class AtomicReference9Test extend
      * to expected
      */
     public void testWeakCompareAndSetPlain() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
+        AtomicReference<Item> ai = new AtomicReference<>(one);
         do {} while (!ai.weakCompareAndSetPlain(one, two));
-        do {} while (!ai.weakCompareAndSetPlain(two, m4));
-        assertEquals(m4, ai.get());
-        do {} while (!ai.weakCompareAndSetPlain(m4, seven));
-        assertEquals(seven, ai.get());
+        do {} while (!ai.weakCompareAndSetPlain(two, minusFour));
+        mustEqual(minusFour, ai.get());
+        do {} while (!ai.weakCompareAndSetPlain(minusFour, seven));
+        mustEqual(seven, ai.get());
     }
 
     /**
@@ -152,12 +152,12 @@ public class AtomicReference9Test extend
      * to expected
      */
     public void testWeakCompareAndSetVolatile() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
+        AtomicReference<Item> ai = new AtomicReference<>(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());
+        do {} while (!ai.weakCompareAndSetVolatile(two, minusFour));
+        mustEqual(minusFour, ai.get());
+        do {} while (!ai.weakCompareAndSetVolatile(minusFour, seven));
+        mustEqual(seven, ai.get());
     }
 
     /**
@@ -165,12 +165,12 @@ public class AtomicReference9Test extend
      * to expected
      */
     public void testWeakCompareAndSetAcquire() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
+        AtomicReference<Item> ai = new AtomicReference<>(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());
+        do {} while (!ai.weakCompareAndSetAcquire(two, minusFour));
+        mustEqual(minusFour, ai.get());
+        do {} while (!ai.weakCompareAndSetAcquire(minusFour, seven));
+        mustEqual(seven, ai.get());
     }
 
     /**
@@ -178,12 +178,12 @@ public class AtomicReference9Test extend
      * to expected
      */
     public void testWeakCompareAndSetRelease() {
-        AtomicReference<Integer> ai = new AtomicReference<>(one);
+        AtomicReference<Item> ai = new AtomicReference<>(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());
+        do {} while (!ai.weakCompareAndSetRelease(two, minusFour));
+        mustEqual(minusFour, ai.get());
+        do {} while (!ai.weakCompareAndSetRelease(minusFour, seven));
+        mustEqual(seven, ai.get());
     }
 
 }