commit 31384c59bb4b387f29f2b6d4d3db886c29b81170
author Shih-wei Liao <sliao@google.com> Tue Sep 06 15:27:45 2011 -0700
committer Shih-wei Liao <sliao@google.com> Mon Sep 12 10:50:34 2011 -0700
tree e6143162d188dd8f038e66edf1164f78b37922f8
parent ec5adf351879cb6235faf2c6c068c2553d85a7d2

Generating stub code for registering a jni function at runtime.

On ARM and x86. Added a unit test.

Change-Id: I6b1ee09ad18295108f406ce21d73555796ecbba6

src/jni_compiler_test.cc

diff --git a/src/jni_compiler_test.cc b/src/jni_compiler_test.cc
index 343ea1d..216350b 100644
--- a/src/jni_compiler_test.cc
+++ b/src/jni_compiler_test.cc
@@ -52,8 +52,10 @@
     }
     ASSERT_TRUE(jmethod_ != NULL);
 
-    JNINativeMethod methods[] = {{method_name, method_sig, native_fnptr}};
-    ASSERT_EQ(JNI_OK, env_->RegisterNatives(jklass_, methods, 1));
+    if (native_fnptr) {
+      JNINativeMethod methods[] = {{method_name, method_sig, native_fnptr}};
+      ASSERT_EQ(JNI_OK, env_->RegisterNatives(jklass_, methods, 1));
+    }
 
     jmethodID constructor = env_->GetMethodID(jklass_, "<init>", "()V");
     jobj_ = env_->NewObject(jklass_, constructor);
@@ -92,6 +94,22 @@
   EXPECT_EQ(2, gJava_MyClass_foo_calls);
 }
 
+TEST_F(JniCompilerTest, CompileAndRunIntMethodThroughStub) {
+  SetupForTest(false,
+               "bar",
+               "(I)I",
+               NULL /* dlsym will find &Java_MyClass_bar later */);
+
+  std::string path("libarttest.so");
+  std::string reason;
+  ASSERT_TRUE(Runtime::Current()->GetJavaVM()->LoadNativeLibrary(
+      path, const_cast<ClassLoader*>(class_loader_), reason))
+      << path << ": " << reason;
+
+  jint result = env_->CallNonvirtualIntMethod(jobj_, jklass_, jmethod_, 24);
+  EXPECT_EQ(25, result);
+}
+
 int gJava_MyClass_fooI_calls = 0;
 jint Java_MyClass_fooI(JNIEnv* env, jobject thisObj, jint x) {
   EXPECT_EQ(1u, Thread::Current()->NumSirtReferences());