commit 84f50aecdeed2d9ed3206681820e41ad6af73a9c
author Richard Uhler <ruhler@google.com> Mon Feb 06 15:12:45 2017 +0000
committer Richard Uhler <ruhler@google.com> Tue Feb 14 09:14:20 2017 +0000
tree 8b2b6de40365dcfc41d9139c9c5d73b95a541b67
parent 69bcf2c940d26d65767bea7417317cf9a0431e0c

Remove remaining uses of DexFile::GetChecksum.

Remove or replace with DexFile::GetMultiDexChecksums as appropriate.

Bug: 34604632
Test: m test-art-host, added image_space_test to test ValidateOatFile.
Change-Id: I1042e87f29a242046d055f0be374ad9fbce4671a

runtime/dex_file_test.cc

diff --git a/runtime/dex_file_test.cc b/runtime/dex_file_test.cc
index b6e010c..9131715 100644
--- a/runtime/dex_file_test.cc
+++ b/runtime/dex_file_test.cc
@@ -326,12 +326,13 @@
 }
 
 TEST_F(DexFileTest, GetChecksum) {
-  uint32_t checksum;
+  std::vector<uint32_t> checksums;
   ScopedObjectAccess soa(Thread::Current());
   std::string error_msg;
-  EXPECT_TRUE(DexFile::GetChecksum(GetLibCoreDexFileNames()[0].c_str(), &checksum, &error_msg))
+  EXPECT_TRUE(DexFile::GetMultiDexChecksums(GetLibCoreDexFileNames()[0].c_str(), &checksums, &error_msg))
       << error_msg;
-  EXPECT_EQ(java_lang_dex_file_->GetLocationChecksum(), checksum);
+  ASSERT_EQ(1U, checksums.size());
+  EXPECT_EQ(java_lang_dex_file_->GetLocationChecksum(), checksums[0]);
 }
 
 TEST_F(DexFileTest, GetMultiDexChecksums) {
@@ -342,19 +343,15 @@
                                             &checksums,
                                             &error_msg)) << error_msg;
 
-  uint32_t checksum0 = 0;
-  EXPECT_TRUE(DexFile::GetChecksum(DexFile::GetMultiDexLocation(0, multidex_file.c_str()).c_str(),
-                                   &checksum0,
-                                   &error_msg)) << error_msg;
+  std::vector<std::unique_ptr<const DexFile>> dexes = OpenTestDexFiles("MultiDex");
+  ASSERT_EQ(2U, dexes.size());
+  ASSERT_EQ(2U, checksums.size());
 
-  uint32_t checksum1 = 0;
-  EXPECT_TRUE(DexFile::GetChecksum(DexFile::GetMultiDexLocation(1, multidex_file.c_str()).c_str(),
-                                   &checksum1,
-                                   &error_msg)) << error_msg;
+  EXPECT_EQ(dexes[0]->GetLocation(), DexFile::GetMultiDexLocation(0, multidex_file.c_str()));
+  EXPECT_EQ(dexes[0]->GetLocationChecksum(), checksums[0]);
 
-  ASSERT_EQ(2u, checksums.size());
-  EXPECT_EQ(checksums[0], checksum0);
-  EXPECT_EQ(checksums[1], checksum1);
+  EXPECT_EQ(dexes[1]->GetLocation(), DexFile::GetMultiDexLocation(1, multidex_file.c_str()));
+  EXPECT_EQ(dexes[1]->GetLocationChecksum(), checksums[1]);
 }
 
 TEST_F(DexFileTest, ClassDefs) {