--- jsr166/src/test/tck/AtomicIntegerTest.java 2009/11/17 03:12:51 1.15 +++ jsr166/src/test/tck/AtomicIntegerTest.java 2010/08/25 00:07:03 1.20 @@ -11,19 +11,23 @@ import java.util.concurrent.atomic.*; import java.io.*; public class AtomicIntegerTest extends JSR166TestCase { - public static void main (String[] args) { - junit.textui.TestRunner.run (suite()); + public static void main(String[] args) { + junit.textui.TestRunner.run(suite()); } public static Test suite() { return new TestSuite(AtomicIntegerTest.class); } + final int[] VALUES = { + Integer.MIN_VALUE, -1, 0, 1, 42, Integer.MAX_VALUE, + }; + /** * constructor initializes to given value */ public void testConstructor() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(1,ai.get()); + assertEquals(1,ai.get()); } /** @@ -31,7 +35,7 @@ public class AtomicIntegerTest extends J */ public void testConstructor2() { AtomicInteger ai = new AtomicInteger(); - assertEquals(0,ai.get()); + assertEquals(0,ai.get()); } /** @@ -39,12 +43,11 @@ public class AtomicIntegerTest extends J */ public void testGetSet() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(1,ai.get()); - ai.set(2); - assertEquals(2,ai.get()); - ai.set(-3); - assertEquals(-3,ai.get()); - + assertEquals(1,ai.get()); + ai.set(2); + assertEquals(2,ai.get()); + ai.set(-3); + assertEquals(-3,ai.get()); } /** @@ -52,25 +55,25 @@ public class AtomicIntegerTest extends J */ public void testGetLazySet() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(1,ai.get()); - ai.lazySet(2); - assertEquals(2,ai.get()); - ai.lazySet(-3); - assertEquals(-3,ai.get()); - + assertEquals(1,ai.get()); + ai.lazySet(2); + assertEquals(2,ai.get()); + ai.lazySet(-3); + assertEquals(-3,ai.get()); } + /** * compareAndSet succeeds in changing value if equal to expected else fails */ public void testCompareAndSet() { AtomicInteger ai = new AtomicInteger(1); - assertTrue(ai.compareAndSet(1,2)); - assertTrue(ai.compareAndSet(2,-4)); - assertEquals(-4,ai.get()); - assertFalse(ai.compareAndSet(-5,7)); - assertFalse((7 == ai.get())); - assertTrue(ai.compareAndSet(-4,7)); - assertEquals(7,ai.get()); + assertTrue(ai.compareAndSet(1,2)); + assertTrue(ai.compareAndSet(2,-4)); + assertEquals(-4,ai.get()); + assertFalse(ai.compareAndSet(-5,7)); + assertEquals(-4,ai.get()); + assertTrue(ai.compareAndSet(-4,7)); + assertEquals(7,ai.get()); } /** @@ -79,10 +82,11 @@ public class AtomicIntegerTest extends J */ public void testCompareAndSetInMultipleThreads() throws Exception { final AtomicInteger ai = new AtomicInteger(1); - Thread t = new Thread(new Runnable() { - public void run() { - while (!ai.compareAndSet(2, 3)) Thread.yield(); - }}); + Thread t = new Thread(new CheckedRunnable() { + public void realRun() { + while (!ai.compareAndSet(2, 3)) + Thread.yield(); + }}); t.start(); assertTrue(ai.compareAndSet(1, 2)); @@ -97,11 +101,11 @@ public class AtomicIntegerTest extends J */ public void testWeakCompareAndSet() { AtomicInteger ai = new AtomicInteger(1); - while (!ai.weakCompareAndSet(1,2)); - while (!ai.weakCompareAndSet(2,-4)); - assertEquals(-4,ai.get()); + while (!ai.weakCompareAndSet(1,2)); + while (!ai.weakCompareAndSet(2,-4)); + assertEquals(-4,ai.get()); while (!ai.weakCompareAndSet(-4,7)); - assertEquals(7,ai.get()); + assertEquals(7,ai.get()); } /** @@ -109,9 +113,9 @@ public class AtomicIntegerTest extends J */ public void testGetAndSet() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(1,ai.getAndSet(0)); - assertEquals(0,ai.getAndSet(-10)); - assertEquals(-10,ai.getAndSet(1)); + assertEquals(1,ai.getAndSet(0)); + assertEquals(0,ai.getAndSet(-10)); + assertEquals(-10,ai.getAndSet(1)); } /** @@ -119,10 +123,10 @@ public class AtomicIntegerTest extends J */ public void testGetAndAdd() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(1,ai.getAndAdd(2)); - assertEquals(3,ai.get()); - assertEquals(3,ai.getAndAdd(-4)); - assertEquals(-1,ai.get()); + assertEquals(1,ai.getAndAdd(2)); + assertEquals(3,ai.get()); + assertEquals(3,ai.getAndAdd(-4)); + assertEquals(-1,ai.get()); } /** @@ -130,9 +134,9 @@ public class AtomicIntegerTest extends J */ public void testGetAndDecrement() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(1,ai.getAndDecrement()); - assertEquals(0,ai.getAndDecrement()); - assertEquals(-1,ai.getAndDecrement()); + assertEquals(1,ai.getAndDecrement()); + assertEquals(0,ai.getAndDecrement()); + assertEquals(-1,ai.getAndDecrement()); } /** @@ -140,13 +144,13 @@ public class AtomicIntegerTest extends J */ public void testGetAndIncrement() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(1,ai.getAndIncrement()); - assertEquals(2,ai.get()); - ai.set(-2); - assertEquals(-2,ai.getAndIncrement()); - assertEquals(-1,ai.getAndIncrement()); - assertEquals(0,ai.getAndIncrement()); - assertEquals(1,ai.get()); + assertEquals(1,ai.getAndIncrement()); + assertEquals(2,ai.get()); + ai.set(-2); + assertEquals(-2,ai.getAndIncrement()); + assertEquals(-1,ai.getAndIncrement()); + assertEquals(0,ai.getAndIncrement()); + assertEquals(1,ai.get()); } /** @@ -154,10 +158,10 @@ public class AtomicIntegerTest extends J */ public void testAddAndGet() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(3,ai.addAndGet(2)); - assertEquals(3,ai.get()); - assertEquals(-1,ai.addAndGet(-4)); - assertEquals(-1,ai.get()); + assertEquals(3,ai.addAndGet(2)); + assertEquals(3,ai.get()); + assertEquals(-1,ai.addAndGet(-4)); + assertEquals(-1,ai.get()); } /** @@ -165,10 +169,10 @@ public class AtomicIntegerTest extends J */ public void testDecrementAndGet() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(0,ai.decrementAndGet()); - assertEquals(-1,ai.decrementAndGet()); - assertEquals(-2,ai.decrementAndGet()); - assertEquals(-2,ai.get()); + assertEquals(0,ai.decrementAndGet()); + assertEquals(-1,ai.decrementAndGet()); + assertEquals(-2,ai.decrementAndGet()); + assertEquals(-2,ai.get()); } /** @@ -176,13 +180,13 @@ public class AtomicIntegerTest extends J */ public void testIncrementAndGet() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(2,ai.incrementAndGet()); - assertEquals(2,ai.get()); - ai.set(-2); - assertEquals(-1,ai.incrementAndGet()); - assertEquals(0,ai.incrementAndGet()); - assertEquals(1,ai.incrementAndGet()); - assertEquals(1,ai.get()); + assertEquals(2,ai.incrementAndGet()); + assertEquals(2,ai.get()); + ai.set(-2); + assertEquals(-1,ai.incrementAndGet()); + assertEquals(0,ai.incrementAndGet()); + assertEquals(1,ai.incrementAndGet()); + assertEquals(1,ai.get()); } /** @@ -208,9 +212,10 @@ public class AtomicIntegerTest extends J */ public void testToString() { AtomicInteger ai = new AtomicInteger(); - for (int i = -12; i < 6; ++i) { - ai.set(i); - assertEquals(ai.toString(), Integer.toString(i)); + assertEquals("0", ai.toString()); + for (int x : VALUES) { + ai.set(x); + assertEquals(ai.toString(), Integer.toString(x)); } } @@ -219,21 +224,22 @@ public class AtomicIntegerTest extends J */ public void testIntValue() { AtomicInteger ai = new AtomicInteger(); - for (int i = -12; i < 6; ++i) { - ai.set(i); - assertEquals(i, ai.intValue()); + assertEquals(0, ai.intValue()); + for (int x : VALUES) { + ai.set(x); + assertEquals(x, ai.intValue()); } } - /** * longValue returns current value. */ public void testLongValue() { AtomicInteger ai = new AtomicInteger(); - for (int i = -12; i < 6; ++i) { - ai.set(i); - assertEquals((long)i, ai.longValue()); + assertEquals(0L, ai.longValue()); + for (int x : VALUES) { + ai.set(x); + assertEquals((long)x, ai.longValue()); } } @@ -242,9 +248,10 @@ public class AtomicIntegerTest extends J */ public void testFloatValue() { AtomicInteger ai = new AtomicInteger(); - for (int i = -12; i < 6; ++i) { - ai.set(i); - assertEquals((float)i, ai.floatValue()); + assertEquals(0.0f, ai.floatValue()); + for (int x : VALUES) { + ai.set(x); + assertEquals((float)x, ai.floatValue()); } } @@ -253,12 +260,11 @@ public class AtomicIntegerTest extends J */ public void testDoubleValue() { AtomicInteger ai = new AtomicInteger(); - for (int i = -12; i < 6; ++i) { - ai.set(i); - assertEquals((double)i, ai.doubleValue()); + assertEquals(0.0d, ai.doubleValue()); + for (int x : VALUES) { + ai.set(x); + assertEquals((double)x, ai.doubleValue()); } } - - }