commit 56ef042065ce282f8f01a0f31f5cce868a60ede8
author Elliott Hughes <enh@google.com> Tue Jun 19 14:35:04 2012 -0700
committer Elliott Hughes <enh@google.com> Tue Jun 19 14:35:04 2012 -0700
tree 7c80dd6fbfb8ec9444e713ea5503cfc2774c951e
parent 2461535670016d58be1994d9f76098e905cf2b72

JNI test improvements.

I broke some tests with a last-minute alteration to my previous change,
and I missed a good suggestion for an extra check.

Change-Id: I9dd19aab033bcec6bc61b35c46b5c740869c373b

src/jni_internal_test.cc

diff --git a/src/jni_internal_test.cc b/src/jni_internal_test.cc
index 9383db3..00397a3 100644
--- a/src/jni_internal_test.cc
+++ b/src/jni_internal_test.cc
@@ -554,24 +554,24 @@
     // We support . as well as / for compatibility, if -Xcheck:jni is off.
     CheckJniAbortCatcher check_jni_abort_catcher;
     EXPECT_CLASS_FOUND("java.lang.String");
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: illegal class name 'java.lang.String'");
+    check_jni_abort_catcher.Check("illegal class name 'java.lang.String'");
     EXPECT_CLASS_NOT_FOUND("Ljava.lang.String;");
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: illegal class name 'Ljava.lang.String;'");
+    check_jni_abort_catcher.Check("illegal class name 'Ljava.lang.String;'");
     EXPECT_CLASS_FOUND("[Ljava.lang.String;");
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: illegal class name '[Ljava.lang.String;'");
+    check_jni_abort_catcher.Check("illegal class name '[Ljava.lang.String;'");
     EXPECT_CLASS_NOT_FOUND("[java.lang.String");
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: illegal class name '[java.lang.String'");
+    check_jni_abort_catcher.Check("illegal class name '[java.lang.String'");
 
     // You can't include the "L;" in a JNI class descriptor.
     EXPECT_CLASS_NOT_FOUND("Ljava/lang/String;");
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: illegal class name 'Ljava/lang/String;'");
+    check_jni_abort_catcher.Check("illegal class name 'Ljava/lang/String;'");
 
     // But you must include it for an array of any reference type.
     EXPECT_CLASS_NOT_FOUND("[java/lang/String");
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: illegal class name '[java/lang/String'");
+    check_jni_abort_catcher.Check("illegal class name '[java/lang/String'");
 
     EXPECT_CLASS_NOT_FOUND("[K");
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: illegal class name '[K'");
+    check_jni_abort_catcher.Check("illegal class name '[K'");
   }
 
   // But primitive types aren't allowed...
@@ -1031,7 +1031,7 @@
   {
     CheckJniAbortCatcher check_jni_abort_catcher;
     EXPECT_TRUE(env_->GetStringUTFChars(NULL, NULL) == NULL);
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: GetStringUTFChars received null jstring");
+    check_jni_abort_catcher.Check("GetStringUTFChars received null jstring");
   }
 
   jstring s = env_->NewStringUTF("hello");
@@ -1227,7 +1227,7 @@
   {
     CheckJniAbortCatcher check_jni_abort_catcher;
     env_->DeleteLocalRef(s);
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: native code passing in reference to invalid local reference: 0x200001");
+    check_jni_abort_catcher.Check("native code passing in reference to invalid local reference: 0x200001");
   }
 
   s = env_->NewStringUTF("");
@@ -1307,7 +1307,7 @@
   {
     CheckJniAbortCatcher check_jni_abort_catcher;
     env_->DeleteGlobalRef(o);
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: native code passing in reference to invalid global reference: 0x10000e");
+    check_jni_abort_catcher.Check("native code passing in reference to invalid global reference: 0x10000e");
   }
 
   jobject o1 = env_->NewGlobalRef(s);
@@ -1349,7 +1349,7 @@
   {
     CheckJniAbortCatcher check_jni_abort_catcher;
     env_->DeleteWeakGlobalRef(o);
-    check_jni_abort_catcher.Check("JNI ERROR: app bug found: native code passing in reference to invalid weak global reference: 0x100003");
+    check_jni_abort_catcher.Check("native code passing in reference to invalid weak global reference: 0x100003");
   }
 
   jobject o1 = env_->NewWeakGlobalRef(s);