--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2003/12/29 19:05:40	1.7
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2009/11/16 04:57:10	1.12
@@ -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 java.util.concurrent.atomic.*;
@@ -26,7 +26,7 @@ public class AtomicReferenceFieldUpdater
      * Construction with non-existent field throws RuntimeException
      */
     public void testConstructor(){
-        try{
+        try {
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "y");
@@ -40,7 +40,7 @@ public class AtomicReferenceFieldUpdater
      * construction with field not of given type throws RuntimeException
      */
     public void testConstructor2(){
-        try{
+        try {
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
@@ -53,7 +53,7 @@ public class AtomicReferenceFieldUpdater
      * Constructor with non-volatile field throws exception
      */
     public void testConstructor3(){
-        try{
+        try {
             AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>
                 a = AtomicReferenceFieldUpdater.newUpdater
                 (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
@@ -66,20 +66,48 @@ 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));
     }
+
+    /**
+     *  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(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,11 +124,16 @@ 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() {
-                    while(!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three)) Thread.yield();
+                    while (!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three)) Thread.yield();
                 }});
         try {
             t.start();
@@ -109,22 +142,27 @@ public class AtomicReferenceFieldUpdater
             assertFalse(t.isAlive());
             assertEquals(a.get(this), three);
         }
-        catch(Exception e) {
+        catch (Exception e) {
             unexpectedException();
         }
     }
 
     /**
      * repeated weakCompareAndSet succeeds in changing value when equal
-     * to expected 
+     * 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));
+	while (!a.weakCompareAndSet(this,one,two));
+	while (!a.weakCompareAndSet(this,two,m4));
 	assertEquals(m4,a.get(this));
-	while(!a.weakCompareAndSet(this,m4,seven));
+	while (!a.weakCompareAndSet(this,m4,seven));
 	assertEquals(seven,a.get(this));
     }
 
@@ -132,7 +170,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));