--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java 2009/11/17 03:12:51 1.13 +++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.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. */ @@ -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,13 +55,11 @@ public class AtomicLongFieldUpdaterTest a = AtomicLongFieldUpdater.newUpdater (AtomicLongFieldUpdaterTest.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() { AtomicLongFieldUpdater a; @@ -73,15 +69,15 @@ 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)); } /** - * get returns the last value lazySet by same thread + * get returns the last value lazySet by same thread */ public void testGetLazySet() { AtomicLongFieldUpdater a; @@ -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)); + assertEquals(-4,a.get(this)); + assertTrue(a.compareAndSet(this,-4,7)); + assertEquals(7,a.get(this)); } @@ -133,10 +129,11 @@ public class AtomicLongFieldUpdaterTest return; } - Thread t = new Thread(new Runnable() { - public void run() { - while (!a.compareAndSet(AtomicLongFieldUpdaterTest.this, 2, 3)) Thread.yield(); - }}); + Thread t = new Thread(new CheckedRunnable() { + public void realRun() { + while (!a.compareAndSet(AtomicLongFieldUpdaterTest.this, 2, 3)) + Thread.yield(); + }}); t.start(); assertTrue(a.compareAndSet(this, 1, 2)); @@ -157,15 +154,15 @@ 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)); } /** - * getAndSet returns previous value and sets to given value + * getAndSet returns previous value and sets to given value */ public void testGetAndSet() { AtomicLongFieldUpdater a; @@ -175,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)); } /** @@ -191,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)); } /** @@ -208,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)); } /** @@ -224,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)); } /** @@ -244,14 +241,14 @@ 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)); } /** - * decrementAndGet decrements and returns current value + * decrementAndGet decrements and returns current value */ public void testDecrementAndGet() { AtomicLongFieldUpdater a; @@ -261,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)); } /** @@ -278,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)); } }