diff options
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/AtomicReferenceArrayTest.java')
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/AtomicReferenceArrayTest.java | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/AtomicReferenceArrayTest.java b/jsr166-tests/src/test/java/jsr166/AtomicReferenceArrayTest.java index 0a4f3d9..1df2f9f 100644 --- a/jsr166-tests/src/test/java/jsr166/AtomicReferenceArrayTest.java +++ b/jsr166-tests/src/test/java/jsr166/AtomicReferenceArrayTest.java @@ -8,11 +8,22 @@ package jsr166; -import junit.framework.*; import java.util.Arrays; import java.util.concurrent.atomic.AtomicReferenceArray; +import junit.framework.Test; +import junit.framework.TestSuite; + public class AtomicReferenceArrayTest extends JSR166TestCase { + // android-note: Removed because the CTS runner does a bad job of + // retrying tests that have suite() declarations. + // + // public static void main(String[] args) { + // main(suite(), args); + // } + // public static Test suite() { + // return new TestSuite(...); + // } /** * constructor creates array of given size with all elements null @@ -30,7 +41,7 @@ public class AtomicReferenceArrayTest extends JSR166TestCase { public void testConstructor2NPE() { try { Integer[] a = null; - AtomicReferenceArray<Integer> aa = new AtomicReferenceArray<Integer>(a); + new AtomicReferenceArray<Integer>(a); shouldThrow(); } catch (NullPointerException success) {} } @@ -165,10 +176,10 @@ public class AtomicReferenceArrayTest extends JSR166TestCase { AtomicReferenceArray aa = new AtomicReferenceArray(SIZE); for (int i = 0; i < SIZE; i++) { aa.set(i, one); - while (!aa.weakCompareAndSet(i, one, two)); - while (!aa.weakCompareAndSet(i, two, m4)); + do {} while (!aa.weakCompareAndSet(i, one, two)); + do {} while (!aa.weakCompareAndSet(i, two, m4)); assertSame(m4, aa.get(i)); - while (!aa.weakCompareAndSet(i, m4, seven)); + do {} while (!aa.weakCompareAndSet(i, m4, seven)); assertSame(seven, aa.get(i)); } } |