--- jsr166/src/test/tck/AtomicLongTest.java 2011/05/31 16:16:23 1.22 +++ jsr166/src/test/tck/AtomicLongTest.java 2011/06/10 20:01:21 1.23 @@ -28,7 +28,7 @@ public class AtomicLongTest extends JSR1 */ public void testConstructor() { AtomicLong ai = new AtomicLong(1); - assertEquals(1,ai.get()); + assertEquals(1, ai.get()); } /** @@ -36,7 +36,7 @@ public class AtomicLongTest extends JSR1 */ public void testConstructor2() { AtomicLong ai = new AtomicLong(); - assertEquals(0,ai.get()); + assertEquals(0, ai.get()); } /** @@ -44,11 +44,11 @@ public class AtomicLongTest extends JSR1 */ public void testGetSet() { AtomicLong ai = new AtomicLong(1); - assertEquals(1,ai.get()); + assertEquals(1, ai.get()); ai.set(2); - assertEquals(2,ai.get()); + assertEquals(2, ai.get()); ai.set(-3); - assertEquals(-3,ai.get()); + assertEquals(-3, ai.get()); } /** @@ -56,11 +56,11 @@ public class AtomicLongTest extends JSR1 */ public void testGetLazySet() { AtomicLong ai = new AtomicLong(1); - assertEquals(1,ai.get()); + assertEquals(1, ai.get()); ai.lazySet(2); - assertEquals(2,ai.get()); + assertEquals(2, ai.get()); ai.lazySet(-3); - assertEquals(-3,ai.get()); + assertEquals(-3, ai.get()); } /** @@ -68,13 +68,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)); - assertEquals(-4,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()); } /** @@ -93,7 +93,7 @@ public class AtomicLongTest extends JSR1 assertTrue(ai.compareAndSet(1, 2)); t.join(LONG_DELAY_MS); assertFalse(t.isAlive()); - assertEquals(ai.get(), 3); + assertEquals(3, ai.get()); } /** @@ -102,11 +102,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()); } /** @@ -114,9 +114,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)); } /** @@ -124,10 +124,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()); } /** @@ -135,9 +135,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()); } /** @@ -145,13 +145,13 @@ public class AtomicLongTest extends JSR1 */ public void testGetAndIncrement() { AtomicLong ai = new AtomicLong(1); - assertEquals(1,ai.getAndIncrement()); - assertEquals(2,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()); + assertEquals(-2, ai.getAndIncrement()); + assertEquals(-1, ai.getAndIncrement()); + assertEquals(0, ai.getAndIncrement()); + assertEquals(1, ai.get()); } /** @@ -159,10 +159,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()); } /** @@ -170,10 +170,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()); } /** @@ -181,13 +181,13 @@ public class AtomicLongTest extends JSR1 */ public void testIncrementAndGet() { AtomicLong ai = new AtomicLong(1); - assertEquals(2,ai.incrementAndGet()); - assertEquals(2,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()); + assertEquals(-1, ai.incrementAndGet()); + assertEquals(0, ai.incrementAndGet()); + assertEquals(1, ai.incrementAndGet()); + assertEquals(1, ai.get()); } /**