test/functional: Move JNITest to `test/java/lang`

The `java/lang` package is reserved for the JVM. Jato does not enforce
this but HotSpot, for example, does which means we cannot run the same
test set on it.

Signed-off-by: Pekka Enberg <penberg@kernel.org>

4 files changed, 120 insertions, 120 deletions

diff --git a/Makefile b/Makefile
index a35dee73..d22515cd 100644
--- a/Makefile
+++ b/Makefile
@@ -319,7 +319,6 @@ check-integration: $(LIB_FILE)
 
 REGRESSION_TEST_SUITE_CLASSES = \
 	test/functional/jato/internal/VM.java \
-	test/functional/java/lang/JNITest.java \
 	test/functional/jvm/ArgsTest.java \
 	test/functional/jvm/ArrayExceptionsTest.java \
 	test/functional/jvm/ArrayMemberTest.java \
@@ -380,9 +379,10 @@ REGRESSION_TEST_SUITE_CLASSES = \
 	test/functional/sun/misc/UnsafeTest.java \
 	test/functional/test/java/lang/ClassTest.java \
 	test/functional/test/java/lang/DoubleTest.java \
-	test/functional/test/java/lang/reflect/MethodTest.java \
+	test/functional/test/java/lang/JNITest.java \
 	test/functional/test/java/lang/reflect/FieldAccessorsTest.java \
 	test/functional/test/java/lang/reflect/FieldTest.java \
+	test/functional/test/java/lang/reflect/MethodTest.java \
 	test/functional/test/java/util/HashMapTest.java
 
 JASMIN_REGRESSION_TEST_SUITE_CLASSES = \
diff --git a/test/functional/jni/jnitest.c b/test/functional/jni/jnitest.c
index 79bad430..f658d34a 100644
--- a/test/functional/jni/jnitest.c
+++ b/test/functional/jni/jnitest.c
@@ -5,388 +5,388 @@
 #include <vm/preload.h>
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassed
  * Signature: (Ljava/lang/String;)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_java_lang_JNITest_returnPassedString(JNIEnv *env, jobject jobj, jstring stringValue)
