--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2009/11/17 06:58:50	1.14
+++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2009/11/21 17:38:05	1.16
@@ -31,8 +31,7 @@ public class AtomicLongFieldUpdaterTest
                 a = AtomicLongFieldUpdater.newUpdater
                 (AtomicLongFieldUpdaterTest.class, "y");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
@@ -44,8 +43,7 @@ public class AtomicLongFieldUpdaterTest
                 a = AtomicLongFieldUpdater.newUpdater
                 (AtomicLongFieldUpdaterTest.class, "z");
             shouldThrow();
-        }
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
@@ -57,9 +55,7 @@ public class AtomicLongFieldUpdaterTest
                 a = AtomicLongFieldUpdater.newUpdater
                 (AtomicLongFieldUpdaterTest.class, "w");
             shouldThrow();
-        }
-
-        catch (RuntimeException rt) {}
+        } catch (RuntimeException success) {}
     }
 
     /**
@@ -73,11 +69,11 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(1,a.get(this));
-	a.set(this,2);
-	assertEquals(2,a.get(this));
-	a.set(this,-3);
-	assertEquals(-3,a.get(this));
+        assertEquals(1,a.get(this));
+        a.set(this,2);
+        assertEquals(2,a.get(this));
+        a.set(this,-3);
+        assertEquals(-3,a.get(this));
     }
 
     /**
@@ -91,11 +87,11 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(1,a.get(this));
-	a.lazySet(this,2);
-	assertEquals(2,a.get(this));
-	a.lazySet(this,-3);
-	assertEquals(-3,a.get(this));
+        assertEquals(1,a.get(this));
+        a.lazySet(this,2);
+        assertEquals(2,a.get(this));
+        a.lazySet(this,-3);
+        assertEquals(-3,a.get(this));
     }
 
 
@@ -110,13 +106,13 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertTrue(a.compareAndSet(this,1,2));
-	assertTrue(a.compareAndSet(this,2,-4));
-	assertEquals(-4,a.get(this));
-	assertFalse(a.compareAndSet(this,-5,7));
-	assertFalse((7 == a.get(this)));
-	assertTrue(a.compareAndSet(this,-4,7));
-	assertEquals(7,a.get(this));
+        assertTrue(a.compareAndSet(this,1,2));
+        assertTrue(a.compareAndSet(this,2,-4));
+        assertEquals(-4,a.get(this));
+        assertFalse(a.compareAndSet(this,-5,7));
+        assertFalse((7 == a.get(this)));
+        assertTrue(a.compareAndSet(this,-4,7));
+        assertEquals(7,a.get(this));
     }
 
 
@@ -158,11 +154,11 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	while (!a.weakCompareAndSet(this,1,2));
+        while (!a.weakCompareAndSet(this,1,2));
         while (!a.weakCompareAndSet(this,2,-4));
-	assertEquals(-4,a.get(this));
-	while (!a.weakCompareAndSet(this,-4,7));
-	assertEquals(7,a.get(this));
+        assertEquals(-4,a.get(this));
+        while (!a.weakCompareAndSet(this,-4,7));
+        assertEquals(7,a.get(this));
     }
 
     /**
@@ -176,9 +172,9 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(1,a.getAndSet(this, 0));
-	assertEquals(0,a.getAndSet(this,-10));
-	assertEquals(-10,a.getAndSet(this,1));
+        assertEquals(1,a.getAndSet(this, 0));
+        assertEquals(0,a.getAndSet(this,-10));
+        assertEquals(-10,a.getAndSet(this,1));
     }
 
     /**
@@ -192,10 +188,10 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(1,a.getAndAdd(this,2));
-	assertEquals(3,a.get(this));
-	assertEquals(3,a.getAndAdd(this,-4));
-	assertEquals(-1,a.get(this));
+        assertEquals(1,a.getAndAdd(this,2));
+        assertEquals(3,a.get(this));
+        assertEquals(3,a.getAndAdd(this,-4));
+        assertEquals(-1,a.get(this));
     }
 
     /**
@@ -209,9 +205,9 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(1,a.getAndDecrement(this));
-	assertEquals(0,a.getAndDecrement(this));
-	assertEquals(-1,a.getAndDecrement(this));
+        assertEquals(1,a.getAndDecrement(this));
+        assertEquals(0,a.getAndDecrement(this));
+        assertEquals(-1,a.getAndDecrement(this));
     }
 
     /**
@@ -225,13 +221,13 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(1,a.getAndIncrement(this));
-	assertEquals(2,a.get(this));
-	a.set(this,-2);
-	assertEquals(-2,a.getAndIncrement(this));
-	assertEquals(-1,a.getAndIncrement(this));
-	assertEquals(0,a.getAndIncrement(this));
-	assertEquals(1,a.get(this));
+        assertEquals(1,a.getAndIncrement(this));
+        assertEquals(2,a.get(this));
+        a.set(this,-2);
+        assertEquals(-2,a.getAndIncrement(this));
+        assertEquals(-1,a.getAndIncrement(this));
+        assertEquals(0,a.getAndIncrement(this));
+        assertEquals(1,a.get(this));
     }
 
     /**
@@ -245,10 +241,10 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(3,a.addAndGet(this,2));
-	assertEquals(3,a.get(this));
-	assertEquals(-1,a.addAndGet(this,-4));
-	assertEquals(-1,a.get(this));
+        assertEquals(3,a.addAndGet(this,2));
+        assertEquals(3,a.get(this));
+        assertEquals(-1,a.addAndGet(this,-4));
+        assertEquals(-1,a.get(this));
     }
 
     /**
@@ -262,10 +258,10 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(0,a.decrementAndGet(this));
-	assertEquals(-1,a.decrementAndGet(this));
-	assertEquals(-2,a.decrementAndGet(this));
-	assertEquals(-2,a.get(this));
+        assertEquals(0,a.decrementAndGet(this));
+        assertEquals(-1,a.decrementAndGet(this));
+        assertEquals(-2,a.decrementAndGet(this));
+        assertEquals(-2,a.get(this));
     }
 
     /**
@@ -279,13 +275,13 @@ public class AtomicLongFieldUpdaterTest
             return;
         }
         x = 1;
-	assertEquals(2,a.incrementAndGet(this));
-	assertEquals(2,a.get(this));
-	a.set(this,-2);
-	assertEquals(-1,a.incrementAndGet(this));
-	assertEquals(0,a.incrementAndGet(this));
-	assertEquals(1,a.incrementAndGet(this));
-	assertEquals(1,a.get(this));
+        assertEquals(2,a.incrementAndGet(this));
+        assertEquals(2,a.get(this));
+        a.set(this,-2);
+        assertEquals(-1,a.incrementAndGet(this));
+        assertEquals(0,a.incrementAndGet(this));
+        assertEquals(1,a.incrementAndGet(this));
+        assertEquals(1,a.get(this));
     }
 
 }