--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java 2009/11/16 04:57:10 1.11 +++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java 2010/10/09 19:30:34 1.18 @@ -15,7 +15,7 @@ public class AtomicLongFieldUpdaterTest int z; long w; - public static void main(String[] args){ + public static void main(String[] args) { junit.textui.TestRunner.run(suite()); } public static Test suite() { @@ -25,47 +25,43 @@ public class AtomicLongFieldUpdaterTest /** * Construction with non-existent field throws RuntimeException */ - public void testConstructor(){ + public void testConstructor() { try { AtomicLongFieldUpdater a = AtomicLongFieldUpdater.newUpdater (AtomicLongFieldUpdaterTest.class, "y"); shouldThrow(); - } - catch (RuntimeException rt) {} + } catch (RuntimeException success) {} } /** * construction with field not of given type throws RuntimeException */ - public void testConstructor2(){ + public void testConstructor2() { try { AtomicLongFieldUpdater a = AtomicLongFieldUpdater.newUpdater (AtomicLongFieldUpdaterTest.class, "z"); shouldThrow(); - } - catch (RuntimeException rt) {} + } catch (RuntimeException success) {} } /** * construction with non-volatile field throws RuntimeException */ - public void testConstructor3(){ + public void testConstructor3() { try { AtomicLongFieldUpdater 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(){ + public void testGetSet() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -73,17 +69,17 @@ 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(){ + public void testGetLazySet() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -91,18 +87,18 @@ 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 */ - public void testCompareAndSet(){ + public void testCompareAndSet() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -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)); } @@ -124,7 +120,7 @@ public class AtomicLongFieldUpdaterTest * 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,27 +129,24 @@ 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); } /** * repeated weakCompareAndSet succeeds in changing value when equal * to expected */ - public void testWeakCompareAndSet(){ + public void testWeakCompareAndSet() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -161,17 +154,17 @@ 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(){ + public void testGetAndSet() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -179,15 +172,15 @@ 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)); } /** * getAndAdd returns previous value and adds given value */ - public void testGetAndAdd(){ + public void testGetAndAdd() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -195,16 +188,16 @@ 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)); } /** * getAndDecrement returns previous value and decrements */ - public void testGetAndDecrement(){ + public void testGetAndDecrement() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -212,15 +205,15 @@ 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)); } /** * getAndIncrement returns previous value and increments */ - public void testGetAndIncrement(){ + public void testGetAndIncrement() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -228,19 +221,19 @@ 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)); } /** * addAndGet adds given value to current, and returns current value */ - public void testAddAndGet(){ + public void testAddAndGet() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -248,16 +241,16 @@ 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(){ + public void testDecrementAndGet() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -265,16 +258,16 @@ 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)); } /** * incrementAndGet increments and returns current value */ - public void testIncrementAndGet(){ + public void testIncrementAndGet() { AtomicLongFieldUpdater a; try { a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x"); @@ -282,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)); } }