diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-05-09 15:25:37 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-05-11 11:28:29 -0700 |
| commit | 32e7501a27f0f19bccdf9e91f9b87869c093f695 (patch) | |
| tree | 50496484fd5cc1b79d7cf633db311eebbf37f3a6 /libs/androidfw/tests/AssetManager2_test.cpp | |
| parent | f93dc8b6504200d0b6d502d924a70a743f9b1411 (diff) | |
Fix support for @empty in style resolution
If @empty is encountered in XML, do not fallback
to searching through the theme.
Bug: 36891052
Test: make aapt2_tests
Test: bit CtsContentTestCases:android.content.res.cts.TypedArrayTest
Change-Id: Ie3bf7b70af9c7913513a1092afd95d26bec5e635
Diffstat (limited to 'libs/androidfw/tests/AssetManager2_test.cpp')
| -rw-r--r-- | libs/androidfw/tests/AssetManager2_test.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp index d8e5abfe8ce9..fcae53b322b3 100644 --- a/libs/androidfw/tests/AssetManager2_test.cpp +++ b/libs/androidfw/tests/AssetManager2_test.cpp @@ -264,7 +264,7 @@ TEST_F(AssetManager2Test, MergesStylesWithParentFromSingleApkAssets) { const ResolvedBag* bag_two = assetmanager.GetBag(app::R::style::StyleTwo); ASSERT_NE(nullptr, bag_two); - ASSERT_EQ(5u, bag_two->entry_count); + ASSERT_EQ(6u, bag_two->entry_count); // attr_one is inherited from StyleOne. EXPECT_EQ(app::R::attr::attr_one, bag_two->entries[0].key); @@ -295,6 +295,11 @@ TEST_F(AssetManager2Test, MergesStylesWithParentFromSingleApkAssets) { EXPECT_EQ(Res_value::TYPE_INT_DEC, bag_two->entries[4].value.dataType); EXPECT_EQ(3u, bag_two->entries[4].value.data); EXPECT_EQ(0, bag_two->entries[4].cookie); + + EXPECT_EQ(app::R::attr::attr_empty, bag_two->entries[5].key); + EXPECT_EQ(Res_value::TYPE_NULL, bag_two->entries[5].value.dataType); + EXPECT_EQ(Res_value::DATA_NULL_EMPTY, bag_two->entries[5].value.data); + EXPECT_EQ(0, bag_two->entries[5].cookie); } TEST_F(AssetManager2Test, ResolveReferenceToResource) { |