--- jsr166/src/test/tck/NonNestmates.java	2017/10/21 06:49:52	1.3
+++ jsr166/src/test/tck/NonNestmates.java	2021/01/26 13:33:06	1.4
@@ -43,12 +43,12 @@ class NonNestmates {
     }
 
     public void checkPackageAccess(AtomicReferenceFieldUpdaterTest obj) {
-        Integer one = new Integer(1);
-        Integer two = new Integer(2);
+        Item one = new Item(1);
+        Item two = new Item(2);
         obj.x = one;
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest,Integer> a =
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest,Item> a =
             AtomicReferenceFieldUpdater.newUpdater(
-                AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+                AtomicReferenceFieldUpdaterTest.class, Item.class, "x");
         assertSame(one, a.get(obj));
         assertTrue(a.compareAndSet(obj, one, two));
         assertSame(two, a.get(obj));
@@ -162,17 +162,17 @@ class NonNestmates {
         }
 
         public void checkCompareAndSetProtectedSub() {
-            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest,Integer> a =
+            AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest,Item> a =
                 AtomicReferenceFieldUpdater.newUpdater(
                     AtomicReferenceFieldUpdaterTest.class,
-                    Integer.class, "protectedField");
+                    Item.class, "protectedField");
             this.protectedField = one;
             assertTrue(a.compareAndSet(this, one, two));
-            assertTrue(a.compareAndSet(this, two, m4));
-            assertSame(m4, a.get(this));
-            assertFalse(a.compareAndSet(this, m5, seven));
+            assertTrue(a.compareAndSet(this, two, minusFour));
+            assertSame(minusFour, a.get(this));
+            assertFalse(a.compareAndSet(this, minusFive, seven));
             assertNotSame(seven, a.get(this));
-            assertTrue(a.compareAndSet(this, m4, seven));
+            assertTrue(a.compareAndSet(this, minusFour, seven));
             assertSame(seven, a.get(this));
         }
     }