diff options
Diffstat (limited to 'libs/androidfw/tests/LoadedArsc_test.cpp')
| -rw-r--r-- | libs/androidfw/tests/LoadedArsc_test.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/androidfw/tests/LoadedArsc_test.cpp b/libs/androidfw/tests/LoadedArsc_test.cpp index 63574110a817..9aa363495131 100644 --- a/libs/androidfw/tests/LoadedArsc_test.cpp +++ b/libs/androidfw/tests/LoadedArsc_test.cpp @@ -65,10 +65,10 @@ TEST(LoadedArscTest, LoadSinglePackageArsc) { const TypeSpec* type_spec = package->GetTypeSpecByTypeIndex(type_index); ASSERT_THAT(type_spec, NotNull()); - ASSERT_THAT(type_spec->type_count, Ge(1u)); + ASSERT_THAT(type_spec->type_entries.size(), Ge(1u)); - auto type = type_spec->types[0]; - ASSERT_TRUE(LoadedPackage::GetEntry(type, entry_index).has_value()); + auto type = type_spec->type_entries[0]; + ASSERT_TRUE(LoadedPackage::GetEntry(type.type, entry_index).has_value()); } TEST(LoadedArscTest, LoadSparseEntryApp) { @@ -89,10 +89,10 @@ TEST(LoadedArscTest, LoadSparseEntryApp) { const TypeSpec* type_spec = package->GetTypeSpecByTypeIndex(type_index); ASSERT_THAT(type_spec, NotNull()); - ASSERT_THAT(type_spec->type_count, Ge(1u)); + ASSERT_THAT(type_spec->type_entries.size(), Ge(1u)); - auto type = type_spec->types[0]; - ASSERT_TRUE(LoadedPackage::GetEntry(type, entry_index).has_value()); + auto type = type_spec->type_entries[0]; + ASSERT_TRUE(LoadedPackage::GetEntry(type.type, entry_index).has_value()); } TEST(LoadedArscTest, LoadSharedLibrary) { @@ -176,13 +176,13 @@ TEST(LoadedArscTest, LoadFeatureSplit) { const TypeSpec* type_spec = package->GetTypeSpecByTypeIndex(type_index); ASSERT_THAT(type_spec, NotNull()); - ASSERT_THAT(type_spec->type_count, Ge(1u)); + ASSERT_THAT(type_spec->type_entries.size(), Ge(1u)); auto type_name16 = package->GetTypeStringPool()->stringAt(type_spec->type_spec->id - 1); ASSERT_TRUE(type_name16.has_value()); EXPECT_THAT(util::Utf16ToUtf8(*type_name16), StrEq("string")); - ASSERT_TRUE(LoadedPackage::GetEntry(type_spec->types[0], entry_index).has_value()); + ASSERT_TRUE(LoadedPackage::GetEntry(type_spec->type_entries[0].type, entry_index).has_value()); } // AAPT(2) generates resource tables with chunks in a certain order. The rule is that @@ -217,11 +217,11 @@ TEST(LoadedArscTest, LoadOutOfOrderTypeSpecs) { const TypeSpec* type_spec = package->GetTypeSpecByTypeIndex(0); ASSERT_THAT(type_spec, NotNull()); - ASSERT_THAT(type_spec->type_count, Ge(1u)); + ASSERT_THAT(type_spec->type_entries.size(), Ge(1u)); type_spec = package->GetTypeSpecByTypeIndex(1); ASSERT_THAT(type_spec, NotNull()); - ASSERT_THAT(type_spec->type_count, Ge(1u)); + ASSERT_THAT(type_spec->type_entries.size(), Ge(1u)); } TEST(LoadedArscTest, LoadOverlayable) { @@ -363,10 +363,10 @@ TEST(LoadedArscTest, LoadCustomLoader) { const TypeSpec* type_spec = package->GetTypeSpecByTypeIndex(type_index); ASSERT_THAT(type_spec, NotNull()); - ASSERT_THAT(type_spec->type_count, Ge(1u)); + ASSERT_THAT(type_spec->type_entries.size(), Ge(1u)); - auto type = type_spec->types[0]; - ASSERT_TRUE(LoadedPackage::GetEntry(type, entry_index).has_value()); + auto type = type_spec->type_entries[0]; + ASSERT_TRUE(LoadedPackage::GetEntry(type.type, entry_index).has_value()); } // structs with size fields (like Res_value, ResTable_entry) should be |