--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2011/05/27 19:39:07	1.22
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2011/06/10 20:17:11	1.25
@@ -6,9 +6,8 @@
  * Pat Fisher, Mike Judd.
  */
 
-import java.util.concurrent.atomic.*;
 import junit.framework.*;
-import java.util.*;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase {
     volatile Integer x = null;
@@ -69,11 +68,11 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-        assertSame(one,a.get(this));
-        a.set(this,two);
-        assertSame(two,a.get(this));
-        a.set(this,m3);
-        assertSame(m3,a.get(this));
+        assertSame(one, a.get(this));
+        a.set(this, two);
+        assertSame(two, a.get(this));
+        a.set(this, m3);
+        assertSame(m3, a.get(this));
     }
 
     /**
@@ -87,11 +86,11 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-        assertSame(one,a.get(this));
-        a.lazySet(this,two);
-        assertSame(two,a.get(this));
-        a.lazySet(this,m3);
-        assertSame(m3,a.get(this));
+        assertSame(one, a.get(this));
+        a.lazySet(this, two);
+        assertSame(two, a.get(this));
+        a.lazySet(this, m3);
+        assertSame(m3, a.get(this));
     }
 
     /**
@@ -111,7 +110,7 @@ public class AtomicReferenceFieldUpdater
         assertFalse(a.compareAndSet(this, m5, seven));
         assertFalse(seven == a.get(this));
         assertTrue(a.compareAndSet(this, m4, seven));
-        assertSame(seven,a.get(this));
+        assertSame(seven, a.get(this));
     }
 
     /**
@@ -137,7 +136,7 @@ public class AtomicReferenceFieldUpdater
         assertTrue(a.compareAndSet(this, one, two));
         t.join(LONG_DELAY_MS);
         assertFalse(t.isAlive());
-        assertSame(a.get(this), three);
+        assertSame(three, a.get(this));
     }
 
     /**
@@ -152,11 +151,11 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-        while (!a.weakCompareAndSet(this,one,two));
-        while (!a.weakCompareAndSet(this,two,m4));
-        assertSame(m4,a.get(this));
-        while (!a.weakCompareAndSet(this,m4,seven));
-        assertSame(seven,a.get(this));
+        while (!a.weakCompareAndSet(this, one, two));
+        while (!a.weakCompareAndSet(this, two, m4));
+        assertSame(m4, a.get(this));
+        while (!a.weakCompareAndSet(this, m4, seven));
+        assertSame(seven, a.get(this));
     }
 
     /**
@@ -170,9 +169,9 @@ public class AtomicReferenceFieldUpdater
             return;
         }
         x = one;
-        assertSame(one,a.getAndSet(this, zero));
-        assertSame(zero,a.getAndSet(this,m10));
-        assertSame(m10,a.getAndSet(this,1));
+        assertSame(one, a.getAndSet(this, zero));
+        assertSame(zero, a.getAndSet(this, m10));
+        assertSame(m10, a.getAndSet(this, 1));
     }
 
 }