- test for clinit exceptions in PUTSTATIC and GETSTATIC

- test for exceptions in native stub

diff --git a/tests/extest.java b/tests/extest.java
index c4ca584a1f32b0d1d72e16ce6a5ab32956564287..71756bcf0b77a62df267858c1d75f07569f3eee1 100644 (file)
--- a/tests/extest.java
+++ b/tests/extest.java
@@ -45,14 +45,6 @@ public class extest {
            pstacktrace(e);
        }
 
-       try {
-            p("NullPointerException (native):");
-            System.arraycopy(null, 1, null, 1, 1);
-            pln("FAILED");
-       } catch (Exception e) {
-           pln("OK");
-       }
-
        pln();
 
 
@@ -215,7 +207,7 @@ public class extest {
        pln("---------- some asmpart exceptions --------------");
 
         try {
-            p("ExceptionInInitializerError (clinit):");
+            p("NullPointerException in <clinit> (PUTSTATIC):");
             extest_clinit.i = 1;
             pln("FAILED");
         } catch (ExceptionInInitializerError e) {
@@ -227,6 +219,19 @@ public class extest {
             }
         }
 
+        try {
+            p("NullPointerException in <clinit> (GETSTATIC):");
+            int i = extest_clinit.i;
+            pln("FAILED");
+        } catch (ExceptionInInitializerError e) {
+            if (e.getCause().getClass() != NullPointerException.class) {
+                pln("FAILED");
+            } else {
+                pln("OK");
+               pstacktrace(e);
+            }
+        }
+
         try {
             p("ArithmeticException (idiv):");
             int i = 1, j = 0, k = i / j;
@@ -330,6 +335,28 @@ public class extest {
         pln();
 
 
+       pln("---------- native stub exceptions ---------------");
+
+       try {
+            p("NullPointerException (native):");
+            System.arraycopy(null, 1, null, 1, 1);
+            pln("FAILED");
+       } catch (Exception e) {
+           pln("OK");
+       }
+
+        try {
+            p("NullPointerException in <clinit>:");
+            extest_clinit.sub();
+            pln("FAILED");
+        } catch (ExceptionInInitializerError e) {
+           pln("OK");
+           pstacktrace(e);
+       }
+
+        pln();
+
+
        pln("---------- no OK beyond this point --------------");
 
         pln("NullPointerException (without catch):");
@@ -356,7 +383,7 @@ public class extest {
 
     public static void p(String s) {
        System.out.print(s);
-        for (int i = s.length(); i < 42; i++) {
+        for (int i = s.length(); i < 46; i++) {
             System.out.print(" ");
         }
     }