--- jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2013/04/01 20:58:58	1.26
+++ jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java	2014/12/31 19:05:42	1.30
@@ -6,13 +6,16 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class AtomicReferenceFieldUpdaterTest extends JSR166TestCase {
     volatile Integer x = null;
     Object z;
     Integer w;
+    volatile int i;
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -33,27 +36,39 @@ public class AtomicReferenceFieldUpdater
         try {
             updaterFor("y");
             shouldThrow();
-        } catch (RuntimeException success) {}
+        } catch (RuntimeException success) {
+            assertNotNull(success.getCause());
+        }
     }
 
     /**
-     * construction with field not of given type throws RuntimeException
+     * construction with field not of given type throws ClassCastException
      */
     public void testConstructor2() {
         try {
             updaterFor("z");
             shouldThrow();
-        } catch (RuntimeException success) {}
+        } catch (ClassCastException success) {}
     }
 
     /**
-     * Constructor with non-volatile field throws exception
+     * Constructor with non-volatile field throws IllegalArgumentException
      */
     public void testConstructor3() {
         try {
             updaterFor("w");
             shouldThrow();
-        } catch (RuntimeException success) {}
+        } catch (IllegalArgumentException success) {}
+    }
+
+    /**
+     * Constructor with non-reference field throws ClassCastException
+     */
+    public void testConstructor4() {
+        try {
+            updaterFor("i");
+            shouldThrow();
+        } catch (ClassCastException success) {}
     }
 
     /**