--- jsr166/src/test/tck/AtomicReferenceArrayTest.java	2018/01/07 22:59:17	1.38
+++ jsr166/src/test/tck/AtomicReferenceArrayTest.java	2021/01/26 13:33:05	1.39
@@ -45,8 +45,8 @@ public class AtomicReferenceArrayTest ex
      * constructor with array is of same size and has all elements
      */
     public void testConstructor2() {
-        Integer[] a = { two, one, three, four, seven };
-        AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(a);
+        Item[] a = { two, one, three, four, seven };
+        AtomicReferenceArray<Item> aa = new AtomicReferenceArray<>(a);
         assertEquals(a.length, aa.length());
         for (int i = 0; i < a.length; i++)
             assertEquals(a[i], aa.get(i));
@@ -56,7 +56,7 @@ public class AtomicReferenceArrayTest ex
      * Initialize AtomicReferenceArray<Class> with SubClass[]
      */
     public void testConstructorSubClassArray() {
-        Integer[] a = { two, one, three, four, seven };
+        Item[] a = { two, one, three, four, seven };
         AtomicReferenceArray<Number> aa = new AtomicReferenceArray<>(a);
         assertEquals(a.length, aa.length());
         for (int i = 0; i < a.length; i++) {
@@ -70,6 +70,7 @@ public class AtomicReferenceArrayTest ex
     /**
      * get and set for out of bound indices throw IndexOutOfBoundsException
      */
+    @SuppressWarnings("deprecation")
     public void testIndexing() {
         AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(SIZE);
         for (int index : new int[] { -1, SIZE }) {
@@ -100,14 +101,14 @@ public class AtomicReferenceArrayTest ex
      * get returns the last value set at index
      */
     public void testGetSet() {
-        AtomicReferenceArray aa = new AtomicReferenceArray(SIZE);
+        AtomicReferenceArray<Item> aa = new AtomicReferenceArray<Item>(SIZE);
         for (int i = 0; i < SIZE; i++) {
             aa.set(i, one);
             assertSame(one, aa.get(i));
             aa.set(i, two);
             assertSame(two, aa.get(i));
-            aa.set(i, m3);
-            assertSame(m3, aa.get(i));
+            aa.set(i, minusThree);
+            assertSame(minusThree, aa.get(i));
         }
     }
 
@@ -115,14 +116,14 @@ public class AtomicReferenceArrayTest ex
      * get returns the last value lazySet at index by same thread
      */
     public void testGetLazySet() {
-        AtomicReferenceArray aa = new AtomicReferenceArray(SIZE);
+        AtomicReferenceArray<Item> aa = new AtomicReferenceArray<Item>(SIZE);
         for (int i = 0; i < SIZE; i++) {
             aa.lazySet(i, one);
             assertSame(one, aa.get(i));
             aa.lazySet(i, two);
             assertSame(two, aa.get(i));
-            aa.lazySet(i, m3);
-            assertSame(m3, aa.get(i));
+            aa.lazySet(i, minusThree);
+            assertSame(minusThree, aa.get(i));
         }
     }
 
@@ -130,15 +131,15 @@ public class AtomicReferenceArrayTest ex
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
     public void testCompareAndSet() {
-        AtomicReferenceArray aa = new AtomicReferenceArray(SIZE);
+        AtomicReferenceArray<Item> aa = new AtomicReferenceArray<Item>(SIZE);
         for (int i = 0; i < SIZE; i++) {
             aa.set(i, one);
             assertTrue(aa.compareAndSet(i, one, two));
-            assertTrue(aa.compareAndSet(i, two, m4));
-            assertSame(m4, aa.get(i));
-            assertFalse(aa.compareAndSet(i, m5, seven));
-            assertSame(m4, aa.get(i));
-            assertTrue(aa.compareAndSet(i, m4, seven));
+            assertTrue(aa.compareAndSet(i, two, minusFour));
+            assertSame(minusFour, aa.get(i));
+            assertFalse(aa.compareAndSet(i, minusFive, seven));
+            assertSame(minusFour, aa.get(i));
+            assertTrue(aa.compareAndSet(i, minusFour, seven));
             assertSame(seven, aa.get(i));
         }
     }
@@ -148,7 +149,7 @@ public class AtomicReferenceArrayTest ex
      * to succeed
      */
     public void testCompareAndSetInMultipleThreads() throws InterruptedException {
-        final AtomicReferenceArray a = new AtomicReferenceArray(1);
+        final AtomicReferenceArray<Item> a = new AtomicReferenceArray<Item>(1);
         a.set(0, one);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() {
@@ -167,14 +168,15 @@ public class AtomicReferenceArrayTest ex
      * repeated weakCompareAndSet succeeds in changing value when equal
      * to expected
      */
+    @SuppressWarnings("deprecation")
     public void testWeakCompareAndSet() {
-        AtomicReferenceArray aa = new AtomicReferenceArray(SIZE);
+        AtomicReferenceArray<Item> aa = new AtomicReferenceArray<Item>(SIZE);
         for (int i = 0; i < SIZE; i++) {
             aa.set(i, one);
             do {} while (!aa.weakCompareAndSet(i, one, two));
-            do {} while (!aa.weakCompareAndSet(i, two, m4));
-            assertSame(m4, aa.get(i));
-            do {} while (!aa.weakCompareAndSet(i, m4, seven));
+            do {} while (!aa.weakCompareAndSet(i, two, minusFour));
+            assertSame(minusFour, aa.get(i));
+            do {} while (!aa.weakCompareAndSet(i, minusFour, seven));
             assertSame(seven, aa.get(i));
         }
     }
@@ -183,12 +185,12 @@ public class AtomicReferenceArrayTest ex
      * getAndSet returns previous value and sets to given value at given index
      */
     public void testGetAndSet() {
-        AtomicReferenceArray aa = new AtomicReferenceArray(SIZE);
+        AtomicReferenceArray<Item> aa = new AtomicReferenceArray<Item>(SIZE);
         for (int i = 0; i < SIZE; i++) {
             aa.set(i, one);
             assertSame(one, aa.getAndSet(i, zero));
-            assertSame(zero, aa.getAndSet(i, m10));
-            assertSame(m10, aa.getAndSet(i, one));
+            assertSame(zero, aa.getAndSet(i, minusTen));
+            assertSame(minusTen, aa.getAndSet(i, one));
         }
     }
 
@@ -196,11 +198,11 @@ public class AtomicReferenceArrayTest ex
      * a deserialized/reserialized array holds same values in same order
      */
     public void testSerialization() throws Exception {
-        AtomicReferenceArray x = new AtomicReferenceArray(SIZE);
+        AtomicReferenceArray<Item> x = new AtomicReferenceArray<Item>(SIZE);
         for (int i = 0; i < SIZE; i++) {
-            x.set(i, new Integer(-i));
+            x.set(i, minusOne);
         }
-        AtomicReferenceArray y = serialClone(x);
+        AtomicReferenceArray<Item> y = serialClone(x);
         assertNotSame(x, y);
         assertEquals(x.length(), y.length());
         for (int i = 0; i < SIZE; i++) {
@@ -212,8 +214,8 @@ public class AtomicReferenceArrayTest ex
      * toString returns current value.
      */
     public void testToString() {
-        Integer[] a = { two, one, three, four, seven };
-        AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<>(a);
+        Item[] a = { two, one, three, four, seven };
+        AtomicReferenceArray<Item> aa = new AtomicReferenceArray<>(a);
         assertEquals(Arrays.toString(a), aa.toString());
     }