Merge "Add more tests for verify_package_compatibility()."
am: a9dd77fa84
Change-Id: Ie0eeef3f0f188236b502d378140041931c2b7fb1
This commit is contained in:
commit
5f85d07e87
1 changed files with 84 additions and 0 deletions
|
@ -15,14 +15,17 @@
|
|||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <android-base/file.h>
|
||||
#include <android-base/properties.h>
|
||||
#include <android-base/strings.h>
|
||||
#include <android-base/test_utils.h>
|
||||
#include <gtest/gtest.h>
|
||||
#include <vintf/VintfObjectRecovery.h>
|
||||
#include <ziparchive/zip_archive.h>
|
||||
#include <ziparchive/zip_writer.h>
|
||||
|
||||
|
@ -112,6 +115,87 @@ TEST(InstallTest, read_metadata_from_package_no_entry) {
|
|||
CloseArchive(zip);
|
||||
}
|
||||
|
||||
TEST(InstallTest, verify_package_compatibility_with_libvintf_malformed_xml) {
|
||||
TemporaryFile compatibility_zip_file;
|
||||
FILE* compatibility_zip = fdopen(compatibility_zip_file.fd, "w");
|
||||
ZipWriter compatibility_zip_writer(compatibility_zip);
|
||||
ASSERT_EQ(0, compatibility_zip_writer.StartEntry("system_manifest.xml", kCompressDeflated));
|
||||
std::string malformed_xml = "malformed";
|
||||
ASSERT_EQ(0, compatibility_zip_writer.WriteBytes(malformed_xml.data(), malformed_xml.size()));
|
||||
ASSERT_EQ(0, compatibility_zip_writer.FinishEntry());
|
||||
ASSERT_EQ(0, compatibility_zip_writer.Finish());
|
||||
ASSERT_EQ(0, fclose(compatibility_zip));
|
||||
|
||||
TemporaryFile temp_file;
|
||||
FILE* zip_file = fdopen(temp_file.fd, "w");
|
||||
ZipWriter writer(zip_file);
|
||||
ASSERT_EQ(0, writer.StartEntry("compatibility.zip", kCompressStored));
|
||||
std::string compatibility_zip_content;
|
||||
ASSERT_TRUE(
|
||||
android::base::ReadFileToString(compatibility_zip_file.path, &compatibility_zip_content));
|
||||
ASSERT_EQ(0,
|
||||
writer.WriteBytes(compatibility_zip_content.data(), compatibility_zip_content.size()));
|
||||
ASSERT_EQ(0, writer.FinishEntry());
|
||||
ASSERT_EQ(0, writer.Finish());
|
||||
ASSERT_EQ(0, fclose(zip_file));
|
||||
|
||||
ZipArchiveHandle zip;
|
||||
ASSERT_EQ(0, OpenArchive(temp_file.path, &zip));
|
||||
std::vector<std::string> compatibility_info;
|
||||
compatibility_info.push_back(malformed_xml);
|
||||
// Malformed compatibility zip is expected to be rejected by libvintf. But we defer that to
|
||||
// libvintf.
|
||||
std::string err;
|
||||
bool result =
|
||||
android::vintf::VintfObjectRecovery::CheckCompatibility(compatibility_info, &err) == 0;
|
||||
ASSERT_EQ(result, verify_package_compatibility(zip));
|
||||
CloseArchive(zip);
|
||||
}
|
||||
|
||||
TEST(InstallTest, verify_package_compatibility_with_libvintf_system_manifest_xml) {
|
||||
static constexpr const char* system_manifest_xml_path = "/system/manifest.xml";
|
||||
if (access(system_manifest_xml_path, R_OK) == -1) {
|
||||
GTEST_LOG_(INFO) << "Test skipped on devices w/o /system/manifest.xml.";
|
||||
return;
|
||||
}
|
||||
std::string system_manifest_xml_content;
|
||||
ASSERT_TRUE(
|
||||
android::base::ReadFileToString(system_manifest_xml_path, &system_manifest_xml_content));
|
||||
TemporaryFile compatibility_zip_file;
|
||||
FILE* compatibility_zip = fdopen(compatibility_zip_file.fd, "w");
|
||||
ZipWriter compatibility_zip_writer(compatibility_zip);
|
||||
ASSERT_EQ(0, compatibility_zip_writer.StartEntry("system_manifest.xml", kCompressDeflated));
|
||||
ASSERT_EQ(0, compatibility_zip_writer.WriteBytes(system_manifest_xml_content.data(),
|
||||
system_manifest_xml_content.size()));
|
||||
ASSERT_EQ(0, compatibility_zip_writer.FinishEntry());
|
||||
ASSERT_EQ(0, compatibility_zip_writer.Finish());
|
||||
ASSERT_EQ(0, fclose(compatibility_zip));
|
||||
|
||||
TemporaryFile temp_file;
|
||||
FILE* zip_file = fdopen(temp_file.fd, "w");
|
||||
ZipWriter writer(zip_file);
|
||||
ASSERT_EQ(0, writer.StartEntry("compatibility.zip", kCompressStored));
|
||||
std::string compatibility_zip_content;
|
||||
ASSERT_TRUE(
|
||||
android::base::ReadFileToString(compatibility_zip_file.path, &compatibility_zip_content));
|
||||
ASSERT_EQ(0,
|
||||
writer.WriteBytes(compatibility_zip_content.data(), compatibility_zip_content.size()));
|
||||
ASSERT_EQ(0, writer.FinishEntry());
|
||||
ASSERT_EQ(0, writer.Finish());
|
||||
ASSERT_EQ(0, fclose(zip_file));
|
||||
|
||||
ZipArchiveHandle zip;
|
||||
ASSERT_EQ(0, OpenArchive(temp_file.path, &zip));
|
||||
std::vector<std::string> compatibility_info;
|
||||
compatibility_info.push_back(system_manifest_xml_content);
|
||||
std::string err;
|
||||
bool result =
|
||||
android::vintf::VintfObjectRecovery::CheckCompatibility(compatibility_info, &err) == 0;
|
||||
// Make sure the result is consistent with libvintf library.
|
||||
ASSERT_EQ(result, verify_package_compatibility(zip));
|
||||
CloseArchive(zip);
|
||||
}
|
||||
|
||||
TEST(InstallTest, update_binary_command_smoke) {
|
||||
#ifdef AB_OTA_UPDATER
|
||||
TemporaryFile temp_file;
|
||||
|
|
Loading…
Reference in a new issue