--- jsr166/src/test/tck/AtomicReferenceArrayTest.java	2005/05/25 14:27:37	1.10
+++ jsr166/src/test/tck/AtomicReferenceArrayTest.java	2009/11/17 02:50:57	1.14
@@ -2,8 +2,8 @@
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
- * Other contributors include Andrew Wright, Jeffrey Hayes, 
- * Pat Fisher, Mike Judd. 
+ * Other contributors include Andrew Wright, Jeffrey Hayes,
+ * Pat Fisher, Mike Judd.
  */
 
 import junit.framework.*;
@@ -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);
+            shouldThrow();
         } catch (NullPointerException success) {
-        } catch (Exception ex) {
-            unexpectedException();
-        }
     }
 
     /**
@@ -50,7 +47,7 @@ public class AtomicReferenceArrayTest ex
         Integer[] a = { two, one, three, four, seven};
         AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(a);
         assertEquals(a.length, ai.length());
-        for (int i = 0; i < a.length; ++i) 
+        for (int i = 0; i < a.length; ++i)
             assertEquals(a[i], ai.get(i));
     }
 
@@ -58,31 +55,35 @@ 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(){
-        AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
+    public void testGetSet() {
+        AtomicReferenceArray ai = new AtomicReferenceArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.set(i, one);
             assertEquals(one,ai.get(i));
@@ -96,8 +97,8 @@ public class AtomicReferenceArrayTest ex
     /**
      * get returns the last value lazySet at index by same thread
      */
-    public void testGetLazySet(){
-        AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
+    public void testGetLazySet() {
+        AtomicReferenceArray ai = new AtomicReferenceArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             ai.lazySet(i, one);
             assertEquals(one,ai.get(i));
@@ -111,8 +112,8 @@ public class AtomicReferenceArrayTest ex
     /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
-    public void testCompareAndSet(){
-        AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
+    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));
@@ -134,7 +135,7 @@ public class AtomicReferenceArrayTest ex
         a.set(0, one);
         Thread t = new Thread(new Runnable() {
                 public void run() {
-                    while(!a.compareAndSet(0, two, three)) Thread.yield();
+                    while (!a.compareAndSet(0, two, three)) Thread.yield();
                 }});
         try {
             t.start();
@@ -143,23 +144,23 @@ public class AtomicReferenceArrayTest ex
             assertFalse(t.isAlive());
             assertEquals(a.get(0), three);
         }
-        catch(Exception e) {
+        catch (Exception e) {
             unexpectedException();
         }
     }
 
     /**
      * repeated weakCompareAndSet succeeds in changing value when equal
-     * to expected 
+     * to expected
      */
-    public void testWeakCompareAndSet(){
-        AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
+    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));
+            while (!ai.weakCompareAndSet(i, one,two));
+            while (!ai.weakCompareAndSet(i, two,m4));
             assertEquals(m4,ai.get(i));
-            while(!ai.weakCompareAndSet(i, m4,seven));
+            while (!ai.weakCompareAndSet(i, m4,seven));
             assertEquals(seven,ai.get(i));
         }
     }
@@ -167,8 +168,8 @@ public class AtomicReferenceArrayTest ex
     /**
      * getAndSet returns previous value and sets to given value at given index
      */
-    public void testGetAndSet(){
-        AtomicReferenceArray ai = new AtomicReferenceArray(SIZE); 
+    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));
@@ -181,7 +182,7 @@ public class AtomicReferenceArrayTest ex
      * a deserialized serialized array holds same values
      */
     public void testSerialization() {
-        AtomicReferenceArray l = new AtomicReferenceArray(SIZE); 
+        AtomicReferenceArray l = new AtomicReferenceArray(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             l.set(i, new Integer(-i));
         }
@@ -199,7 +200,7 @@ public class AtomicReferenceArrayTest ex
             for (int i = 0; i < SIZE; ++i) {
                 assertEquals(r.get(i), l.get(i));
             }
-        } catch(Exception e){
+        } catch (Exception e) {
             unexpectedException();
         }
     }
@@ -207,7 +208,7 @@ public class AtomicReferenceArrayTest ex
 
     /**
      * toString returns current value.
-     */ 
+     */
     public void testToString() {
         Integer[] a = { two, one, three, four, seven};
         AtomicReferenceArray<Integer> ai = new AtomicReferenceArray<Integer>(a);