diff options
Diffstat (limited to 'runtime/utils_test.cc')
| -rw-r--r-- | runtime/utils_test.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc index 634bd47f05..ee8eb363f1 100644 --- a/runtime/utils_test.cc +++ b/runtime/utils_test.cc @@ -22,13 +22,13 @@ #include "class_linker-inl.h" #include "common_runtime_test.h" #include "exec_utils.h" -#include "mirror/array.h" +#include "handle_scope-inl.h" #include "mirror/array-inl.h" +#include "mirror/array.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/string.h" #include "scoped_thread_state_change-inl.h" -#include "handle_scope-inl.h" #include "base/memory_tool.h" @@ -192,18 +192,21 @@ TEST_F(UtilsTest, JniShortName_JniLongName) { ASSERT_TRUE(c != nullptr); ArtMethod* m; - m = c->FindVirtualMethod("charAt", "(I)C", kRuntimePointerSize); + m = c->FindClassMethod("charAt", "(I)C", kRuntimePointerSize); ASSERT_TRUE(m != nullptr); + ASSERT_FALSE(m->IsDirect()); EXPECT_EQ("Java_java_lang_String_charAt", m->JniShortName()); EXPECT_EQ("Java_java_lang_String_charAt__I", m->JniLongName()); - m = c->FindVirtualMethod("indexOf", "(Ljava/lang/String;I)I", kRuntimePointerSize); + m = c->FindClassMethod("indexOf", "(Ljava/lang/String;I)I", kRuntimePointerSize); ASSERT_TRUE(m != nullptr); + ASSERT_FALSE(m->IsDirect()); EXPECT_EQ("Java_java_lang_String_indexOf", m->JniShortName()); EXPECT_EQ("Java_java_lang_String_indexOf__Ljava_lang_String_2I", m->JniLongName()); - m = c->FindDirectMethod("copyValueOf", "([CII)Ljava/lang/String;", kRuntimePointerSize); + m = c->FindClassMethod("copyValueOf", "([CII)Ljava/lang/String;", kRuntimePointerSize); ASSERT_TRUE(m != nullptr); + ASSERT_TRUE(m->IsStatic()); EXPECT_EQ("Java_java_lang_String_copyValueOf", m->JniShortName()); EXPECT_EQ("Java_java_lang_String_copyValueOf___3CII", m->JniLongName()); } |