--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2014/12/31 19:21:20	1.31
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2015/04/25 04:55:30	1.33
@@ -18,7 +18,7 @@ public class AtomicReferenceFieldUpdater
     volatile int i;
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AtomicReferenceFieldUpdaterTest.class);
@@ -75,7 +75,7 @@ public class AtomicReferenceFieldUpdater
      * get returns the last value set or assigned
      */
     public void testGetSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
         x = one;
         assertSame(one, a.get(this));
@@ -89,7 +89,7 @@ public class AtomicReferenceFieldUpdater
      * get returns the last value lazySet by same thread
      */
     public void testGetLazySet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
         x = one;
         assertSame(one, a.get(this));
@@ -103,7 +103,7 @@ public class AtomicReferenceFieldUpdater
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
     public void testCompareAndSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
         x = one;
         assertTrue(a.compareAndSet(this, one, two));
@@ -121,7 +121,7 @@ public class AtomicReferenceFieldUpdater
      */
     public void testCompareAndSetInMultipleThreads() throws Exception {
         x = one;
-        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
 
         Thread t = new Thread(new CheckedRunnable() {
@@ -142,7 +142,7 @@ public class AtomicReferenceFieldUpdater
      * to expected
      */
     public void testWeakCompareAndSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
         x = one;
         do {} while (!a.weakCompareAndSet(this, one, two));
@@ -156,7 +156,7 @@ public class AtomicReferenceFieldUpdater
      * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet() {
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer> a;
         a = updaterFor("x");
         x = one;
         assertSame(one, a.getAndSet(this, zero));