--- jsr166/src/test/tck/AtomicMarkableReferenceTest.java 2009/11/17 06:58:50 1.11 +++ jsr166/src/test/tck/AtomicMarkableReferenceTest.java 2009/11/21 02:07:26 1.12 @@ -22,11 +22,11 @@ public class AtomicMarkableReferenceTest */ public void testConstructor() { AtomicMarkableReference ai = new AtomicMarkableReference(one, false); - assertEquals(one,ai.getReference()); - assertFalse(ai.isMarked()); + assertEquals(one,ai.getReference()); + assertFalse(ai.isMarked()); AtomicMarkableReference a2 = new AtomicMarkableReference(null, true); - assertNull(a2.getReference()); - assertTrue(a2.isMarked()); + assertNull(a2.getReference()); + assertTrue(a2.isMarked()); } @@ -36,18 +36,18 @@ public class AtomicMarkableReferenceTest public void testGetSet() { boolean[] mark = new boolean[1]; AtomicMarkableReference ai = new AtomicMarkableReference(one, false); - assertEquals(one,ai.getReference()); - assertFalse(ai.isMarked()); + assertEquals(one,ai.getReference()); + assertFalse(ai.isMarked()); assertEquals(one, ai.get(mark)); assertFalse(mark[0]); - ai.set(two, false); - assertEquals(two,ai.getReference()); - assertFalse(ai.isMarked()); + ai.set(two, false); + assertEquals(two,ai.getReference()); + assertFalse(ai.isMarked()); assertEquals(two, ai.get(mark)); assertFalse(mark[0]); - ai.set(one, true); - assertEquals(one,ai.getReference()); - assertTrue(ai.isMarked()); + ai.set(one, true); + assertEquals(one,ai.getReference()); + assertTrue(ai.isMarked()); assertEquals(one, ai.get(mark)); assertTrue(mark[0]); } @@ -60,7 +60,7 @@ public class AtomicMarkableReferenceTest AtomicMarkableReference ai = new AtomicMarkableReference(one, false); assertFalse(ai.isMarked()); assertTrue(ai.attemptMark(one, true)); - assertTrue(ai.isMarked()); + assertTrue(ai.isMarked()); assertEquals(one, ai.get(mark)); assertTrue(mark[0]); } @@ -72,21 +72,21 @@ public class AtomicMarkableReferenceTest public void testCompareAndSet() { boolean[] mark = new boolean[1]; AtomicMarkableReference ai = new AtomicMarkableReference(one, false); - assertEquals(one, ai.get(mark)); + assertEquals(one, ai.get(mark)); assertFalse(ai.isMarked()); - assertFalse(mark[0]); + assertFalse(mark[0]); assertTrue(ai.compareAndSet(one, two, false, false)); - assertEquals(two, ai.get(mark)); - assertFalse(mark[0]); + assertEquals(two, ai.get(mark)); + assertFalse(mark[0]); assertTrue(ai.compareAndSet(two, m3, false, true)); - assertEquals(m3, ai.get(mark)); - assertTrue(mark[0]); + assertEquals(m3, ai.get(mark)); + assertTrue(mark[0]); assertFalse(ai.compareAndSet(two, m3, true, true)); - assertEquals(m3, ai.get(mark)); - assertTrue(mark[0]); + assertEquals(m3, ai.get(mark)); + assertTrue(mark[0]); } /** @@ -136,17 +136,17 @@ public class AtomicMarkableReferenceTest public void testWeakCompareAndSet() { boolean[] mark = new boolean[1]; AtomicMarkableReference ai = new AtomicMarkableReference(one, false); - assertEquals(one, ai.get(mark)); + assertEquals(one, ai.get(mark)); assertFalse(ai.isMarked()); - assertFalse(mark[0]); + assertFalse(mark[0]); while (!ai.weakCompareAndSet(one, two, false, false)); - assertEquals(two, ai.get(mark)); - assertFalse(mark[0]); + assertEquals(two, ai.get(mark)); + assertFalse(mark[0]); while (!ai.weakCompareAndSet(two, m3, false, true)); - assertEquals(m3, ai.get(mark)); - assertTrue(mark[0]); + assertEquals(m3, ai.get(mark)); + assertTrue(mark[0]); } }