diff options
| author | 2018-11-30 01:03:10 +0000 | |
|---|---|---|
| committer | 2018-11-30 01:03:10 +0000 | |
| commit | 458128737485d72028d0e4af9855b7773c81010b (patch) | |
| tree | 74b5b23be9f71018e396b37e3ba7aa190ef7a72a /runtime/class_loader_context_test.cc | |
| parent | d5ae80c223a2aa51b6a54faa0f014acdd013103f (diff) | |
| parent | 1717a493a4a0c1c3b69ecfcb58838627b4c75878 (diff) | |
Merge "Revert "Support shared libraries in CreateContextFromClassLoader.""
Diffstat (limited to 'runtime/class_loader_context_test.cc')
| -rw-r--r-- | runtime/class_loader_context_test.cc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/runtime/class_loader_context_test.cc b/runtime/class_loader_context_test.cc index 3c5f1ef95d..0756982b65 100644 --- a/runtime/class_loader_context_test.cc +++ b/runtime/class_loader_context_test.cc @@ -23,7 +23,6 @@ #include "base/dchecked_vector.h" #include "base/stl_util.h" #include "class_linker.h" -#include "class_root.h" #include "common_runtime_test.h" #include "dex/dex_file.h" #include "handle_scope-inl.h" @@ -31,7 +30,6 @@ #include "mirror/class.h" #include "mirror/class_loader.h" #include "mirror/object-inl.h" -#include "mirror/object_array-alloc-inl.h" #include "oat_file_assistant.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" @@ -1232,30 +1230,4 @@ TEST_F(ClassLoaderContextTest, VerifyClassLoaderContextMatchAfterEncodingMultide ClassLoaderContext::VerificationResult::kVerifies); } -TEST_F(ClassLoaderContextTest, CreateContextForClassLoaderWithSharedLibraries) { - jobject class_loader_a = LoadDexInPathClassLoader("ForClassLoaderA", nullptr); - - ScopedObjectAccess soa(Thread::Current()); - StackHandleScope<1> hs(soa.Self()); - Handle<mirror::ObjectArray<mirror::ClassLoader>> libraries = hs.NewHandle( - mirror::ObjectArray<mirror::ClassLoader>::Alloc( - soa.Self(), - GetClassRoot<mirror::ObjectArray<mirror::ClassLoader>>(), - 1)); - libraries->Set(0, soa.Decode<mirror::ClassLoader>(class_loader_a)); - - jobject class_loader_b = LoadDexInPathClassLoader( - "ForClassLoaderB", nullptr, soa.AddLocalReference<jobject>(libraries.Get())); - - std::unique_ptr<ClassLoaderContext> context = CreateContextForClassLoader(class_loader_b); - ASSERT_TRUE(context != nullptr); - std::vector<std::unique_ptr<const DexFile>> dex_files = OpenTestDexFiles("ForClassLoaderB"); - VerifyClassLoaderPCL(context.get(), 0, dex_files[0]->GetLocation()); - dex_files = OpenTestDexFiles("ForClassLoaderA"); - VerifyClassLoaderSharedLibraryPCL(context.get(), 0, 0, dex_files[0]->GetLocation()); - - ASSERT_EQ(context->VerifyClassLoaderContextMatch(context->EncodeContextForOatFile("")), - ClassLoaderContext::VerificationResult::kVerifies); -} - } // namespace art |