--- jsr166/src/test/tck/AtomicIntegerTest.java	2009/11/21 02:07:26	1.17
+++ jsr166/src/test/tck/AtomicIntegerTest.java	2009/12/01 09:56:28	1.19
@@ -18,6 +18,10 @@ public class AtomicIntegerTest extends J
         return new TestSuite(AtomicIntegerTest.class);
     }
 
+    final int[] VALUES = {
+        Integer.MIN_VALUE, -1, 0, 1, 42, Integer.MAX_VALUE,
+    };
+
     /**
      * constructor initializes to given value
      */
@@ -44,7 +48,6 @@ public class AtomicIntegerTest extends J
         assertEquals(2,ai.get());
         ai.set(-3);
         assertEquals(-3,ai.get());
-
     }
 
     /**
@@ -57,8 +60,8 @@ public class AtomicIntegerTest extends J
         assertEquals(2,ai.get());
         ai.lazySet(-3);
         assertEquals(-3,ai.get());
-
     }
+
     /**
      * compareAndSet succeeds in changing value if equal to expected else fails
      */
@@ -68,7 +71,7 @@ public class AtomicIntegerTest extends J
         assertTrue(ai.compareAndSet(2,-4));
         assertEquals(-4,ai.get());
         assertFalse(ai.compareAndSet(-5,7));
-        assertFalse((7 == ai.get()));
+        assertEquals(-4,ai.get());
         assertTrue(ai.compareAndSet(-4,7));
         assertEquals(7,ai.get());
     }
@@ -209,9 +212,10 @@ public class AtomicIntegerTest extends J
      */
     public void testToString() {
         AtomicInteger ai = new AtomicInteger();
-        for (int i = -12; i < 6; ++i) {
-            ai.set(i);
-            assertEquals(ai.toString(), Integer.toString(i));
+        assertEquals("0", ai.toString());
+        for (int x : VALUES) {
+            ai.set(x);
+            assertEquals(ai.toString(), Integer.toString(x));
         }
     }
 
@@ -220,21 +224,22 @@ public class AtomicIntegerTest extends J
      */
     public void testIntValue() {
         AtomicInteger ai = new AtomicInteger();
-        for (int i = -12; i < 6; ++i) {
-            ai.set(i);
-            assertEquals(i, ai.intValue());
+        assertEquals(0, ai.intValue());
+        for (int x : VALUES) {
+            ai.set(x);
+            assertEquals(x, ai.intValue());
         }
     }
 
-
     /**
      * longValue returns current value.
      */
     public void testLongValue() {
         AtomicInteger ai = new AtomicInteger();
-        for (int i = -12; i < 6; ++i) {
-            ai.set(i);
-            assertEquals((long)i, ai.longValue());
+        assertEquals(0L, ai.longValue());
+        for (int x : VALUES) {
+            ai.set(x);
+            assertEquals((long)x, ai.longValue());
         }
     }
 
@@ -243,9 +248,10 @@ public class AtomicIntegerTest extends J
      */
     public void testFloatValue() {
         AtomicInteger ai = new AtomicInteger();
-        for (int i = -12; i < 6; ++i) {
-            ai.set(i);
-            assertEquals((float)i, ai.floatValue());
+        assertEquals(0.0f, ai.floatValue());
+        for (int x : VALUES) {
+            ai.set(x);
+            assertEquals((float)x, ai.floatValue());
         }
     }
 
@@ -254,12 +260,11 @@ public class AtomicIntegerTest extends J
      */
     public void testDoubleValue() {
         AtomicInteger ai = new AtomicInteger();
-        for (int i = -12; i < 6; ++i) {
-            ai.set(i);
-            assertEquals((double)i, ai.doubleValue());
+        assertEquals(0.0d, ai.doubleValue());
+        for (int x : VALUES) {
+            ai.set(x);
+            assertEquals((double)x, ai.doubleValue());
         }
     }
 
-
-
 }