* src/native/jni.hpp: We typedef the JNI types to the CACAO internal

[cacao.git] / tests / regression / native / checkjni.c

diff --git a/tests/regression/native/checkjni.c b/tests/regression/native/checkjni.c
index b66a6b4b45c151721cc583203609f95224093e34..5d7eca6246a7aadfd587534a72129e49462d53c0 100644 (file)
--- a/tests/regression/native/checkjni.c
+++ b/tests/regression/native/checkjni.c
@@ -1,9 +1,7 @@
 /* src/tests/native/checkjni.c - for testing JNI stuff
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   TU Wien
+   Copyright (C) 1996-2005, 2006, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,20 +20,16 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
 */
 
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "config.h"
-#include "native/jni.h"
+#include INCLUDE_JNI_MD_H
+#include INCLUDE_JNI_H
 
 
 JNIEXPORT jboolean JNICALL Java_checkjni_IsAssignableFrom(JNIEnv *env, jclass clazz, jclass sub, jclass sup)
@@ -69,6 +63,17 @@ JNIEXPORT jclass   JNICALL Java_checkjni_GetObjectClass(JNIEnv *env, jclass claz
        return (*env)->GetObjectClass(env, obj);
 }
 
+#define CHECKJNI_GET_FIELD(type, name, fieldname, sig) \
+JNIEXPORT type     JNICALL Java_checkjni_Get##name##Field(JNIEnv *env, jclass clazz, jobject obj) \
+{ \
+       jclass c = (*env)->GetObjectClass(env, obj); \
+       jfieldID id = (*env)->GetFieldID(env, c, fieldname, sig); \
+       if ((*env)->ExceptionCheck(env)) return 0; \
+       return (*env)->Get##name##Field(env, obj, id); \
+}
+CHECKJNI_GET_FIELD(jint,    Int,    "jfI", "I")
+CHECKJNI_GET_FIELD(jobject, Object, "jfL", "Ljava/lang/Object;")
+
 #define CHECKJNI_GET_STATIC_FIELD(type, name, fieldname, sig) \
 JNIEXPORT type     JNICALL Java_checkjni_GetStatic##name##Field(JNIEnv *env, jclass clazz) \
 { \