Add the runtime lookup of native method implementations.
Plus other bits of cleanup.
Change-Id: I8584001d7eeb118f8e29c4a62652a18b94333be8
diff --git a/src/utils_test.cc b/src/utils_test.cc
index fa5d798..769dec5 100644
--- a/src/utils_test.cc
+++ b/src/utils_test.cc
@@ -74,4 +74,33 @@
EXPECT_EQ("java.lang.Class<java.lang.String[]>", PrettyType(o->GetClass()));
}
+TEST_F(UtilsTest, MangleForJni) {
+ EXPECT_EQ("hello_00024world", MangleForJni("hello$world"));
+ EXPECT_EQ("hello_000a9world", MangleForJni("hello\xc2\xa9world"));
+ EXPECT_EQ("hello_1world", MangleForJni("hello_world"));
+ EXPECT_EQ("Ljava_lang_String_2", MangleForJni("Ljava/lang/String;"));
+ EXPECT_EQ("_3C", MangleForJni("[C"));
+}
+
+TEST_F(UtilsTest, JniShortName_JniLongName) {
+ Class* c = class_linker_->FindSystemClass("Ljava/lang/String;");
+ ASSERT_TRUE(c != NULL);
+ Method* m;
+
+ m = c->FindVirtualMethod("charAt", "(I)C");
+ ASSERT_TRUE(m != NULL);
+ EXPECT_EQ("Java_java_lang_String_charAt", JniShortName(m));
+ EXPECT_EQ("Java_java_lang_String_charAt__I", JniLongName(m));
+
+ m = c->FindVirtualMethod("indexOf", "(Ljava/lang/String;I)I");
+ ASSERT_TRUE(m != NULL);
+ EXPECT_EQ("Java_java_lang_String_indexOf", JniShortName(m));
+ EXPECT_EQ("Java_java_lang_String_indexOf__Ljava_lang_String_2I", JniLongName(m));
+
+ m = c->FindDirectMethod("copyValueOf", "([CII)Ljava/lang/String;");
+ ASSERT_TRUE(m != NULL);
+ EXPECT_EQ("Java_java_lang_String_copyValueOf", JniShortName(m));
+ EXPECT_EQ("Java_java_lang_String_copyValueOf___3CII", JniLongName(m));
+}
+
} // namespace art