--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java 2009/11/16 05:30:07 1.12 +++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java 2011/05/31 16:16:23 1.21 @@ -1,14 +1,13 @@ /* * 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. */ -import java.util.concurrent.atomic.*; import junit.framework.*; -import java.util.*; +import java.util.concurrent.atomic.AtomicLongFieldUpdater; public class AtomicLongFieldUpdaterTest extends JSR166TestCase { volatile long x = 0; @@ -31,8 +30,7 @@ public class AtomicLongFieldUpdaterTest a = AtomicLongFieldUpdater.newUpdater (AtomicLongFieldUpdaterTest.class, "y"); shouldThrow(); - } - catch (RuntimeException rt) {} + } catch (RuntimeException success) {} } /** @@ -44,8 +42,7 @@ public class AtomicLongFieldUpdaterTest a = AtomicLongFieldUpdater.newUpdater (AtomicLongFieldUpdaterTest.class, "z"); shouldThrow(); - } - catch (RuntimeException rt) {} + } catch (RuntimeException success) {} } /** @@ -57,13 +54,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 +68,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,14 +86,13 @@ 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)); } - /** * compareAndSet succeeds in changing value if equal to expected else fails */ @@ -110,21 +104,20 @@ 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)); } - /** * compareAndSet in one thread enables another waiting for value * to succeed */ - public void testCompareAndSetInMultipleThreads() { + public void testCompareAndSetInMultipleThreads() throws Exception { x = 1; final AtomicLongFieldUpdatera; try { @@ -133,20 +126,17 @@ public class AtomicLongFieldUpdaterTest return; } - Thread t = new Thread(new Runnable() { - public void run() { - while (!a.compareAndSet(AtomicLongFieldUpdaterTest.this, 2, 3)) Thread.yield(); - }}); - try { - t.start(); - assertTrue(a.compareAndSet(this, 1, 2)); - t.join(LONG_DELAY_MS); - assertFalse(t.isAlive()); - assertEquals(a.get(this), 3); - } - catch (Exception e) { - unexpectedException(); - } + 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)); + t.join(LONG_DELAY_MS); + assertFalse(t.isAlive()); + assertEquals(a.get(this), 3); } /** @@ -161,15 +151,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; @@ -179,9 +169,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)); } /** @@ -195,10 +185,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)); } /** @@ -212,9 +202,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)); } /** @@ -228,13 +218,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)); } /** @@ -248,14 +238,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; @@ -265,10 +255,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)); } /** @@ -282,13 +272,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)); } }