From 4e0b5d713de14c3e2e4cdb2731bb3168b4a1a3f4 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 9 Nov 2022 10:58:15 +0000 Subject: Clean up decoding well-known classes. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Change-Id: I27b4e8f5513511ce1c320e3224dd9c2a40880b69 --- runtime/class_loader_context_test.cc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'runtime/class_loader_context_test.cc') diff --git a/runtime/class_loader_context_test.cc b/runtime/class_loader_context_test.cc index 9d3ceb2a70..cb7726d4ec 100644 --- a/runtime/class_loader_context_test.cc +++ b/runtime/class_loader_context_test.cc @@ -247,7 +247,7 @@ class ClassLoaderContextTest : public CommonRuntimeTest { REQUIRES_SHARED(Locks::mutator_lock_) { ASSERT_TRUE(class_loader->GetClass() == soa.Decode(type)); - std::vector class_loader_dex_files = GetDexFiles(soa, class_loader); + std::vector class_loader_dex_files = GetDexFiles(soa.Self(), class_loader); ASSERT_EQ(expected_dex_files.size(), class_loader_dex_files.size()); for (size_t i = 0; i < expected_dex_files.size(); i++) { @@ -678,9 +678,9 @@ TEST_F(ClassLoaderContextTest, CreateClassLoader) { soa.Decode(jclass_loader)); ASSERT_TRUE(class_loader->GetClass() == - soa.Decode(WellKnownClasses::dalvik_system_PathClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::dalvik_system_PathClassLoader)); ASSERT_TRUE(class_loader->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); // For the first class loader the class path dex files must come first and then the // compilation sources. @@ -719,7 +719,7 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithEmptyContext) { WellKnownClasses::dalvik_system_PathClassLoader, compilation_sources_raw); ASSERT_TRUE(class_loader->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); } TEST_F(ClassLoaderContextTest, CreateClassLoaderWithComplexChain) { @@ -789,7 +789,7 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithComplexChain) { class_loader_3_dex_files); // The last class loader should have the BootClassLoader as a parent. ASSERT_TRUE(class_loader_3->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); } TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibraries) { @@ -871,11 +871,11 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibraries) { // All class loaders should have the BootClassLoader as a parent. ASSERT_TRUE(class_loader_1->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); ASSERT_TRUE(class_loader_2->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); ASSERT_TRUE(class_loader_3->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); } TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibrariesInParentToo) { @@ -970,11 +970,11 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibrariesInParentToo) // Class loaders should have the BootClassLoader as a parent. ASSERT_TRUE(class_loader_2->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); ASSERT_TRUE(class_loader_3->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); ASSERT_TRUE(class_loader_4->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); } TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibrariesDependencies) { @@ -1069,11 +1069,11 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSharedLibrariesDependencies) // Class loaders should have the BootClassLoader as a parent. ASSERT_TRUE(class_loader_2->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); ASSERT_TRUE(class_loader_3->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); ASSERT_TRUE(class_loader_4->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); } TEST_F(ClassLoaderContextTest, RemoveSourceLocations) { @@ -1171,9 +1171,9 @@ TEST_F(ClassLoaderContextTest, CreateClassLoaderWithSameSharedLibraries) { // Class loaders should have the BootClassLoader as a parent. ASSERT_TRUE(class_loader_2->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); ASSERT_TRUE(class_loader_3->GetParent()->GetClass() == - soa.Decode(WellKnownClasses::java_lang_BootClassLoader)); + WellKnownClasses::ToClass(WellKnownClasses::java_lang_BootClassLoader)); } TEST_F(ClassLoaderContextTest, EncodeInOatFile) { -- cgit v1.2.3-59-g8ed1b