diff options
author | Adam Lesinski <adamlesinski@google.com> | 2014-08-15 13:59:02 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2014-08-15 14:01:43 -0700 |
commit | 2cb761e3ddb9d68ab430013e9cd15ecaab9fbc62 (patch) | |
tree | 2bd700b1bc3ae8d3855103c1a82c229d5d79e131 /libs/androidfw/tests/ResTable_test.cpp | |
parent | 4482e4bb8d1f5fe586b641bc3d6298dc7b8fee80 (diff) |
Fix assumption about DynamicRefTable in aapt
Packages without any resources should not expect to have
a DynamicRefTable.
Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
Diffstat (limited to 'libs/androidfw/tests/ResTable_test.cpp')
-rw-r--r-- | libs/androidfw/tests/ResTable_test.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libs/androidfw/tests/ResTable_test.cpp b/libs/androidfw/tests/ResTable_test.cpp index 8016a82bd248..89d271d0bcd6 100644 --- a/libs/androidfw/tests/ResTable_test.cpp +++ b/libs/androidfw/tests/ResTable_test.cpp @@ -195,4 +195,20 @@ TEST(ResTableTest, resourceIsOverridenWithBetterConfig) { ASSERT_EQ(uint32_t(400), val.data); } +TEST(ResTableTest, emptyTableHasSensibleDefaults) { + const int32_t assetCookie = 1; + + ResTable table; + ASSERT_EQ(NO_ERROR, table.addEmpty(assetCookie)); + + // Adding an empty table gives us one table! + ASSERT_EQ(uint32_t(1), table.getTableCount()); + + // Adding an empty table doesn't mean we get packages. + ASSERT_EQ(uint32_t(0), table.getBasePackageCount()); + + Res_value val; + ASSERT_LT(table.getResource(base::R::integer::number1, &val, MAY_NOT_BE_BAG), 0); +} + } |