Move more test code to CommonArtTest
Complete migration of libdexfile and libartbase to CommonArtTest.
(libprofile and clients remain on CommonRuntimeTest because of required
refactorings.)
Bug: 78651010
Bug: 72216369
Test: make -j 40 test-art-host-gtest
make -j 2 test-art-target-gtest
Change-Id: Id10d8fc9002e0ad9451730627dfd848f5761c90c
diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index 0d798f3..67413eb 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -355,17 +355,18 @@
return filename;
}
-std::vector<std::unique_ptr<const DexFile>> CommonArtTestImpl::OpenTestDexFiles(const char* name) {
- std::string filename = GetTestDexFileName(name);
+std::vector<std::unique_ptr<const DexFile>> CommonArtTestImpl::OpenDexFiles(const char* filename) {
+ static constexpr bool kVerify = true;
static constexpr bool kVerifyChecksum = true;
std::string error_msg;
const ArtDexFileLoader dex_file_loader;
std::vector<std::unique_ptr<const DexFile>> dex_files;
- bool success = dex_file_loader.Open(filename.c_str(),
- filename.c_str(),
- /* verify */ true,
+ bool success = dex_file_loader.Open(filename,
+ filename,
+ kVerify,
kVerifyChecksum,
- &error_msg, &dex_files);
+ &error_msg,
+ &dex_files);
CHECK(success) << "Failed to open '" << filename << "': " << error_msg;
for (auto& dex_file : dex_files) {
CHECK_EQ(PROT_READ, dex_file->GetPermissions());
@@ -374,6 +375,11 @@
return dex_files;
}
+std::vector<std::unique_ptr<const DexFile>> CommonArtTestImpl::OpenTestDexFiles(
+ const char* name) {
+ return OpenDexFiles(GetTestDexFileName(name).c_str());
+}
+
std::unique_ptr<const DexFile> CommonArtTestImpl::OpenTestDexFile(const char* name) {
std::vector<std::unique_ptr<const DexFile>> vector = OpenTestDexFiles(name);
EXPECT_EQ(1U, vector.size());