--- jsr166/src/test/tck/AtomicLongTest.java	2003/12/29 19:05:40	1.7
+++ jsr166/src/test/tck/AtomicLongTest.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 junit.framework.*;
@@ -44,8 +44,22 @@ public class AtomicLongTest extends JSR1
 	assertEquals(2,ai.get());
 	ai.set(-3);
 	assertEquals(-3,ai.get());
-	
+
+    }
+
+    /**
+     * get returns the last value lazySet in same thread
+     */
+    public void testGetLazySet(){
+        AtomicLong ai = new AtomicLong(1);
+	assertEquals(1,ai.get());
+	ai.lazySet(2);
+	assertEquals(2,ai.get());
+	ai.lazySet(-3);
+	assertEquals(-3,ai.get());
+
     }
+
     /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
@@ -68,7 +82,7 @@ public class AtomicLongTest extends JSR1
         final AtomicLong ai = new AtomicLong(1);
         Thread t = new Thread(new Runnable() {
                 public void run() {
-                    while(!ai.compareAndSet(2, 3)) Thread.yield();
+                    while (!ai.compareAndSet(2, 3)) Thread.yield();
                 }});
         try {
             t.start();
@@ -77,21 +91,21 @@ public class AtomicLongTest extends JSR1
             assertFalse(t.isAlive());
             assertEquals(ai.get(), 3);
         }
-        catch(Exception e) {
+        catch (Exception e) {
             unexpectedException();
         }
     }
 
     /**
      * repeated weakCompareAndSet succeeds in changing value when equal
-     * to expected 
+     * to expected
      */
     public void testWeakCompareAndSet(){
         AtomicLong ai = new AtomicLong(1);
-	while(!ai.weakCompareAndSet(1,2));
-	while(!ai.weakCompareAndSet(2,-4));
+	while (!ai.weakCompareAndSet(1,2));
+	while (!ai.weakCompareAndSet(2,-4));
 	assertEquals(-4,ai.get());
-	while(!ai.weakCompareAndSet(-4,7));
+	while (!ai.weakCompareAndSet(-4,7));
 	assertEquals(7,ai.get());
     }
 
@@ -193,9 +207,54 @@ public class AtomicLongTest extends JSR1
             ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
             AtomicLong r = (AtomicLong) in.readObject();
             assertEquals(l.get(), r.get());
-        } catch(Exception e){
+        } catch (Exception e){
             unexpectedException();
         }
     }
 
+    /**
+     * toString returns current value.
+     */
+    public void testToString() {
+        AtomicLong ai = new AtomicLong();
+        for (long i = -12; i < 6; ++i) {
+            ai.set(i);
+            assertEquals(ai.toString(), Long.toString(i));
+        }
+    }
+
+    /**
+     * longValue returns current value.
+     */
+    public void testLongValue() {
+        AtomicLong ai = new AtomicLong();
+        for (int i = -12; i < 6; ++i) {
+            ai.set(i);
+            assertEquals((long)i, ai.longValue());
+        }
+    }
+
+    /**
+     * floatValue returns current value.
+     */
+    public void testFloatValue() {
+        AtomicLong ai = new AtomicLong();
+        for (int i = -12; i < 6; ++i) {
+            ai.set(i);
+            assertEquals((float)i, ai.floatValue());
+        }
+    }
+
+    /**
+     * doubleValue returns current value.
+     */
+    public void testDoubleValue() {
+        AtomicLong ai = new AtomicLong();
+        for (int i = -12; i < 6; ++i) {
+            ai.set(i);
+            assertEquals((double)i, ai.doubleValue());
+        }
+    }
+
+
 }