idmap2: fix clang-tidy warnings [readability-*]
Bug: 120024673
Test: mmm frameworks/base/cmds/idmap2; check output
Change-Id: I1565afac8d34e4347d8c946228d1134211e8b435
diff --git a/cmds/idmap2/tests/IdmapTests.cpp b/cmds/idmap2/tests/IdmapTests.cpp
index 0379aa4..dc80e0e 100644
--- a/cmds/idmap2/tests/IdmapTests.cpp
+++ b/cmds/idmap2/tests/IdmapTests.cpp
@@ -50,10 +50,10 @@
std::istringstream stream(raw);
std::unique_ptr<const IdmapHeader> header = IdmapHeader::FromBinaryStream(stream);
ASSERT_THAT(header, NotNull());
- ASSERT_EQ(header->GetMagic(), 0x504d4449u);
- ASSERT_EQ(header->GetVersion(), 0x01u);
- ASSERT_EQ(header->GetTargetCrc(), 0x1234u);
- ASSERT_EQ(header->GetOverlayCrc(), 0x5678u);
+ ASSERT_EQ(header->GetMagic(), 0x504d4449U);
+ ASSERT_EQ(header->GetVersion(), 0x01U);
+ ASSERT_EQ(header->GetTargetCrc(), 0x1234U);
+ ASSERT_EQ(header->GetOverlayCrc(), 0x5678U);
ASSERT_EQ(header->GetTargetPath().to_string(), "target.apk");
ASSERT_EQ(header->GetOverlayPath().to_string(), "overlay.apk");
}
@@ -77,8 +77,8 @@
std::unique_ptr<const IdmapData::Header> header = IdmapData::Header::FromBinaryStream(stream);
ASSERT_THAT(header, NotNull());
- ASSERT_EQ(header->GetTargetPackageId(), 0x7fu);
- ASSERT_EQ(header->GetTypeCount(), 2u);
+ ASSERT_EQ(header->GetTargetPackageId(), 0x7fU);
+ ASSERT_EQ(header->GetTypeCount(), 2U);
}
TEST(IdmapTests, CreateIdmapDataResourceTypeFromBinaryStream) {
@@ -89,11 +89,11 @@
std::unique_ptr<const IdmapData::TypeEntry> data = IdmapData::TypeEntry::FromBinaryStream(stream);
ASSERT_THAT(data, NotNull());
- ASSERT_EQ(data->GetTargetTypeId(), 0x02u);
- ASSERT_EQ(data->GetOverlayTypeId(), 0x02u);
- ASSERT_EQ(data->GetEntryCount(), 1u);
- ASSERT_EQ(data->GetEntryOffset(), 0u);
- ASSERT_EQ(data->GetEntry(0), 0u);
+ ASSERT_EQ(data->GetTargetTypeId(), 0x02U);
+ ASSERT_EQ(data->GetOverlayTypeId(), 0x02U);
+ ASSERT_EQ(data->GetEntryCount(), 1U);
+ ASSERT_EQ(data->GetEntryOffset(), 0U);
+ ASSERT_EQ(data->GetEntry(0), 0U);
}
TEST(IdmapTests, CreateIdmapDataFromBinaryStream) {
@@ -104,24 +104,24 @@
std::unique_ptr<const IdmapData> data = IdmapData::FromBinaryStream(stream);
ASSERT_THAT(data, NotNull());
- ASSERT_EQ(data->GetHeader()->GetTargetPackageId(), 0x7fu);
- ASSERT_EQ(data->GetHeader()->GetTypeCount(), 2u);
+ ASSERT_EQ(data->GetHeader()->GetTargetPackageId(), 0x7fU);
+ ASSERT_EQ(data->GetHeader()->GetTypeCount(), 2U);
const std::vector<std::unique_ptr<const IdmapData::TypeEntry>>& types = data->GetTypeEntries();
- ASSERT_EQ(types.size(), 2u);
+ ASSERT_EQ(types.size(), 2U);
- ASSERT_EQ(types[0]->GetTargetTypeId(), 0x02u);
- ASSERT_EQ(types[0]->GetOverlayTypeId(), 0x02u);
- ASSERT_EQ(types[0]->GetEntryCount(), 1u);
- ASSERT_EQ(types[0]->GetEntryOffset(), 0u);
- ASSERT_EQ(types[0]->GetEntry(0), 0x0000u);
+ ASSERT_EQ(types[0]->GetTargetTypeId(), 0x02U);
+ ASSERT_EQ(types[0]->GetOverlayTypeId(), 0x02U);
+ ASSERT_EQ(types[0]->GetEntryCount(), 1U);
+ ASSERT_EQ(types[0]->GetEntryOffset(), 0U);
+ ASSERT_EQ(types[0]->GetEntry(0), 0x0000U);
- ASSERT_EQ(types[1]->GetTargetTypeId(), 0x03u);
- ASSERT_EQ(types[1]->GetOverlayTypeId(), 0x03u);
- ASSERT_EQ(types[1]->GetEntryCount(), 3u);
- ASSERT_EQ(types[1]->GetEntryOffset(), 3u);
- ASSERT_EQ(types[1]->GetEntry(0), 0x0000u);
+ ASSERT_EQ(types[1]->GetTargetTypeId(), 0x03U);
+ ASSERT_EQ(types[1]->GetOverlayTypeId(), 0x03U);
+ ASSERT_EQ(types[1]->GetEntryCount(), 3U);
+ ASSERT_EQ(types[1]->GetEntryOffset(), 3U);
+ ASSERT_EQ(types[1]->GetEntry(0), 0x0000U);
ASSERT_EQ(types[1]->GetEntry(1), kNoEntry);
- ASSERT_EQ(types[1]->GetEntry(2), 0x0001u);
+ ASSERT_EQ(types[1]->GetEntry(2), 0x0001U);
}
TEST(IdmapTests, CreateIdmapFromBinaryStream) {
@@ -133,35 +133,35 @@
ASSERT_THAT(idmap, NotNull());
ASSERT_THAT(idmap->GetHeader(), NotNull());
- ASSERT_EQ(idmap->GetHeader()->GetMagic(), 0x504d4449u);
- ASSERT_EQ(idmap->GetHeader()->GetVersion(), 0x01u);
- ASSERT_EQ(idmap->GetHeader()->GetTargetCrc(), 0x1234u);
- ASSERT_EQ(idmap->GetHeader()->GetOverlayCrc(), 0x5678u);
+ ASSERT_EQ(idmap->GetHeader()->GetMagic(), 0x504d4449U);
+ ASSERT_EQ(idmap->GetHeader()->GetVersion(), 0x01U);
+ ASSERT_EQ(idmap->GetHeader()->GetTargetCrc(), 0x1234U);
+ ASSERT_EQ(idmap->GetHeader()->GetOverlayCrc(), 0x5678U);
ASSERT_EQ(idmap->GetHeader()->GetTargetPath().to_string(), "target.apk");
ASSERT_EQ(idmap->GetHeader()->GetOverlayPath().to_string(), "overlay.apk");
const std::vector<std::unique_ptr<const IdmapData>>& dataBlocks = idmap->GetData();
- ASSERT_EQ(dataBlocks.size(), 1u);
+ ASSERT_EQ(dataBlocks.size(), 1U);
const std::unique_ptr<const IdmapData>& data = dataBlocks[0];
- ASSERT_EQ(data->GetHeader()->GetTargetPackageId(), 0x7fu);
- ASSERT_EQ(data->GetHeader()->GetTypeCount(), 2u);
+ ASSERT_EQ(data->GetHeader()->GetTargetPackageId(), 0x7fU);
+ ASSERT_EQ(data->GetHeader()->GetTypeCount(), 2U);
const std::vector<std::unique_ptr<const IdmapData::TypeEntry>>& types = data->GetTypeEntries();
- ASSERT_EQ(types.size(), 2u);
+ ASSERT_EQ(types.size(), 2U);
- ASSERT_EQ(types[0]->GetTargetTypeId(), 0x02u);
- ASSERT_EQ(types[0]->GetOverlayTypeId(), 0x02u);
- ASSERT_EQ(types[0]->GetEntryCount(), 1u);
- ASSERT_EQ(types[0]->GetEntryOffset(), 0u);
- ASSERT_EQ(types[0]->GetEntry(0), 0x0000u);
+ ASSERT_EQ(types[0]->GetTargetTypeId(), 0x02U);
+ ASSERT_EQ(types[0]->GetOverlayTypeId(), 0x02U);
+ ASSERT_EQ(types[0]->GetEntryCount(), 1U);
+ ASSERT_EQ(types[0]->GetEntryOffset(), 0U);
+ ASSERT_EQ(types[0]->GetEntry(0), 0x0000U);
- ASSERT_EQ(types[1]->GetTargetTypeId(), 0x03u);
- ASSERT_EQ(types[1]->GetOverlayTypeId(), 0x03u);
- ASSERT_EQ(types[1]->GetEntryCount(), 3u);
- ASSERT_EQ(types[1]->GetEntryOffset(), 3u);
- ASSERT_EQ(types[1]->GetEntry(0), 0x0000u);
+ ASSERT_EQ(types[1]->GetTargetTypeId(), 0x03U);
+ ASSERT_EQ(types[1]->GetOverlayTypeId(), 0x03U);
+ ASSERT_EQ(types[1]->GetEntryCount(), 3U);
+ ASSERT_EQ(types[1]->GetEntryOffset(), 3U);
+ ASSERT_EQ(types[1]->GetEntry(0), 0x0000U);
ASSERT_EQ(types[1]->GetEntry(1), kNoEntry);
- ASSERT_EQ(types[1]->GetEntry(2), 0x0001u);
+ ASSERT_EQ(types[1]->GetEntry(2), 0x0001U);
}
TEST(IdmapTests, GracefullyFailToCreateIdmapFromCorruptBinaryStream) {
@@ -189,8 +189,8 @@
ASSERT_THAT(idmap, NotNull());
ASSERT_THAT(idmap->GetHeader(), NotNull());
- ASSERT_EQ(idmap->GetHeader()->GetMagic(), 0x504d4449u);
- ASSERT_EQ(idmap->GetHeader()->GetVersion(), 0x01u);
+ ASSERT_EQ(idmap->GetHeader()->GetMagic(), 0x504d4449U);
+ ASSERT_EQ(idmap->GetHeader()->GetVersion(), 0x01U);
ASSERT_EQ(idmap->GetHeader()->GetTargetCrc(), 0xf5ad1d1d);
ASSERT_EQ(idmap->GetHeader()->GetOverlayCrc(), 0xd470336b);
ASSERT_EQ(idmap->GetHeader()->GetTargetPath().to_string(), target_apk_path);
@@ -198,30 +198,30 @@
ASSERT_EQ(idmap->GetHeader()->GetOverlayPath(), overlay_apk_path);
const std::vector<std::unique_ptr<const IdmapData>>& dataBlocks = idmap->GetData();
- ASSERT_EQ(dataBlocks.size(), 1u);
+ ASSERT_EQ(dataBlocks.size(), 1U);
const std::unique_ptr<const IdmapData>& data = dataBlocks[0];
- ASSERT_EQ(data->GetHeader()->GetTargetPackageId(), 0x7fu);
- ASSERT_EQ(data->GetHeader()->GetTypeCount(), 2u);
+ ASSERT_EQ(data->GetHeader()->GetTargetPackageId(), 0x7fU);
+ ASSERT_EQ(data->GetHeader()->GetTypeCount(), 2U);
const std::vector<std::unique_ptr<const IdmapData::TypeEntry>>& types = data->GetTypeEntries();
- ASSERT_EQ(types.size(), 2u);
+ ASSERT_EQ(types.size(), 2U);
- ASSERT_EQ(types[0]->GetTargetTypeId(), 0x01u);
- ASSERT_EQ(types[0]->GetOverlayTypeId(), 0x01u);
- ASSERT_EQ(types[0]->GetEntryCount(), 1u);
- ASSERT_EQ(types[0]->GetEntryOffset(), 0u);
- ASSERT_EQ(types[0]->GetEntry(0), 0x0000u);
+ ASSERT_EQ(types[0]->GetTargetTypeId(), 0x01U);
+ ASSERT_EQ(types[0]->GetOverlayTypeId(), 0x01U);
+ ASSERT_EQ(types[0]->GetEntryCount(), 1U);
+ ASSERT_EQ(types[0]->GetEntryOffset(), 0U);
+ ASSERT_EQ(types[0]->GetEntry(0), 0x0000U);
- ASSERT_EQ(types[1]->GetTargetTypeId(), 0x02u);
- ASSERT_EQ(types[1]->GetOverlayTypeId(), 0x02u);
- ASSERT_EQ(types[1]->GetEntryCount(), 4u);
- ASSERT_EQ(types[1]->GetEntryOffset(), 3u);
- ASSERT_EQ(types[1]->GetEntry(0), 0x0000u);
+ ASSERT_EQ(types[1]->GetTargetTypeId(), 0x02U);
+ ASSERT_EQ(types[1]->GetOverlayTypeId(), 0x02U);
+ ASSERT_EQ(types[1]->GetEntryCount(), 4U);
+ ASSERT_EQ(types[1]->GetEntryOffset(), 3U);
+ ASSERT_EQ(types[1]->GetEntry(0), 0x0000U);
ASSERT_EQ(types[1]->GetEntry(1), kNoEntry);
- ASSERT_EQ(types[1]->GetEntry(2), 0x0001u);
- ASSERT_EQ(types[1]->GetEntry(3), 0x0002u);
+ ASSERT_EQ(types[1]->GetEntry(2), 0x0001U);
+ ASSERT_EQ(types[1]->GetEntry(3), 0x0002U);
}
TEST(IdmapTests, FailToCreateIdmapFromApkAssetsIfPathTooLong) {