--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2003/10/25 16:02:13	1.5
+++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2004/01/20 20:20:56	1.8
@@ -1,8 +1,9 @@
 /*
- * Written by members of JCP JSR-166 Expert Group and released to the
- * public domain. Use, modify, and redistribute this code in any way
- * without acknowledgement. Other contributors include Andrew Wright,
- * Jeffrey Hayes, Pat Fischer, Mike Judd.
+ * 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. 
  */
 
 import java.util.concurrent.atomic.*;
@@ -22,7 +23,7 @@ public class AtomicLongFieldUpdaterTest
     }
 
     /**
-     * Contruction with non-existent field throws RuntimeException
+     * Construction with non-existent field throws RuntimeException
      */
     public void testConstructor(){
         try{
@@ -65,7 +66,12 @@ public class AtomicLongFieldUpdaterTest
      *  get returns the last value set or assigned
      */
     public void testGetSet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertEquals(1,a.get(this));
 	a.set(this,2);
@@ -78,7 +84,12 @@ public class AtomicLongFieldUpdaterTest
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
     public void testCompareAndSet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertTrue(a.compareAndSet(this,1,2));
 	assertTrue(a.compareAndSet(this,2,-4));
@@ -96,7 +107,12 @@ public class AtomicLongFieldUpdaterTest
      */
     public void testCompareAndSetInMultipleThreads() {
         x = 1;
-        final AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest>a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        final AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest>a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
 
         Thread t = new Thread(new Runnable() {
                 public void run() {
@@ -119,7 +135,12 @@ public class AtomicLongFieldUpdaterTest
      * to expected 
      */
     public void testWeakCompareAndSet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	while(!a.weakCompareAndSet(this,1,2));
         while(!a.weakCompareAndSet(this,2,-4));
@@ -132,7 +153,12 @@ public class AtomicLongFieldUpdaterTest
      *  getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertEquals(1,a.getAndSet(this, 0));
 	assertEquals(0,a.getAndSet(this,-10));
@@ -143,7 +169,12 @@ public class AtomicLongFieldUpdaterTest
      * getAndAdd returns previous value and adds given value
      */
     public void testGetAndAdd(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertEquals(1,a.getAndAdd(this,2));
 	assertEquals(3,a.get(this));
@@ -155,7 +186,12 @@ public class AtomicLongFieldUpdaterTest
      * getAndDecrement returns previous value and decrements
      */
     public void testGetAndDecrement(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertEquals(1,a.getAndDecrement(this));
 	assertEquals(0,a.getAndDecrement(this));
@@ -166,7 +202,12 @@ public class AtomicLongFieldUpdaterTest
      * getAndIncrement returns previous value and increments
      */
     public void testGetAndIncrement(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertEquals(1,a.getAndIncrement(this));
 	assertEquals(2,a.get(this));
@@ -181,7 +222,12 @@ public class AtomicLongFieldUpdaterTest
      * addAndGet adds given value to current, and returns current value
      */
     public void testAddAndGet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertEquals(3,a.addAndGet(this,2));
 	assertEquals(3,a.get(this));
@@ -193,7 +239,12 @@ public class AtomicLongFieldUpdaterTest
      *  decrementAndGet decrements and returns current value
      */
     public void testDecrementAndGet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertEquals(0,a.decrementAndGet(this));
 	assertEquals(-1,a.decrementAndGet(this));
@@ -205,7 +256,12 @@ public class AtomicLongFieldUpdaterTest
      * incrementAndGet increments and returns current value
      */
     public void testIncrementAndGet(){
-        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
         x = 1;
 	assertEquals(2,a.incrementAndGet(this));
 	assertEquals(2,a.get(this));