+JNIEXPORT jstring JNICALL Java_test_java_lang_JNITest_returnPassedString(JNIEnv *env, jobject jobj, jstring stringValue)
 {
 	return stringValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedInt
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_java_lang_JNITest_returnPassedInt(JNIEnv *env, jobject jobj, jint intValue)
+JNIEXPORT jint JNICALL Java_test_java_lang_JNITest_returnPassedInt(JNIEnv *env, jobject jobj, jint intValue)
 {
 	return intValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedLong
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_java_lang_JNITest_returnPassedLong(JNIEnv *env, jobject jobj, jlong longValue)
+JNIEXPORT jlong JNICALL Java_test_java_lang_JNITest_returnPassedLong(JNIEnv *env, jobject jobj, jlong longValue)
 {
 	return longValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedBoolean
  * Signature: (Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_returnPassedBoolean(JNIEnv *env, jobject jobj, jboolean booleanValue)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_returnPassedBoolean(JNIEnv *env, jobject jobj, jboolean booleanValue)
 {
 	return booleanValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedShort
  * Signature: (S)S
  */
-JNIEXPORT jshort JNICALL Java_java_lang_JNITest_returnPassedShort(JNIEnv *env, jobject jobj, jshort shortValue)
+JNIEXPORT jshort JNICALL Java_test_java_lang_JNITest_returnPassedShort(JNIEnv *env, jobject jobj, jshort shortValue)
 {
 	return shortValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedByte
  * Signature: (B)B
  */
-JNIEXPORT jbyte JNICALL Java_java_lang_JNITest_returnPassedByte(JNIEnv *env, jobject jobj, jbyte byteValue)
+JNIEXPORT jbyte JNICALL Java_test_java_lang_JNITest_returnPassedByte(JNIEnv *env, jobject jobj, jbyte byteValue)
 {
 	return byteValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedChar
  * Signature: (C)C
  */
-JNIEXPORT jchar JNICALL Java_java_lang_JNITest_returnPassedChar(JNIEnv *env, jobject jobj, jchar charValue)
+JNIEXPORT jchar JNICALL Java_test_java_lang_JNITest_returnPassedChar(JNIEnv *env, jobject jobj, jchar charValue)
 {
 	return charValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedFloat
  * Signature: (F)F
  */
-JNIEXPORT jfloat JNICALL Java_java_lang_JNITest_returnPassedFloat(JNIEnv *env, jobject jobj, jfloat floatValue)
+JNIEXPORT jfloat JNICALL Java_test_java_lang_JNITest_returnPassedFloat(JNIEnv *env, jobject jobj, jfloat floatValue)
 {
 	return floatValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedDouble
  * Signature: (D)D
  */
-JNIEXPORT jdouble JNICALL Java_java_lang_JNITest_returnPassedDouble(JNIEnv *env, jobject jobj, jdouble doubleValue)
+JNIEXPORT jdouble JNICALL Java_test_java_lang_JNITest_returnPassedDouble(JNIEnv *env, jobject jobj, jdouble doubleValue)
 {
 	return doubleValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedStringArray
  * Signature: ([Ljava/lang/String;)[Ljava/lang/String;
  */
-JNIEXPORT jobjectArray JNICALL Java_java_lang_JNITest_returnPassedStringArray(JNIEnv *env, jobject jobj, jobjectArray objectArrayValue)
+JNIEXPORT jobjectArray JNICALL Java_test_java_lang_JNITest_returnPassedStringArray(JNIEnv *env, jobject jobj, jobjectArray objectArrayValue)
 {
 	return objectArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedIntArray
  * Signature: ([I)[I
  */
-JNIEXPORT jintArray JNICALL Java_java_lang_JNITest_returnPassedIntArray(JNIEnv *env, jobject jobj, jintArray intArrayValue)
+JNIEXPORT jintArray JNICALL Java_test_java_lang_JNITest_returnPassedIntArray(JNIEnv *env, jobject jobj, jintArray intArrayValue)
 {
 	return intArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedLongArray
  * Signature: ([J)[J
  */
-JNIEXPORT jlongArray JNICALL Java_java_lang_JNITest_returnPassedLongArray(JNIEnv *env, jobject jobj, jlongArray longArrayValue)
+JNIEXPORT jlongArray JNICALL Java_test_java_lang_JNITest_returnPassedLongArray(JNIEnv *env, jobject jobj, jlongArray longArrayValue)
 {
 	return longArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedBooleanArray
  * Signature: ([Z)[Z
  */
-JNIEXPORT jbooleanArray JNICALL Java_java_lang_JNITest_returnPassedBooleanArray(JNIEnv *env, jobject jobj, jbooleanArray booleanArrayValue)
+JNIEXPORT jbooleanArray JNICALL Java_test_java_lang_JNITest_returnPassedBooleanArray(JNIEnv *env, jobject jobj, jbooleanArray booleanArrayValue)
 {
 	return booleanArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedShortArray
  * Signature: ([S)[S
  */
-JNIEXPORT jshortArray JNICALL Java_java_lang_JNITest_returnPassedShortArray(JNIEnv *env, jobject jobj, jshortArray shortArrayValue)
+JNIEXPORT jshortArray JNICALL Java_test_java_lang_JNITest_returnPassedShortArray(JNIEnv *env, jobject jobj, jshortArray shortArrayValue)
 {
 	return shortArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedByteArray
  * Signature: ([B)[B
  */
-JNIEXPORT jbyteArray JNICALL Java_java_lang_JNITest_returnPassedByteArray(JNIEnv *env, jobject jobj, jbyteArray byteArrayValue)
+JNIEXPORT jbyteArray JNICALL Java_test_java_lang_JNITest_returnPassedByteArray(JNIEnv *env, jobject jobj, jbyteArray byteArrayValue)
 {
 	return byteArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedCharArray
  * Signature: ([C)[C
  */
-JNIEXPORT jcharArray JNICALL Java_java_lang_JNITest_returnPassedCharArray(JNIEnv *env, jobject jobj, jcharArray charArrayValue)
+JNIEXPORT jcharArray JNICALL Java_test_java_lang_JNITest_returnPassedCharArray(JNIEnv *env, jobject jobj, jcharArray charArrayValue)
 {
 	return charArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedFloatArray
  * Signature: ([F)[F
  */
-JNIEXPORT jfloatArray JNICALL Java_java_lang_JNITest_returnPassedFloatArray(JNIEnv *env, jobject jobj, jfloatArray floatArrayValue)
+JNIEXPORT jfloatArray JNICALL Java_test_java_lang_JNITest_returnPassedFloatArray(JNIEnv *env, jobject jobj, jfloatArray floatArrayValue)
 {
 	return floatArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    returnPassedDoubleArray
  * Signature: ([D)[D
  */
-JNIEXPORT jdoubleArray JNICALL Java_java_lang_JNITest_returnPassedDoubleArray(JNIEnv *env, jobject jobj, jdoubleArray doubleArrayValue)
+JNIEXPORT jdoubleArray JNICALL Java_test_java_lang_JNITest_returnPassedDoubleArray(JNIEnv *env, jobject jobj, jdoubleArray doubleArrayValue)
 {
 	return doubleArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedString
  * Signature: (Ljava/lang/String;)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_java_lang_JNITest_staticReturnPassedString(JNIEnv *env, jclass clazz, jstring stringValue)
+JNIEXPORT jstring JNICALL Java_test_java_lang_JNITest_staticReturnPassedString(JNIEnv *env, jclass clazz, jstring stringValue)
 {
 	return stringValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedInt
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL Java_java_lang_JNITest_staticReturnPassedInt(JNIEnv *env, jclass clazz, jint intValue)
+JNIEXPORT jint JNICALL Java_test_java_lang_JNITest_staticReturnPassedInt(JNIEnv *env, jclass clazz, jint intValue)
 {
 	return intValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedLong
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL Java_java_lang_JNITest_staticReturnPassedLong(JNIEnv *env, jclass clazz, jlong longValue)
+JNIEXPORT jlong JNICALL Java_test_java_lang_JNITest_staticReturnPassedLong(JNIEnv *env, jclass clazz, jlong longValue)
 {
 	return longValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedBoolean
  * Signature: (Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_staticReturnPassedBoolean(JNIEnv *env, jclass clazz, jboolean booleanValue)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_staticReturnPassedBoolean(JNIEnv *env, jclass clazz, jboolean booleanValue)
 {
 	return booleanValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedShort
  * Signature: (S)S
  */
-JNIEXPORT jshort JNICALL Java_java_lang_JNITest_staticReturnPassedShort(JNIEnv *env, jclass clazz, jshort shortValue)
+JNIEXPORT jshort JNICALL Java_test_java_lang_JNITest_staticReturnPassedShort(JNIEnv *env, jclass clazz, jshort shortValue)
 {
 	return shortValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedByte
  * Signature: (B)B
  */
-JNIEXPORT jbyte JNICALL Java_java_lang_JNITest_staticReturnPassedByte(JNIEnv *env, jclass clazz, jbyte byteValue)
+JNIEXPORT jbyte JNICALL Java_test_java_lang_JNITest_staticReturnPassedByte(JNIEnv *env, jclass clazz, jbyte byteValue)
 {
 	return byteValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedChar
  * Signature: (C)C
  */
-JNIEXPORT jchar JNICALL Java_java_lang_JNITest_staticReturnPassedChar(JNIEnv *env, jclass clazz, jchar charValue)
+JNIEXPORT jchar JNICALL Java_test_java_lang_JNITest_staticReturnPassedChar(JNIEnv *env, jclass clazz, jchar charValue)
 {
 	return charValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedFloat
  * Signature: (F)F
  */
-JNIEXPORT jfloat JNICALL Java_java_lang_JNITest_staticReturnPassedFloat(JNIEnv *env, jclass clazz, jfloat floatValue)
+JNIEXPORT jfloat JNICALL Java_test_java_lang_JNITest_staticReturnPassedFloat(JNIEnv *env, jclass clazz, jfloat floatValue)
 {
 	return floatValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedDouble
  * Signature: (D)D
  */
-JNIEXPORT jdouble JNICALL Java_java_lang_JNITest_staticReturnPassedDouble(JNIEnv *env, jclass clazz, jdouble doubleValue)
+JNIEXPORT jdouble JNICALL Java_test_java_lang_JNITest_staticReturnPassedDouble(JNIEnv *env, jclass clazz, jdouble doubleValue)
 {
 	return doubleValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedStringArray
  * Signature: ([Ljava/lang/String;)[Ljava/lang/String;
  */
-JNIEXPORT jobjectArray JNICALL Java_java_lang_JNITest_staticReturnPassedStringArray(JNIEnv *env, jclass clazz, jobjectArray stringArrayValue)
+JNIEXPORT jobjectArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedStringArray(JNIEnv *env, jclass clazz, jobjectArray stringArrayValue)
 {
 	return stringArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedIntArray
  * Signature: ([I)[I
  */
-JNIEXPORT jintArray JNICALL Java_java_lang_JNITest_staticReturnPassedIntArray(JNIEnv *env, jclass clazz, jintArray intArrayValue)
+JNIEXPORT jintArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedIntArray(JNIEnv *env, jclass clazz, jintArray intArrayValue)
 {
 	return intArrayValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedLongArray
  * Signature: ([J)[J
  */
-JNIEXPORT jlongArray JNICALL Java_java_lang_JNITest_staticReturnPassedLongArray(JNIEnv *env, jclass clazz, jlongArray longArrayValue)
+JNIEXPORT jlongArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedLongArray(JNIEnv *env, jclass clazz, jlongArray longArrayValue)
 {
 	return longArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedBooleanArray
  * Signature: ([Z)[Z
  */
-JNIEXPORT jbooleanArray JNICALL Java_java_lang_JNITest_staticReturnPassedBooleanArray(JNIEnv *env, jclass clazz, jbooleanArray booleanArrayValue)
+JNIEXPORT jbooleanArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedBooleanArray(JNIEnv *env, jclass clazz, jbooleanArray booleanArrayValue)
 {
 	return booleanArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedShortArray
  * Signature: ([S)[S
  */
-JNIEXPORT jshortArray JNICALL Java_java_lang_JNITest_staticReturnPassedShortArray(JNIEnv *env, jclass clazz, jshortArray shortArrayValue)
+JNIEXPORT jshortArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedShortArray(JNIEnv *env, jclass clazz, jshortArray shortArrayValue)
 {
 	return shortArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedByteArray
  * Signature: ([B)[B
  */
-JNIEXPORT jbyteArray JNICALL Java_java_lang_JNITest_staticReturnPassedByteArray(JNIEnv *env, jclass clazz, jbyteArray byteArrayValue)
+JNIEXPORT jbyteArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedByteArray(JNIEnv *env, jclass clazz, jbyteArray byteArrayValue)
 {
 	return byteArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedCharArray
  * Signature: ([C)[C
  */
-JNIEXPORT jcharArray JNICALL Java_java_lang_JNITest_staticReturnPassedCharArray(JNIEnv *env, jclass clazz, jcharArray charArrayValue)
+JNIEXPORT jcharArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedCharArray(JNIEnv *env, jclass clazz, jcharArray charArrayValue)
 {
 	return charArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedFloatArray
  * Signature: ([F)[F
  */
-JNIEXPORT jfloatArray JNICALL Java_java_lang_JNITest_staticReturnPassedFloatArray(JNIEnv *env, jclass clazz, jfloatArray floatArrayValue)
+JNIEXPORT jfloatArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedFloatArray(JNIEnv *env, jclass clazz, jfloatArray floatArrayValue)
 {
 	return floatArrayValue;
 }
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticReturnPassedDoubleArray
  * Signature: ([D)[D
  */
-JNIEXPORT jdoubleArray JNICALL Java_java_lang_JNITest_staticReturnPassedDoubleArray(JNIEnv *env, jclass clazz, jdoubleArray doubleArrayValue)
+JNIEXPORT jdoubleArray JNICALL Java_test_java_lang_JNITest_staticReturnPassedDoubleArray(JNIEnv *env, jclass clazz, jdoubleArray doubleArrayValue)
 {
 	return doubleArrayValue;
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticToUpper
  * Signature: (Ljava/lang/String;)[Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_java_lang_JNITest_staticToUpper(JNIEnv *env, jclass clazz, jstring stringValue)
+JNIEXPORT jstring JNICALL Java_test_java_lang_JNITest_staticToUpper(JNIEnv *env, jclass clazz, jstring stringValue)
 {
 	char upperStr[128];
 	const jbyte *str;
@@ -410,11 +410,11 @@ JNIEXPORT jstring JNICALL Java_java_lang_JNITest_staticToUpper(JNIEnv *env, jcla
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    staticTestJNIEnvIsInitializedCorrectly
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_staticTestJNIEnvIsInitializedCorrectly(JNIEnv *env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_staticTestJNIEnvIsInitializedCorrectly(JNIEnv *env, jclass clazz)
 {
 	return	((*env)->reserved0 == NULL) &&
 			((*env)->reserved1 == NULL) &&
@@ -424,11 +424,11 @@ JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_staticTestJNIEnvIsInitializedC
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    getVersion
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL Java_java_lang_JNITest_getVersion(JNIEnv *env, jclass clazz)
+JNIEXPORT jint JNICALL Java_test_java_lang_JNITest_getVersion(JNIEnv *env, jclass clazz)
 {
 	return (*env)->GetVersion(env);
 }
@@ -466,11 +466,11 @@ static int readFile(const char *fileName, char **fileBytes)
 
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    defineClass
  * Signature: (Ljava/lang/String;Ljava/lang/Object;
  */
-JNIEXPORT jclass JNICALL Java_java_lang_JNITest_defineClass(JNIEnv *env, jclass clazz, jstring name, jobject classloader)
+JNIEXPORT jclass JNICALL Java_test_java_lang_JNITest_defineClass(JNIEnv *env, jclass clazz, jstring name, jobject classloader)
 {
 	char *nameStr;
 	jboolean iscopy;
@@ -496,11 +496,11 @@ JNIEXPORT jclass JNICALL Java_java_lang_JNITest_defineClass(JNIEnv *env, jclass
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testDefineClassThrowsExceptionWithBrokenClass
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testDefineClassThrowsExceptionWithBrokenClass(JNIEnv *env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_testDefineClassThrowsExceptionWithBrokenClass(JNIEnv *env, jclass clazz)
 {
 	const char *classBytes = "This represents a broken class";
 
@@ -510,11 +510,11 @@ JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testDefineClassThrowsException
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    findClass
  * Signature: (Ljava/lang/String;)Ljava/lang/Class;
  */
-JNIEXPORT jclass JNICALL Java_java_lang_JNITest_findClass(JNIEnv *env, jclass clazz, jstring name)
+JNIEXPORT jclass JNICALL Java_test_java_lang_JNITest_findClass(JNIEnv *env, jclass clazz, jstring name)
 {
 	char *nameStr;
 	jboolean iscopy;
@@ -532,63 +532,63 @@ JNIEXPORT jclass JNICALL Java_java_lang_JNITest_findClass(JNIEnv *env, jclass cl
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    passThroughFromAndToReflectedMethod
  * Signature: (Ljava/lang/reflect/Method;)Ljava/lang/reflect/Method;
  */
-JNIEXPORT jobject JNICALL Java_java_lang_JNITest_passThroughFromAndToReflectedMethod(JNIEnv *env, jclass clazz, jobject javaMethod)
+JNIEXPORT jobject JNICALL Java_test_java_lang_JNITest_passThroughFromAndToReflectedMethod(JNIEnv *env, jclass clazz, jobject javaMethod)
 {
 	jmethodID methodID = (*env)->FromReflectedMethod(env, javaMethod);
 	return (*env)->ToReflectedMethod(env, clazz, methodID, true);
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    passThroughFromAndToReflectedField
  * Signature: (Ljava/lang/reflect/Field;)Ljava/lang/reflect/Field;
  */
-JNIEXPORT jobject JNICALL Java_java_lang_JNITest_passThroughFromAndToReflectedField(JNIEnv *env, jclass clazz, jobject javaField)
+JNIEXPORT jobject JNICALL Java_test_java_lang_JNITest_passThroughFromAndToReflectedField(JNIEnv *env, jclass clazz, jobject javaField)
 {
 	jfieldID fieldID = (*env)->FromReflectedField(env, javaField);
 	return (*env)->ToReflectedField(env, clazz, fieldID, true);
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    getSuperclass
  * Signature: (Ljava/lang/Class;)Ljava/lang/Object;
  */
-JNIEXPORT jobject JNICALL Java_java_lang_JNITest_getSuperclass(JNIEnv *env, jclass clazz, jclass childClazz)
+JNIEXPORT jobject JNICALL Java_test_java_lang_JNITest_getSuperclass(JNIEnv *env, jclass clazz, jclass childClazz)
 {
 	return (*env)->GetSuperclass(env, childClazz);
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    isAssignableFrom
  * Signature: (Ljava/lang/Class;Ljava/lang/Class;)Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_isAssignableFrom(JNIEnv *env, jclass clazz, jclass clazz1, jclass clazz2)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_isAssignableFrom(JNIEnv *env, jclass clazz, jclass clazz1, jclass clazz2)
 {
 	return (*env)->IsAssignableFrom(env, clazz1, clazz2);
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    jniThrow
  * Signature: ()I;Ljava/lang/Throwable;
  */
-JNIEXPORT jint JNICALL Java_java_lang_JNITest_jniThrow(JNIEnv *env, jclass clazz, jthrowable throwable)
+JNIEXPORT jint JNICALL Java_test_java_lang_JNITest_jniThrow(JNIEnv *env, jclass clazz, jthrowable throwable)
 {
 	return (*env)->Throw(env, throwable);
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    jniThrowNew
  * Signature: (Ljava/lang/Class;Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL Java_java_lang_JNITest_jniThrowNew(JNIEnv *env, jclass clazz, jclass throwable, jstring str)
+JNIEXPORT jint JNICALL Java_test_java_lang_JNITest_jniThrowNew(JNIEnv *env, jclass clazz, jclass throwable, jstring str)
 {
 	char *messageStr;
 	jboolean iscopy;
@@ -602,11 +602,11 @@ JNIEXPORT jint JNICALL Java_java_lang_JNITest_jniThrowNew(JNIEnv *env, jclass cl
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testJniExceptionOccurredAndExceptionClear
  * Signature: (Ljava/lang/Throwable;)Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testJniExceptionOccurredAndExceptionClear(JNIEnv *env, jclass clazz, jclass throwable)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_testJniExceptionOccurredAndExceptionClear(JNIEnv *env, jclass clazz, jclass throwable)
 {
 	if ((*env)->ExceptionOccurred(env))
 		return false;
@@ -625,11 +625,11 @@ JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testJniExceptionOccurredAndExc
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testIsSameObject
  * Signature: (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testIsSameObject(JNIEnv *env, jclass clazz, jobject obj, jobject sameObj, jobject differentObj)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_testIsSameObject(JNIEnv *env, jclass clazz, jobject obj, jobject sameObj, jobject differentObj)
 {
 	if ((*env)->IsSameObject(env, obj, sameObj) && !(*env)->IsSameObject(env, obj, differentObj))
 		return true;
@@ -638,11 +638,11 @@ JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testIsSameObject(JNIEnv *env,
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testAllocObject
  * Signature: (Ljava/lang/Class;)Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testAllocObject(JNIEnv *env, jclass clazz, jclass clazzToAlloc)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_testAllocObject(JNIEnv *env, jclass clazz, jclass clazzToAlloc)
 {
 	if ((*env)->AllocObject(env, clazzToAlloc) != NULL)
 		return true;
@@ -651,11 +651,11 @@ JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testAllocObject(JNIEnv *env, j
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testNewObject
  * Signature: ((Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
  */
-JNIEXPORT jobject JNICALL Java_java_lang_JNITest_testNewObject(JNIEnv *env, jclass clazz, jclass clazzToAlloc, jstring constructorSig, jobject args)
+JNIEXPORT jobject JNICALL Java_test_java_lang_JNITest_testNewObject(JNIEnv *env, jclass clazz, jclass clazzToAlloc, jstring constructorSig, jobject args)
 {
 	char *constructorSigStr;
 	jboolean iscopy;
@@ -676,11 +676,11 @@ JNIEXPORT jobject JNICALL Java_java_lang_JNITest_testNewObject(JNIEnv *env, jcla
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testNewObjectA
  * Signature: ((Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
  */
-JNIEXPORT jobject JNICALL Java_java_lang_JNITest_testNewObjectA(JNIEnv *env, jclass clazz, jclass clazzToAlloc, jstring constructorSig, jobject args)
+JNIEXPORT jobject JNICALL Java_test_java_lang_JNITest_testNewObjectA(JNIEnv *env, jclass clazz, jclass clazzToAlloc, jstring constructorSig, jobject args)
 {
 	jvalue jniArgs[1];
 	char *constructorSigStr;
@@ -717,11 +717,11 @@ static jobject callNewObjectV(JNIEnv *env, jclass clazzToAlloc, jmethodID method
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testNewObjectV
  * Signature: ((Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object;
  */
-JNIEXPORT jobject JNICALL Java_java_lang_JNITest_testNewObjectV(JNIEnv *env, jclass clazz, jclass clazzToAlloc, jstring constructorSig, jobject args)
+JNIEXPORT jobject JNICALL Java_test_java_lang_JNITest_testNewObjectV(JNIEnv *env, jclass clazz, jclass clazzToAlloc, jstring constructorSig, jobject args)
 {
 	char *constructorSigStr;
 	jboolean iscopy;
@@ -742,31 +742,31 @@ JNIEXPORT jobject JNICALL Java_java_lang_JNITest_testNewObjectV(JNIEnv *env, jcl
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testGetObjectClass
  * Signature: (Ljava/lang/Object;)Ljava/lang/Object
  */
-JNIEXPORT jobject JNICALL Java_java_lang_JNITest_testGetObjectClass(JNIEnv *env, jclass clazz, jobject obj)
+JNIEXPORT jobject JNICALL Java_test_java_lang_JNITest_testGetObjectClass(JNIEnv *env, jclass clazz, jobject obj)
 {
 	return (*env)->GetObjectClass(env, obj);
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    isInstanceOf
  * Signature: (Ljava/lang/Class;)Ljava/lang/Object;
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_isInstanceOf(JNIEnv *env, jclass klass, jobject obj, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_isInstanceOf(JNIEnv *env, jclass klass, jobject obj, jclass clazz)
 {
 	return (*env)->IsInstanceOf(env, obj, clazz);
 }
 
 /*
- * Class:     java_lang_JNITest
+ * Class:     test_java_lang_JNITest
  * Method:    testMethodID
  * Signature: (Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testMethodID(JNIEnv *env, jclass clazz, jclass classForMethodID, jstring methodName, jstring signature)
+JNIEXPORT jboolean JNICALL Java_test_java_lang_JNITest_testMethodID(JNIEnv *env, jclass clazz, jclass classForMethodID, jstring methodName, jstring signature)
 {
 	char *methodNameStr;
 	char *signatureStr;
@@ -790,4 +790,4 @@ JNIEXPORT jboolean JNICALL Java_java_lang_JNITest_testMethodID(JNIEnv *env, jcla
 	(*env)->ReleaseStringUTFChars(env, signature, signatureStr);
 
 	return true;
-}
\ No newline at end of file
+}
diff --git a/test/functional/java/lang/JNITest.java b/test/functional/test/java/lang/JNITest.java
index 932f5ac0..9d71004f 100644
--- a/test/functional/java/lang/JNITest.java
+++ b/test/functional/test/java/lang/JNITest.java
@@ -23,7 +23,7 @@
  *
  * Please refer to the file LICENSE for details.
  */
-package java.lang;
+package test.java.lang;
 
 import jvm.TestCase;
 import java.lang.reflect.Method;
diff --git a/tools/test.py b/tools/test.py
index 540ec813..9d2f88ee 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -27,7 +27,6 @@ TESTS = [
 , ( "jvm/ExitStatusIsZeroTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "jvm/ExitStatusIsOneTest", 1, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "jvm/ArgsTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
-, ( "java.lang.JNITest", 0, NO_SYSTEM_CLASSLOADER, [ "i386" ] )
 , ( "jvm.ArrayExceptionsTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "jvm.ArrayMemberTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "jvm.ArrayTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
@@ -92,9 +91,10 @@ TESTS = [
 , ( "sun.misc.UnsafeTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "test.java.lang.ClassTest", 0, [ ], [ "i386" ] )
 , ( "test.java.lang.DoubleTest", 0, [ ], [ "i386" ] )
-, ( "test.java.lang.reflect.MethodTest", 0, [ ], [ "i386" ] )
+, ( "test.java.lang.JNITest", 0, NO_SYSTEM_CLASSLOADER, [ "i386" ] )
 , ( "test.java.lang.reflect.FieldAccessorsTest", 0, NO_SYSTEM_CLASSLOADER, [ "i386", "x86_64" ] )
 , ( "test.java.lang.reflect.FieldTest", 0, [ ], [ "i386" ] )
+, ( "test.java.lang.reflect.MethodTest", 0, [ ], [ "i386" ] )
 , ( "test.java.util.HashMapTest", 0, [ ], [ "i386" ] )
 , ( "corrupt.CorruptedExceptionTableEndsAfterCode", 1, [ ], [ "i386", "x86_64" ] )
 , ( "corrupt.CorruptedExceptionTableInvalidHandlerPC", 1, [ ], [ "i386", "x86_64" ] )