diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index cc4281fe0705..77459e6b92d9 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2001-03-22 Tom Tromey + + * libjava.jni/field.out: New file. + * libjava.jni/field.c: New file. + * libjava.jni/field.java: New file. + 2001-03-20 Tom Tromey * libjava.compile/uesc.java: New file. diff --git a/libjava/testsuite/libjava.jni/field.c b/libjava/testsuite/libjava.jni/field.c new file mode 100644 index 000000000000..358c293e7c55 --- /dev/null +++ b/libjava/testsuite/libjava.jni/field.c @@ -0,0 +1,24 @@ +#include +#include + +jobjectArray +Java_field_fetch (JNIEnv *env, jobject this) +{ + jclass cls; + jfieldID fid; + jobjectArray obj; + + cls = (*env)->GetObjectClass (env, this); + if (! cls) + return 0; + + fid = (*env)->GetFieldID (env, cls, "F", "[Ljava/lang/Object;"); + if (! fid) + return 0; + + obj = (*env)->GetObjectField (env, this, fid); + + return obj; +} + + diff --git a/libjava/testsuite/libjava.jni/field.java b/libjava/testsuite/libjava.jni/field.java new file mode 100644 index 000000000000..bd0f7492e9f4 --- /dev/null +++ b/libjava/testsuite/libjava.jni/field.java @@ -0,0 +1,25 @@ +// Test for array field lookup. + +public class field +{ + // A field for us to look up. + public Object[] F = new Object[7]; + + public native Object[] fetch (); + + public void doit () + { + System.out.println (F == fetch ()); + } + + public static void main (String[] args) + { + field q = new field (); + q.doit (); + } + + static + { + System.loadLibrary ("field"); + } +} diff --git a/libjava/testsuite/libjava.jni/field.out b/libjava/testsuite/libjava.jni/field.out new file mode 100644 index 000000000000..27ba77ddaf61 --- /dev/null +++ b/libjava/testsuite/libjava.jni/field.out @@ -0,0 +1 @@ +true