diff options
| author | Richard Uhler <ruhler@google.com> | 2014-12-23 09:48:51 -0800 |
|---|---|---|
| committer | Richard Uhler <ruhler@google.com> | 2015-01-13 16:32:34 -0800 |
| commit | fbef44de596d298dc6430f482dffc933a046dd28 (patch) | |
| tree | 57345e86b7dda80b82a263069230b7e312db5ef2 /compiler/driver/compiler_driver_test.cc | |
| parent | 603104b5b5c3759b0bc2733bda2f972686a775a3 (diff) | |
Use unique_ptr to track ownership of dex files.
Bug: 18809837
Change-Id: Ie571eae8fc19ee9207390cff5c7e2a38071b126a
Diffstat (limited to 'compiler/driver/compiler_driver_test.cc')
| -rw-r--r-- | compiler/driver/compiler_driver_test.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index c30cc04e05..a02e25edde 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -106,36 +106,37 @@ TEST_F(CompilerDriverTest, DISABLED_LARGE_CompileDexLibCore) { // All libcore references should resolve ScopedObjectAccess soa(Thread::Current()); - const DexFile* dex = java_lang_dex_file_; - mirror::DexCache* dex_cache = class_linker_->FindDexCache(*dex); - EXPECT_EQ(dex->NumStringIds(), dex_cache->NumStrings()); + ASSERT_TRUE(java_lang_dex_file_ != NULL); + const DexFile& dex = *java_lang_dex_file_; + mirror::DexCache* dex_cache = class_linker_->FindDexCache(dex); + EXPECT_EQ(dex.NumStringIds(), dex_cache->NumStrings()); for (size_t i = 0; i < dex_cache->NumStrings(); i++) { const mirror::String* string = dex_cache->GetResolvedString(i); EXPECT_TRUE(string != NULL) << "string_idx=" << i; } - EXPECT_EQ(dex->NumTypeIds(), dex_cache->NumResolvedTypes()); + EXPECT_EQ(dex.NumTypeIds(), dex_cache->NumResolvedTypes()); for (size_t i = 0; i < dex_cache->NumResolvedTypes(); i++) { mirror::Class* type = dex_cache->GetResolvedType(i); EXPECT_TRUE(type != NULL) << "type_idx=" << i - << " " << dex->GetTypeDescriptor(dex->GetTypeId(i)); + << " " << dex.GetTypeDescriptor(dex.GetTypeId(i)); } - EXPECT_EQ(dex->NumMethodIds(), dex_cache->NumResolvedMethods()); + EXPECT_EQ(dex.NumMethodIds(), dex_cache->NumResolvedMethods()); for (size_t i = 0; i < dex_cache->NumResolvedMethods(); i++) { mirror::ArtMethod* method = dex_cache->GetResolvedMethod(i); EXPECT_TRUE(method != NULL) << "method_idx=" << i - << " " << dex->GetMethodDeclaringClassDescriptor(dex->GetMethodId(i)) - << " " << dex->GetMethodName(dex->GetMethodId(i)); + << " " << dex.GetMethodDeclaringClassDescriptor(dex.GetMethodId(i)) + << " " << dex.GetMethodName(dex.GetMethodId(i)); EXPECT_TRUE(method->GetEntryPointFromQuickCompiledCode() != NULL) << "method_idx=" << i << " " - << dex->GetMethodDeclaringClassDescriptor(dex->GetMethodId(i)) - << " " << dex->GetMethodName(dex->GetMethodId(i)); + << dex.GetMethodDeclaringClassDescriptor(dex.GetMethodId(i)) + << " " << dex.GetMethodName(dex.GetMethodId(i)); } - EXPECT_EQ(dex->NumFieldIds(), dex_cache->NumResolvedFields()); + EXPECT_EQ(dex.NumFieldIds(), dex_cache->NumResolvedFields()); for (size_t i = 0; i < dex_cache->NumResolvedFields(); i++) { mirror::ArtField* field = dex_cache->GetResolvedField(i); EXPECT_TRUE(field != NULL) << "field_idx=" << i - << " " << dex->GetFieldDeclaringClassDescriptor(dex->GetFieldId(i)) - << " " << dex->GetFieldName(dex->GetFieldId(i)); + << " " << dex.GetFieldDeclaringClassDescriptor(dex.GetFieldId(i)) + << " " << dex.GetFieldName(dex.GetFieldId(i)); } // TODO check Class::IsVerified for all classes |