From 1bc976a74ed26a5dcdbf9baef53e280f04eb272f Mon Sep 17 00:00:00 2001 From: Tianjie Date: Wed, 22 Jul 2020 17:25:11 -0700 Subject: Fix some wording to comply with respectful-code https: //source.android.com/setup/contribute/respectful-code Test: Unit tests pass Change-Id: If447b2cf923f6bc7a3a3fb5f69b9fbc06a200ebb --- tests/unit/host/imgdiff_test.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'tests') diff --git a/tests/unit/host/imgdiff_test.cpp b/tests/unit/host/imgdiff_test.cpp index e76ccbdfb..978ac7c2b 100644 --- a/tests/unit/host/imgdiff_test.cpp +++ b/tests/unit/host/imgdiff_test.cpp @@ -35,7 +35,6 @@ using android::base::get_unaligned; -// Sanity check for the given imgdiff patch header. static void verify_patch_header(const std::string& patch, size_t* num_normal, size_t* num_raw, size_t* num_deflate) { const size_t size = patch.size(); -- cgit v1.2.3 From 78d15141733324ef89d1d5d04799e0f2cf4a41e1 Mon Sep 17 00:00:00 2001 From: Tianjie Date: Wed, 22 Jul 2020 17:40:09 -0700 Subject: =?UTF-8?q?Update=20language=20to=20comply=20with=20Android?= =?UTF-8?q?=E2=80=99s=20inclusive=20language=20guidance?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https: //source.android.com/setup/contribute/respectful-code Bug: 161896447 Test: Unit tests pass Change-Id: I0f3f0333dbccc94241a096ca5d3d9bc28c281492 --- tests/testdata/ziptest_dummy-update.zip | Bin 1090065 -> 0 bytes tests/testdata/ziptest_fake-update.zip | Bin 0 -> 1090065 bytes tests/unit/install_test.cpp | 16 ++++++++-------- tests/unit/zip_test.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 tests/testdata/ziptest_dummy-update.zip create mode 100644 tests/testdata/ziptest_fake-update.zip (limited to 'tests') diff --git a/tests/testdata/ziptest_dummy-update.zip b/tests/testdata/ziptest_dummy-update.zip deleted file mode 100644 index 6976bf155..000000000 Binary files a/tests/testdata/ziptest_dummy-update.zip and /dev/null differ diff --git a/tests/testdata/ziptest_fake-update.zip b/tests/testdata/ziptest_fake-update.zip new file mode 100644 index 000000000..6976bf155 Binary files /dev/null and b/tests/testdata/ziptest_fake-update.zip differ diff --git a/tests/unit/install_test.cpp b/tests/unit/install_test.cpp index 90c4b1409..fc7c2bf2f 100644 --- a/tests/unit/install_test.cpp +++ b/tests/unit/install_test.cpp @@ -76,7 +76,7 @@ TEST(InstallTest, read_metadata_from_package_smoke) { TEST(InstallTest, read_metadata_from_package_no_entry) { TemporaryFile temp_file; - BuildZipArchive({ { "dummy_entry", "" } }, temp_file.release(), kCompressStored); + BuildZipArchive({ { "fake_entry", "" } }, temp_file.release(), kCompressStored); ZipArchiveHandle zip; ASSERT_EQ(0, OpenArchive(temp_file.path, &zip)); @@ -153,7 +153,7 @@ TEST(InstallTest, SetUpNonAbUpdateCommands) { TEST(InstallTest, SetUpNonAbUpdateCommands_MissingUpdateBinary) { TemporaryFile temp_file; // The archive must have something to be opened correctly. - BuildZipArchive({ { "dummy_entry", "" } }, temp_file.release(), kCompressStored); + BuildZipArchive({ { "fake_entry", "" } }, temp_file.release(), kCompressStored); // Missing update binary. ZipArchiveHandle zip; @@ -334,7 +334,7 @@ TEST(InstallTest, CheckPackageMetadata_device_type) { metadata = android::base::Join( std::vector{ "ota-type=BRICK", - "pre-device=dummy_device_type", + "pre-device=fake_device_type", }, "\n"); TestCheckPackageMetadata(metadata, OtaType::BRICK, false); @@ -358,7 +358,7 @@ TEST(InstallTest, CheckPackageMetadata_serial_number_smoke) { std::vector{ "ota-type=BRICK", "pre-device=" + device, - "serialno=dummy_serial", + "serialno=fake_serial", }, "\n"); TestCheckPackageMetadata(metadata, OtaType::BRICK, false); @@ -383,7 +383,7 @@ TEST(InstallTest, CheckPackageMetadata_multiple_serial_number) { ASSERT_NE("", serialno); std::vector serial_numbers; - // Creates a dummy serial number string. + // Creates a fake serial number string. for (char c = 'a'; c <= 'z'; c++) { serial_numbers.emplace_back(serialno.size(), c); } @@ -431,7 +431,7 @@ TEST(InstallTest, CheckPackageMetadata_ab_build_version) { std::vector{ "ota-type=AB", "pre-device=" + device, - "pre-build-incremental=dummy_build", + "pre-build-incremental=fake_build", "post-timestamp=" + std::to_string(std::numeric_limits::max()), }, "\n"); @@ -459,7 +459,7 @@ TEST(InstallTest, CheckPackageMetadata_ab_fingerprint) { std::vector{ "ota-type=AB", "pre-device=" + device, - "pre-build=dummy_build_fingerprint", + "pre-build=fake_build_fingerprint", "post-timestamp=" + std::to_string(std::numeric_limits::max()), }, "\n"); @@ -487,7 +487,7 @@ TEST(InstallTest, CheckPackageMetadata_dynamic_fingerprint) { std::vector{ "ota-type=AB", "pre-device=" + device, - "pre-build=dummy_build_fingerprint", + "pre-build=fake_build_fingerprint", "post-timestamp=" + std::to_string(std::numeric_limits::max()), }, "\n"); diff --git a/tests/unit/zip_test.cpp b/tests/unit/zip_test.cpp index 0753d64e1..ec9585c79 100644 --- a/tests/unit/zip_test.cpp +++ b/tests/unit/zip_test.cpp @@ -28,7 +28,7 @@ #include "otautil/sysutil.h" TEST(ZipTest, OpenFromMemory) { - std::string zip_path = from_testdata_base("ziptest_dummy-update.zip"); + std::string zip_path = from_testdata_base("ziptest_fake-update.zip"); MemMapping map; ASSERT_TRUE(map.MapFile(zip_path)); -- cgit v1.2.3