--- jsr166/src/test/tck/AtomicIntegerFieldUpdaterTest.java	2009/11/21 02:07:26	1.15
+++ jsr166/src/test/tck/AtomicIntegerFieldUpdaterTest.java	2011/03/15 19:47:06	1.19
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  * Other contributors include Andrew Wright, Jeffrey Hayes,
  * Pat Fisher, Mike Judd.
  */
@@ -30,8 +30,7 @@ public class AtomicIntegerFieldUpdaterTe
                 a = AtomicIntegerFieldUpdater.newUpdater
                 (AtomicIntegerFieldUpdaterTest.class, "y");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
@@ -43,8 +42,7 @@ public class AtomicIntegerFieldUpdaterTe
                 a = AtomicIntegerFieldUpdater.newUpdater
                 (AtomicIntegerFieldUpdaterTest.class, "z");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
@@ -56,12 +54,11 @@ public class AtomicIntegerFieldUpdaterTe
                 a = AtomicIntegerFieldUpdater.newUpdater
                 (AtomicIntegerFieldUpdaterTest.class, "w");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
-     *  get returns the last value set or assigned
+     * get returns the last value set or assigned
      */
     public void testGetSet() {
         AtomicIntegerFieldUpdater<AtomicIntegerFieldUpdaterTest> a;
@@ -76,11 +73,10 @@ public class AtomicIntegerFieldUpdaterTe
         assertEquals(2,a.get(this));
         a.set(this,-3);
         assertEquals(-3,a.get(this));
-
     }
 
     /**
-     *  get returns the last value lazySet by same thread
+     * get returns the last value lazySet by same thread
      */
     public void testGetLazySet() {
         AtomicIntegerFieldUpdater<AtomicIntegerFieldUpdaterTest> a;
@@ -95,7 +91,6 @@ public class AtomicIntegerFieldUpdaterTe
         assertEquals(2,a.get(this));
         a.lazySet(this,-3);
         assertEquals(-3,a.get(this));
-
     }
 
     /**
@@ -113,7 +108,7 @@ public class AtomicIntegerFieldUpdaterTe
         assertTrue(a.compareAndSet(this,2,-4));
         assertEquals(-4,a.get(this));
         assertFalse(a.compareAndSet(this,-5,7));
-        assertFalse((7 == a.get(this)));
+        assertEquals(-4,a.get(this));
         assertTrue(a.compareAndSet(this,-4,7));
         assertEquals(7,a.get(this));
     }
@@ -165,7 +160,7 @@ public class AtomicIntegerFieldUpdaterTe
     }
 
     /**
-     *  getAndSet returns previous value and sets to given value
+     * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet() {
         AtomicIntegerFieldUpdater<AtomicIntegerFieldUpdaterTest> a;