--- jsr166/src/test/tck/AtomicLongTest.java 2009/11/17 03:12:51 1.14 +++ jsr166/src/test/tck/AtomicLongTest.java 2009/12/01 09:56:28 1.18 @@ -18,12 +18,18 @@ public class AtomicLongTest extends JSR1 return new TestSuite(AtomicLongTest.class); } + final long[] VALUES = { + Long.MIN_VALUE, + Integer.MIN_VALUE, -1, 0, 1, 42, Integer.MAX_VALUE, + Long.MAX_VALUE, + }; + /** * constructor initializes to given value */ public void testConstructor() { AtomicLong ai = new AtomicLong(1); - assertEquals(1,ai.get()); + assertEquals(1,ai.get()); } /** @@ -31,7 +37,7 @@ public class AtomicLongTest extends JSR1 */ public void testConstructor2() { AtomicLong ai = new AtomicLong(); - assertEquals(0,ai.get()); + assertEquals(0,ai.get()); } /** @@ -39,12 +45,11 @@ public class AtomicLongTest extends JSR1 */ public void testGetSet() { AtomicLong ai = new AtomicLong(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,12 +57,11 @@ public class AtomicLongTest extends JSR1 */ public void testGetLazySet() { AtomicLong ai = new AtomicLong(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()); } /** @@ -65,13 +69,13 @@ public class AtomicLongTest extends JSR1 */ public void testCompareAndSet() { AtomicLong ai = new AtomicLong(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()); } /** @@ -80,10 +84,11 @@ public class AtomicLongTest extends JSR1 */ public void testCompareAndSetInMultipleThreads() throws Exception { final AtomicLong ai = new AtomicLong(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)); @@ -98,11 +103,11 @@ public class AtomicLongTest extends JSR1 */ public void testWeakCompareAndSet() { AtomicLong ai = new AtomicLong(1); - while (!ai.weakCompareAndSet(1,2)); - while (!ai.weakCompareAndSet(2,-4)); - assertEquals(-4,ai.get()); - while (!ai.weakCompareAndSet(-4,7)); - assertEquals(7,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()); } /** @@ -110,9 +115,9 @@ public class AtomicLongTest extends JSR1 */ public void testGetAndSet() { AtomicLong ai = new AtomicLong(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)); } /** @@ -120,10 +125,10 @@ public class AtomicLongTest extends JSR1 */ public void testGetAndAdd() { AtomicLong ai = new AtomicLong(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()); } /** @@ -131,9 +136,9 @@ public class AtomicLongTest extends JSR1 */ public void testGetAndDecrement() { AtomicLong ai = new AtomicLong(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()); } /** @@ -141,13 +146,13 @@ public class AtomicLongTest extends JSR1 */ public void testGetAndIncrement() { AtomicLong ai = new AtomicLong(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()); } /** @@ -155,10 +160,10 @@ public class AtomicLongTest extends JSR1 */ public void testAddAndGet() { AtomicLong ai = new AtomicLong(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()); } /** @@ -166,10 +171,10 @@ public class AtomicLongTest extends JSR1 */ public void testDecrementAndGet() { AtomicLong ai = new AtomicLong(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()); } /** @@ -177,13 +182,13 @@ public class AtomicLongTest extends JSR1 */ public void testIncrementAndGet() { AtomicLong ai = new AtomicLong(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()); } /** @@ -209,20 +214,34 @@ public class AtomicLongTest extends JSR1 */ public void testToString() { AtomicLong ai = new AtomicLong(); - for (long i = -12; i < 6; ++i) { + assertEquals("0", ai.toString()); + for (long i : VALUES) { ai.set(i); assertEquals(ai.toString(), Long.toString(i)); } } /** + * intValue returns current value. + */ + public void testIntValue() { + AtomicLong ai = new AtomicLong(); + assertEquals(0, ai.intValue()); + for (long x : VALUES) { + ai.set(x); + assertEquals((int)x, ai.intValue()); + } + } + + /** * longValue returns current value. */ public void testLongValue() { AtomicLong ai = new AtomicLong(); - for (int i = -12; i < 6; ++i) { - ai.set(i); - assertEquals((long)i, ai.longValue()); + assertEquals(0L, ai.longValue()); + for (long x : VALUES) { + ai.set(x); + assertEquals((long)x, ai.longValue()); } } @@ -231,9 +250,10 @@ public class AtomicLongTest extends JSR1 */ public void testFloatValue() { AtomicLong ai = new AtomicLong(); - for (int i = -12; i < 6; ++i) { - ai.set(i); - assertEquals((float)i, ai.floatValue()); + assertEquals(0.0f, ai.floatValue()); + for (long x : VALUES) { + ai.set(x); + assertEquals((float)x, ai.floatValue()); } } @@ -242,11 +262,11 @@ public class AtomicLongTest extends JSR1 */ public void testDoubleValue() { AtomicLong ai = new AtomicLong(); - for (int i = -12; i < 6; ++i) { - ai.set(i); - assertEquals((double)i, ai.doubleValue()); + assertEquals(0.0d, ai.doubleValue()); + for (long x : VALUES) { + ai.set(x); + assertEquals((double)x, ai.doubleValue()); } } - }