--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2003/09/25 11:02:41	1.4
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2009/11/02 20:28:31	1.11
@@ -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,13 +23,13 @@ public class AtomicReferenceFieldUpdater
     }
 
     /**
-     * Contruction with non-existent field throws RuntimeException
+     * Construction with non-existent field throws RuntimeException
      */
     public void testConstructor(){
         try{
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
-                (getClass(), Integer.class, "y");
+                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "y");
             shouldThrow();
         }
         catch (RuntimeException rt) {}
@@ -42,7 +43,7 @@ public class AtomicReferenceFieldUpdater
         try{
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
-                (getClass(), Integer.class, "z");
+                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
             shouldThrow();
         }
         catch (RuntimeException rt) {}
@@ -55,7 +56,7 @@ public class AtomicReferenceFieldUpdater
         try{
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
-                (getClass(), Integer.class, "w");
+                (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
             shouldThrow();
         }
         catch (RuntimeException rt) {}
@@ -65,20 +66,48 @@ public class AtomicReferenceFieldUpdater
      *  get returns the last value set or assigned
      */
     public void testGetSet(){
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), 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));
+    }
+
+    /**
+     *  get returns the last value lazySet by same thread
+     */
+    public void testGetLazySet(){
+        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.lazySet(this,two);
+	assertEquals(two,a.get(this));
+	a.lazySet(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(getClass(), 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));
@@ -95,7 +124,12 @@ public class AtomicReferenceFieldUpdater
      */
     public void testCompareAndSetInMultipleThreads() {
         x = one;
-        final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), 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() {
@@ -115,10 +149,15 @@ public class AtomicReferenceFieldUpdater
 
     /**
      * repeated weakCompareAndSet succeeds in changing value when equal
-     * to expected 
+     * to expected
      */
     public void testWeakCompareAndSet(){
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), 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));
@@ -131,7 +170,12 @@ public class AtomicReferenceFieldUpdater
      * getAndSet returns previous value and sets to given value
      */
     public void testGetAndSet(){
-        AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a = AtomicReferenceFieldUpdater.newUpdater(getClass(), 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));