--- jsr166/src/test/tck/AtomicIntegerFieldUpdaterTest.java 2009/11/17 06:58:50 1.14 +++ jsr166/src/test/tck/AtomicIntegerFieldUpdaterTest.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.AtomicIntegerFieldUpdater; public class AtomicIntegerFieldUpdaterTest extends JSR166TestCase { volatile int x = 0; @@ -30,8 +29,7 @@ public class AtomicIntegerFieldUpdaterTe a = AtomicIntegerFieldUpdater.newUpdater (AtomicIntegerFieldUpdaterTest.class, "y"); shouldThrow(); - } - catch (RuntimeException rt) {} + } catch (RuntimeException success) {} } /** @@ -43,8 +41,7 @@ public class AtomicIntegerFieldUpdaterTe a = AtomicIntegerFieldUpdater.newUpdater (AtomicIntegerFieldUpdaterTest.class, "z"); shouldThrow(); - } - catch (RuntimeException rt) {} + } catch (RuntimeException success) {} } /** @@ -56,12 +53,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 a; @@ -71,16 +67,15 @@ public class AtomicIntegerFieldUpdaterTe 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() { AtomicIntegerFieldUpdater a; @@ -90,12 +85,11 @@ public class AtomicIntegerFieldUpdaterTe 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)); } /** @@ -109,16 +103,15 @@ public class AtomicIntegerFieldUpdaterTe 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 @@ -157,15 +150,15 @@ public class AtomicIntegerFieldUpdaterTe return; } x = 1; - 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)); + 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)); } /** - * getAndSet returns previous value and sets to given value + * getAndSet returns previous value and sets to given value */ public void testGetAndSet() { AtomicIntegerFieldUpdater a; @@ -175,9 +168,9 @@ public class AtomicIntegerFieldUpdaterTe 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 +184,10 @@ public class AtomicIntegerFieldUpdaterTe 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 +201,9 @@ public class AtomicIntegerFieldUpdaterTe 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 +217,13 @@ public class AtomicIntegerFieldUpdaterTe 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,10 +237,10 @@ public class AtomicIntegerFieldUpdaterTe 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)); } /** @@ -261,10 +254,10 @@ public class AtomicIntegerFieldUpdaterTe 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 +271,13 @@ public class AtomicIntegerFieldUpdaterTe 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)); } }