commit fc7120c0293b96218d55abee29882f101acbc79b
author Brian Carlstrom <bdc@google.com> Mon Aug 27 13:43:25 2012 -0700
committer Brian Carlstrom <bdc@google.com> Mon Aug 27 14:41:28 2012 -0700
tree 330c7f5d020d3cbdd2cd201d9b55d2d04dc8297d
parent 0ac41d58258a97c62d41c0137338a4c3b9ceb95d

Fix JNI Compiler for x86 target

Change-Id: Ia247de328d234c4a57ddd93f394cad2c63e48153

src/jni_compiler_test.cc

diff --git a/src/jni_compiler_test.cc b/src/jni_compiler_test.cc
index e1332d3..72b5848 100644
--- a/src/jni_compiler_test.cc
+++ b/src/jni_compiler_test.cc
@@ -50,12 +50,12 @@
     } else {
       method = c->FindVirtualMethod(method_name, method_sig);
     }
-    ASSERT_TRUE(method != NULL);
+    ASSERT_TRUE(method != NULL) << method_name << " " << method_sig;
     if (method->GetCode() != NULL) {
       return;
     }
     CompileMethod(method);
-    ASSERT_TRUE(method->GetCode() != NULL);
+    ASSERT_TRUE(method->GetCode() != NULL) << method_name << " " << method_sig;
   }
 
   void SetUpForTest(bool direct, const char* method_name, const char* method_sig,
@@ -74,25 +74,26 @@
     // JNI operations after runtime start.
     env_ = Thread::Current()->GetJniEnv();
     jklass_ = env_->FindClass("MyClassNatives");
-    ASSERT_TRUE(jklass_ != NULL);
+    ASSERT_TRUE(jklass_ != NULL) << method_name << " " << method_sig;
 
     if (direct) {
       jmethod_ = env_->GetStaticMethodID(jklass_, method_name, method_sig);
     } else {
       jmethod_ = env_->GetMethodID(jklass_, method_name, method_sig);
     }
-    ASSERT_TRUE(jmethod_ != NULL);
+    ASSERT_TRUE(jmethod_ != NULL) << method_name << " " << method_sig;
 
     if (native_fnptr != NULL) {
       JNINativeMethod methods[] = { { method_name, method_sig, native_fnptr } };
-      ASSERT_EQ(JNI_OK, env_->RegisterNatives(jklass_, methods, 1));
+      ASSERT_EQ(JNI_OK, env_->RegisterNatives(jklass_, methods, 1))
+              << method_name << " " << method_sig;
     } else {
       env_->UnregisterNatives(jklass_);
     }
 
     jmethodID constructor = env_->GetMethodID(jklass_, "<init>", "()V");
     jobj_ = env_->NewObject(jklass_, constructor);
-    ASSERT_TRUE(jobj_ != NULL);
+    ASSERT_TRUE(jobj_ != NULL) << method_name << " " << method_sig;
   }
 
  public:
@@ -695,6 +696,11 @@
   EXPECT_EQ(result, 42);
 }
 
+TEST_F(JniCompilerTest, GetSinkPropertiesNative) {
+  SetUpForTest(false, "getSinkPropertiesNative", "(Ljava/lang/String;)[Ljava/lang/Object;", NULL);
+  // This space intentionally left blank. Just testing compilation succeeds.
+}
+
 // This should return jclass, but we're imitating a bug pattern.
 jobject Java_MyClassNatives_instanceMethodThatShouldReturnClass(JNIEnv* env, jobject) {
   return env->NewStringUTF("not a class!");