diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 228e6f7bd0d2..1bf2553f6d6f 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2002-07-02 Andrew Haley + + * libjava.lang/inline.java: New file. + * libjava.lang/inline.out: Likewise. + + * libjava.lang/Array_3.java: Add another case. + 2002-06-23 Tom Tromey * Makefile.in: Rebuilt. diff --git a/libjava/testsuite/libjava.lang/Array_3.java b/libjava/testsuite/libjava.lang/Array_3.java index f8b7ded4685d..453387d51fbf 100644 --- a/libjava/testsuite/libjava.lang/Array_3.java +++ b/libjava/testsuite/libjava.lang/Array_3.java @@ -27,7 +27,7 @@ public class Array_3 ok = true; } if (!ok) - throw new RuntimeException("test failed"); + throw new RuntimeException("test failed:1"); ok = false; try @@ -40,7 +40,7 @@ public class Array_3 ok = true; } if (!ok) - throw new RuntimeException("test failed"); + throw new RuntimeException("test failed:2"); ok = false; try @@ -54,6 +54,19 @@ public class Array_3 } if (!ok || nn != 0) - throw new RuntimeException("test failed"); + throw new RuntimeException("test failed:3"); + + ok = false; + try + { + int[] x = (int[])null; + nn = x.length; + } + catch (NullPointerException _) + { + ok = true; + } + if (!ok) + throw new RuntimeException("test failed:4"); } } diff --git a/libjava/testsuite/libjava.lang/inline.java b/libjava/testsuite/libjava.lang/inline.java new file mode 100644 index 000000000000..66585293491c --- /dev/null +++ b/libjava/testsuite/libjava.lang/inline.java @@ -0,0 +1,35 @@ +public class inline +{ + static int factorial_1 (int n) + { + if (n > 0) + return n * factorial_1(n-1); + return 1; + } + + static int factorial_2 (int n) + { + if (n > 0) + return n * factorial_3(n-1); + return 1; + } + + static int factorial_3 (int n) + { + if (n > 0) + return n * factorial_2(n-1); + return 1; + } + + public static void main(String args[]) + { + if (factorial_1 (5) != 120) + System.out.println("This should not happen"); + else + System.out.println("OK"); + if (factorial_2 (5) != 120) + System.out.println("This should not happen"); + else + System.out.println("OK"); + } +} diff --git a/libjava/testsuite/libjava.lang/inline.out b/libjava/testsuite/libjava.lang/inline.out new file mode 100644 index 000000000000..2c94e4837100 --- /dev/null +++ b/libjava/testsuite/libjava.lang/inline.out @@ -0,0 +1,2 @@ +OK +OK