--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2003/12/27 19:26:43	1.6
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2004/12/28 16:15:59	1.9
@@ -23,7 +23,7 @@ public class AtomicReferenceFieldUpdater
     }
 
     /**
-     * Contruction with non-existent field throws RuntimeException
+     * Construction with non-existent field throws RuntimeException
      */
     public void testConstructor(){
         try{
@@ -66,20 +66,30 @@ public class AtomicReferenceFieldUpdater
      *  get returns the last value set or assigned
      */
     public void testGetSet(){
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        try {
+            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = one;
 	assertEquals(one,a.get(this));
 	a.set(this,two);
 	assertEquals(two,a.get(this));
-	a.set(this,-3);
-	assertEquals(-3,a.get(this));
+	a.set(this,m3);
+	assertEquals(m3,a.get(this));
 	
     }
     /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
     public void testCompareAndSet(){
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        try {
+            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = one;
 	assertTrue(a.compareAndSet(this,one,two));
 	assertTrue(a.compareAndSet(this,two,m4));
@@ -96,7 +106,12 @@ public class AtomicReferenceFieldUpdater
      */
     public void testCompareAndSetInMultipleThreads() {
         x = one;
-        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        try {
+            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
 
         Thread t = new Thread(new Runnable() {
                 public void run() {
@@ -119,7 +134,12 @@ public class AtomicReferenceFieldUpdater
      * to expected 
      */
     public void testWeakCompareAndSet(){
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        try {
+            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = one;
 	while(!a.weakCompareAndSet(this,one,two));
 	while(!a.weakCompareAndSet(this,two,m4));
@@ -132,7 +152,12 @@ public class AtomicReferenceFieldUpdater
      * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet(){
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
+        try {
+            a = AtomicReferenceFieldUpdater.newUpdater(AtomicReferenceFieldUpdaterTest.class, Integer.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = one;
 	assertEquals(one,a.getAndSet(this, zero));
 	assertEquals(zero,a.getAndSet(this,m10));