--- jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2003/12/27 19:26:43	1.6
+++ jsr166/src/test/tck/AtomicLongFieldUpdaterTest.java	2005/05/25 14:27:37	1.9
@@ -23,7 +23,7 @@ public class AtomicLongFieldUpdaterTest
     }
 
     /**
-     * Contruction with non-existent field throws RuntimeException
+     * Construction with non-existent field throws RuntimeException
      */
     public void testConstructor(){
         try{
@@ -66,20 +66,49 @@ 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);
 	assertEquals(2,a.get(this));
 	a.set(this,-3);
 	assertEquals(-3,a.get(this));
-	
     }
+
+    /**
+     *  get returns the last value lazySet by same thread
+     */
+    public void testGetLazySet(){
+        AtomicLongFieldUpdater<AtomicLongFieldUpdaterTest> a;
+        try {
+            a = AtomicLongFieldUpdater.newUpdater(AtomicLongFieldUpdaterTest.class, "x");
+        } catch (RuntimeException ok) {
+            return;
+        }
+        x = 1;
+	assertEquals(1,a.get(this));
+	a.lazySet(this,2);
+	assertEquals(2,a.get(this));
+	a.lazySet(this,-3);
+	assertEquals(-3,a.get(this));
+    }
+
+
     /**
      * 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));
@@ -97,7 +126,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() {
@@ -120,7 +154,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));
@@ -133,7 +172,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));
@@ -144,7 +188,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));
@@ -156,7 +205,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));
@@ -167,7 +221,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));
@@ -182,7 +241,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));
@@ -194,7 +258,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));
@@ -206,7 +275,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));