--- jsr166/src/test/tck/AtomicReferenceArrayTest.java 2009/11/16 04:57:10 1.12 +++ jsr166/src/test/tck/AtomicReferenceArrayTest.java 2009/12/01 09:56:28 1.17 @@ -11,8 +11,7 @@ import java.util.concurrent.atomic.*; import java.io.*; import java.util.*; -public class AtomicReferenceArrayTest extends JSR166TestCase -{ +public class AtomicReferenceArrayTest extends JSR166TestCase { public static void main (String[] args) { junit.textui.TestRunner.run (suite()); } @@ -23,7 +22,7 @@ public class AtomicReferenceArrayTest ex /** * constructor creates array of given size with all elements null */ - public void testConstructor(){ + public void testConstructor() { AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); for (int i = 0; i < SIZE; ++i) { assertNull(ai.get(i)); @@ -37,10 +36,8 @@ public class AtomicReferenceArrayTest ex try { Integer[] a = null; AtomicReferenceArray ai = new AtomicReferenceArray(a); - } catch (NullPointerException success) { - } catch (Exception ex) { - unexpectedException(); - } + shouldThrow(); + } catch (NullPointerException success) {} } /** @@ -58,70 +55,74 @@ public class AtomicReferenceArrayTest ex /** * get and set for out of bound indices throw IndexOutOfBoundsException */ - public void testIndexing(){ + public void testIndexing() { AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); try { ai.get(SIZE); - } catch (IndexOutOfBoundsException success){ + shouldThrow(); + } catch (IndexOutOfBoundsException success) { } try { ai.get(-1); - } catch (IndexOutOfBoundsException success){ + shouldThrow(); + } catch (IndexOutOfBoundsException success) { } try { ai.set(SIZE, null); - } catch (IndexOutOfBoundsException success){ + shouldThrow(); + } catch (IndexOutOfBoundsException success) { } try { ai.set(-1, null); - } catch (IndexOutOfBoundsException success){ + shouldThrow(); + } catch (IndexOutOfBoundsException success) { } } /** * get returns the last value set at index */ - public void testGetSet(){ + public void testGetSet() { AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); for (int i = 0; i < SIZE; ++i) { ai.set(i, one); - assertEquals(one,ai.get(i)); + assertSame(one,ai.get(i)); ai.set(i, two); - assertEquals(two,ai.get(i)); + assertSame(two,ai.get(i)); ai.set(i, m3); - assertEquals(m3,ai.get(i)); + assertSame(m3,ai.get(i)); } } /** * get returns the last value lazySet at index by same thread */ - public void testGetLazySet(){ + public void testGetLazySet() { AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); for (int i = 0; i < SIZE; ++i) { ai.lazySet(i, one); - assertEquals(one,ai.get(i)); + assertSame(one,ai.get(i)); ai.lazySet(i, two); - assertEquals(two,ai.get(i)); + assertSame(two,ai.get(i)); ai.lazySet(i, m3); - assertEquals(m3,ai.get(i)); + assertSame(m3,ai.get(i)); } } /** * compareAndSet succeeds in changing value if equal to expected else fails */ - public void testCompareAndSet(){ + public void testCompareAndSet() { AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); for (int i = 0; i < SIZE; ++i) { ai.set(i, one); assertTrue(ai.compareAndSet(i, one,two)); assertTrue(ai.compareAndSet(i, two,m4)); - assertEquals(m4,ai.get(i)); + assertSame(m4,ai.get(i)); assertFalse(ai.compareAndSet(i, m5,seven)); - assertFalse((seven.equals(ai.get(i)))); + assertSame(m4,ai.get(i)); assertTrue(ai.compareAndSet(i, m4,seven)); - assertEquals(seven,ai.get(i)); + assertSame(seven,ai.get(i)); } } @@ -129,78 +130,71 @@ public class AtomicReferenceArrayTest ex * compareAndSet in one thread enables another waiting for value * to succeed */ - public void testCompareAndSetInMultipleThreads() { + public void testCompareAndSetInMultipleThreads() throws InterruptedException { final AtomicReferenceArray a = new AtomicReferenceArray(1); a.set(0, one); - Thread t = new Thread(new Runnable() { - public void run() { - while (!a.compareAndSet(0, two, three)) Thread.yield(); - }}); - try { - t.start(); - assertTrue(a.compareAndSet(0, one, two)); - t.join(LONG_DELAY_MS); - assertFalse(t.isAlive()); - assertEquals(a.get(0), three); - } - catch (Exception e) { - unexpectedException(); - } + Thread t = new Thread(new CheckedRunnable() { + public void realRun() { + while (!a.compareAndSet(0, two, three)) + Thread.yield(); + }}); + + t.start(); + assertTrue(a.compareAndSet(0, one, two)); + t.join(LONG_DELAY_MS); + assertFalse(t.isAlive()); + assertSame(a.get(0), three); } /** * repeated weakCompareAndSet succeeds in changing value when equal * to expected */ - public void testWeakCompareAndSet(){ + public void testWeakCompareAndSet() { AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); for (int i = 0; i < SIZE; ++i) { ai.set(i, one); while (!ai.weakCompareAndSet(i, one,two)); while (!ai.weakCompareAndSet(i, two,m4)); - assertEquals(m4,ai.get(i)); + assertSame(m4,ai.get(i)); while (!ai.weakCompareAndSet(i, m4,seven)); - assertEquals(seven,ai.get(i)); + assertSame(seven,ai.get(i)); } } /** * getAndSet returns previous value and sets to given value at given index */ - public void testGetAndSet(){ + public void testGetAndSet() { AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); for (int i = 0; i < SIZE; ++i) { ai.set(i, one); - assertEquals(one,ai.getAndSet(i,zero)); - assertEquals(0,ai.getAndSet(i,m10)); - assertEquals(m10,ai.getAndSet(i,one)); + assertSame(one,ai.getAndSet(i,zero)); + assertSame(zero,ai.getAndSet(i,m10)); + assertSame(m10,ai.getAndSet(i,one)); } } /** * a deserialized serialized array holds same values */ - public void testSerialization() { + public void testSerialization() throws Exception { AtomicReferenceArray l = new AtomicReferenceArray(SIZE); for (int i = 0; i < SIZE; ++i) { l.set(i, new Integer(-i)); } - try { - ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); - ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); - out.writeObject(l); - out.close(); - - ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); - ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); - AtomicReferenceArray r = (AtomicReferenceArray) in.readObject(); - assertEquals(l.length(), r.length()); - for (int i = 0; i < SIZE; ++i) { - assertEquals(r.get(i), l.get(i)); - } - } catch (Exception e){ - unexpectedException(); + ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); + ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); + out.writeObject(l); + out.close(); + + ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); + ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); + AtomicReferenceArray r = (AtomicReferenceArray) in.readObject(); + assertEquals(l.length(), r.length()); + for (int i = 0; i < SIZE; ++i) { + assertEquals(r.get(i), l.get(i)); } }