More tests.

diff --git a/tests/codepatching/multianewarray.java b/tests/codepatching/multianewarray.java
new file mode 100644 (file)
index 0000000..1573d48
--- /dev/null
+++ b/tests/codepatching/multianewarray.java
@@ -0,0 +1,2 @@
+public class multianewarray {
+}

diff --git a/tests/codepatching/newarray.java b/tests/codepatching/newarray.java
new file mode 100644 (file)
index 0000000..5f116d0
--- /dev/null
+++ b/tests/codepatching/newarray.java
@@ -0,0 +1,2 @@
+public class newarray {
+}

diff --git a/tests/codepatching/test.java b/tests/codepatching/test.java
index 470e7e677cb8038df1617bd5c848b7495998690c..c38b4bb5ad0262708b2154f0df74e72875f41fac 100644 (file)
--- a/tests/codepatching/test.java
+++ b/tests/codepatching/test.java
@@ -4,14 +4,17 @@ public class test {
     }
 
     public test() {
-//         getstatic();
-//         putstatic();
+        getstatic();
+        putstatic();
 
-//         getfield();
-//         putfield();
-//         putfieldconst();
+        getfield();
+        putfield();
+        putfieldconst();
 
-//         invokespecial();
+        newarray();
+        multianewarray();
+
+        invokespecial();
 
         checkcast();
         _instanceof();
@@ -62,132 +65,174 @@ public class test {
     }
 
     public void putfield() {
-        p("putfield:");
-
-        int i = 123;
-        long l = 456L;
-        float f = 123.456F;
-        double d = 789.012;
-        Object o = null;
-
+        p("putfield (I): ");
         putfieldI pfi = new putfieldI();
+        int i = 123;
         pfi.i = i;
         check(pfi.i, i);
 
+        p("putfield (J): ");
         putfieldJ pfj = new putfieldJ();
+        long l = 456L;
         pfj.l = l;
         check(pfj.l, l);
 
+        p("putfield (F): ");
         putfieldF pff = new putfieldF();
+        float f = 123.456F;
         pff.f = f;
         check(pff.f, f);
 
+        p("putfield (D): ");
         putfieldD pfd = new putfieldD();
+        double d = 789.012;
         pfd.d = d;
         check(pfd.d, d);
 
+        p("putfield (L): ");
         putfieldL pfl = new putfieldL();
+        Object o = null;
         pfl.o = o;
         check(pfl.o, o);
     }
 
     public void putfieldconst() {
-        p("putfieldconst:");
-
+        p("putfieldconst (I,F): ");
         putfieldconstIF pfcif = new putfieldconstIF();
         pfcif.i = 123;
         check(pfcif.i, 123);
-
+ 
+        p("putfieldconst (J,D,L): ");
         putfieldconstJDL pfcjdl = new putfieldconstJDL();
         pfcjdl.l = 456;
         check(pfcjdl.l, 456);
     }
 
+    private void newarray() {
+        try {
+            p("newarray: ");
+            newarray[] na = new newarray[1];
+            ok();
+        } catch (Throwable t) {
+            failed(t);
+        }
+    }
+
+    private void multianewarray() {
+        try {
+            p("multianewarray: ");
+            multianewarray[][] ma = new multianewarray[1][1];
+            ok();
+        } catch (Throwable t) {
+            failed(t);
+        }
+    }
+
     public void invokespecial() {
-        p("invokespecial:");
-        new invokespecial();
+        try {
+            p("invokespecial: ");
+            new invokespecial();
+        } catch (Throwable t) {
+            failed(t);
+        }
     }
 
     private void checkcast() {
-        p("checkcast:");
-
         Object o = new Object();
 
         try {
+            p("checkcast class: ");
             checkcastC cc = (checkcastC) o;
-            p("FAILED");
+            failed();
         } catch (ClassCastException e) {
-            p("OK");
+            ok();
         }
 
         try {
+            p("checkcast interface: ");
             checkcastI ci = (checkcastI) o;
-            p("FAILED");
+            failed();
         } catch (ClassCastException e) {
-            p("OK");
+            ok();
         }
     }
 
     private void _instanceof() {
-        p("instanceof:");
-
         Object o = new Object();
 
         try {
+            p("instanceof class: ");
             if (o instanceof instanceofC)
-                p("FAILED");
+                failed();
             else
-                p("OK");
-        } catch (NoClassDefFoundError e) {
-            p("OK");
+                ok();
+        } catch (Throwable t) {
+            failed(t);
         }
 
         try {
+            p("instanceof interface: ");
             if (o instanceof instanceofI)
-                p("FAILED");
+                failed();
             else
-                p("OK");
-        } catch (NoClassDefFoundError e) {
-            p("OK");
+                ok();
+        } catch (Throwable t) {
+            failed(t);
         }
     }
 
+    private void ok() {
+        pln("OK");
+    }
+
+    private void failed() {
+        pln("FAILED");
+    }
+
+    private void failed(Throwable t) {
+        pln("FAILED: " + t);
+    }
+
     public void check(int a, int b) {
         if (a == b)
-            p("OK");
+            ok();
         else
-            p("FAILED: " + a + " != " + b);
+            pln("FAILED: " + a + " != " + b);
     }
 
     public void check(long a, long b) {
         if (a == b)
-            p("OK");
+            ok();
         else
-            p("FAILED: " + a + " != " + b);
+            pln("FAILED: " + a + " != " + b);
     }
 
     public void check(float a, float b) {
         if (a == b)
-            p("OK");
+            ok();
         else
-            p("FAILED: " + a + " != " + b);
+            pln("FAILED: " + a + " != " + b);
     }
 
     public void check(double a, double b) {
         if (a == b)
-            p("OK");
+            ok();
         else
-            p("FAILED: " + a + " != " + b);
+            pln("FAILED: " + a + " != " + b);
     }
 
     public void check(Object a, Object b) {
         if (a == b)
-            p("OK");
+            ok();
         else
-            p("FAILED: " + a + " != " + b);
+            pln("FAILED: " + a + " != " + b);
     }
 
     private final void p(String s) {
+        System.out.print(s);
+    }
+
+    private final void pln(String s) {
         System.out.println(s);
     }
 }