--- jsr166/src/test/tck/AtomicIntegerTest.java 2011/05/31 16:16:23 1.22 +++ jsr166/src/test/tck/AtomicIntegerTest.java 2011/06/10 20:01:21 1.23 @@ -26,7 +26,7 @@ public class AtomicIntegerTest extends J */ public void testConstructor() { AtomicInteger ai = new AtomicInteger(1); - assertEquals(1,ai.get()); + assertEquals(1, ai.get()); } /** @@ -34,7 +34,7 @@ public class AtomicIntegerTest extends J */ public void testConstructor2() { AtomicInteger ai = new AtomicInteger(); - assertEquals(0,ai.get()); + assertEquals(0, ai.get()); } /** @@ -42,11 +42,11 @@ public class AtomicIntegerTest extends J */ public void testGetSet() { AtomicInteger ai = new AtomicInteger(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()); } /** @@ -54,11 +54,11 @@ public class AtomicIntegerTest extends J */ public void testGetLazySet() { AtomicInteger ai = new AtomicInteger(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()); } /** @@ -66,13 +66,13 @@ public class AtomicIntegerTest extends J */ 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)); - 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()); } /** @@ -100,11 +100,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(-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()); } /** @@ -112,9 +112,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)); } /** @@ -122,10 +122,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()); } /** @@ -133,9 +133,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()); } /** @@ -143,13 +143,13 @@ public class AtomicIntegerTest extends J */ public void testGetAndIncrement() { AtomicInteger ai = new AtomicInteger(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()); } /** @@ -157,10 +157,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()); } /** @@ -168,10 +168,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()); } /** @@ -179,13 +179,13 @@ public class AtomicIntegerTest extends J */ public void testIncrementAndGet() { AtomicInteger ai = new AtomicInteger(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()); } /**