--- jsr166/src/test/tck/AtomicReferenceTest.java	2003/09/07 20:39:11	1.2
+++ jsr166/src/test/tck/AtomicReferenceTest.java	2003/09/20 18:20:07	1.4
@@ -9,7 +9,7 @@ import junit.framework.*;
 import java.util.concurrent.atomic.*;
 import java.io.*;
 
-public class AtomicReferenceTest extends TestCase {
+public class AtomicReferenceTest extends JSR166TestCase {
     public static void main (String[] args) {
         junit.textui.TestRunner.run (suite());
     }
@@ -17,25 +17,25 @@ public class AtomicReferenceTest extends
         return new TestSuite(AtomicReferenceTest.class);
     }
 
-    static final Integer zero = new Integer(0);
-    static final Integer one = new Integer(1);
-    static final Integer two = new Integer(2);
-    static final Integer m3  = new Integer(-3);
-    static final Integer m4 = new Integer(-4);
-    static final Integer m5 = new Integer(-5);
-    static final Integer seven = new Integer(7);
-    static final Integer m10 = new Integer(-10);
-
+    /**
+     *
+     */
     public void testConstructor(){
         AtomicReference ai = new AtomicReference(one);
 	assertEquals(one,ai.get());
     }
 
+    /**
+     *
+     */
     public void testConstructor2(){
         AtomicReference ai = new AtomicReference();
 	assertNull(ai.get());
     }
 
+    /**
+     *
+     */
     public void testGetSet(){
         AtomicReference ai = new AtomicReference(one);
 	assertEquals(one,ai.get());
@@ -45,6 +45,9 @@ public class AtomicReferenceTest extends
 	assertEquals(m3,ai.get());
 	
     }
+    /**
+     *
+     */
     public void testCompareAndSet(){
         AtomicReference ai = new AtomicReference(one);
 	assertTrue(ai.compareAndSet(one,two));
@@ -56,6 +59,9 @@ public class AtomicReferenceTest extends
 	assertEquals(seven,ai.get());
     }
 
+    /**
+     *
+     */
     public void testWeakCompareAndSet(){
         AtomicReference ai = new AtomicReference(one);
 	while(!ai.weakCompareAndSet(one,two));
@@ -65,6 +71,9 @@ public class AtomicReferenceTest extends
 	assertEquals(seven,ai.get());
     }
 
+    /**
+     *
+     */
     public void testGetAndSet(){
         AtomicReference ai = new AtomicReference(one);
 	assertEquals(one,ai.getAndSet(zero));
@@ -72,6 +81,9 @@ public class AtomicReferenceTest extends
 	assertEquals(m10,ai.getAndSet(one));
     }
 
+    /**
+     *
+     */
     public void testSerialization() {
         AtomicReference l = new AtomicReference();
 
@@ -87,8 +99,7 @@ public class AtomicReferenceTest extends
             AtomicReference r = (AtomicReference) in.readObject();
             assertEquals(l.get(), r.get());
         } catch(Exception e){
-            e.printStackTrace();
-            fail("unexpected exception");
+            unexpectedException();
         }
     }