--- jsr166/src/test/tck/AtomicLongTest.java 2009/11/17 06:58:50 1.15 +++ jsr166/src/test/tck/AtomicLongTest.java 2009/11/21 02:07:26 1.16 @@ -23,7 +23,7 @@ public class AtomicLongTest extends JSR1 */ public void testConstructor() { AtomicLong ai = new AtomicLong(1); - assertEquals(1,ai.get()); + assertEquals(1,ai.get()); } /** @@ -31,7 +31,7 @@ public class AtomicLongTest extends JSR1 */ public void testConstructor2() { AtomicLong ai = new AtomicLong(); - assertEquals(0,ai.get()); + assertEquals(0,ai.get()); } /** @@ -39,11 +39,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,11 +52,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 +65,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)); + assertFalse((7 == ai.get())); + assertTrue(ai.compareAndSet(-4,7)); + assertEquals(7,ai.get()); } /** @@ -99,11 +99,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()); } /** @@ -111,9 +111,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)); } /** @@ -121,10 +121,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()); } /** @@ -132,9 +132,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()); } /** @@ -142,13 +142,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()); } /** @@ -156,10 +156,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()); } /** @@ -167,10 +167,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()); } /** @@ -178,13 +178,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()); } /**