--- jsr166/src/test/tck/AtomicReferenceArrayTest.java	2009/11/16 04:57:10	1.12
+++ jsr166/src/test/tck/AtomicReferenceArrayTest.java	2009/11/17 02:53:14	1.15
@@ -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<Integer> ai = new AtomicReferenceArray<Integer>(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<Integer> ai = new AtomicReferenceArray<Integer>(a);
-        } catch (NullPointerException success) {
-        } catch (Exception ex) {
-            unexpectedException();
-        }
+            shouldThrow();
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -58,30 +55,34 @@ public class AtomicReferenceArrayTest ex
     /**
      * get and set for out of bound indices throw IndexOutOfBoundsException
      */
-    public void testIndexing(){
+    public void testIndexing() {
         AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(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);
@@ -96,7 +97,7 @@ public class AtomicReferenceArrayTest ex
     /**
      * 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);
@@ -111,7 +112,7 @@ public class AtomicReferenceArrayTest ex
     /**
      * 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);
@@ -129,30 +130,26 @@ 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();
-        }
+
+        t.start();
+        assertTrue(a.compareAndSet(0, one, two));
+        t.join(LONG_DELAY_MS);
+        assertFalse(t.isAlive());
+        assertEquals(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);
@@ -167,7 +164,7 @@ public class AtomicReferenceArrayTest ex
     /**
      * 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);
@@ -180,27 +177,23 @@ public class AtomicReferenceArrayTest ex
     /**
      * 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));
         }
     }