diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-01-16 19:11:19 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-02-08 06:04:52 -0800 |
| commit | 929d6517dfd338f0d481dbe6587643d5aef27ec6 (patch) | |
| tree | b80a93b93946bd4e982b9f4abd97a4c3aa43feb3 /libs/androidfw/tests/AssetManager2_test.cpp | |
| parent | c270de85cc0c398d9ce165592908d2740219a708 (diff) | |
AssetManager2: Add GetResourceId
Add ability to lookup a resource by name.
Test: make libandroidfw_tests
Change-Id: I262ba5ce4c9892458226fbdb44cf21f9877fb92d
Diffstat (limited to 'libs/androidfw/tests/AssetManager2_test.cpp')
| -rw-r--r-- | libs/androidfw/tests/AssetManager2_test.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp index 557d8d40dfc2..78fbb0f85f68 100644 --- a/libs/androidfw/tests/AssetManager2_test.cpp +++ b/libs/androidfw/tests/AssetManager2_test.cpp @@ -20,6 +20,7 @@ #include "android-base/logging.h" #include "TestHelpers.h" +#include "androidfw/ResourceUtils.h" #include "data/appaslib/R.h" #include "data/basic/R.h" #include "data/lib_one/R.h" @@ -194,11 +195,11 @@ TEST_F(AssetManager2Test, FindsResourceFromAppLoadedAsSharedLibrary) { ResTable_config selected_config; uint32_t flags; ApkAssetsCookie cookie = assetmanager.GetResource( - util::fix_package_id(appaslib::R::integer::number1, 0x02), false /*may_be_bag*/, + fix_package_id(appaslib::R::integer::number1, 0x02), false /*may_be_bag*/, 0u /*density_override*/, &value, &selected_config, &flags); ASSERT_NE(kInvalidCookie, cookie); EXPECT_EQ(Res_value::TYPE_REFERENCE, value.dataType); - EXPECT_EQ(util::fix_package_id(appaslib::R::array::integerArray1, 0x02), value.data); + EXPECT_EQ(fix_package_id(appaslib::R::array::integerArray1, 0x02), value.data); } TEST_F(AssetManager2Test, FindsBagResourceFromSingleApkAssets) { @@ -238,9 +239,9 @@ TEST_F(AssetManager2Test, FindsBagResourceFromSharedLibrary) { // First two attributes come from lib_one. EXPECT_EQ(1, bag->entries[0].cookie); - EXPECT_EQ(0x03, util::get_package_id(bag->entries[0].key)); + EXPECT_EQ(0x03, get_package_id(bag->entries[0].key)); EXPECT_EQ(1, bag->entries[1].cookie); - EXPECT_EQ(0x03, util::get_package_id(bag->entries[1].key)); + EXPECT_EQ(0x03, get_package_id(bag->entries[1].key)); } TEST_F(AssetManager2Test, MergesStylesWithParentFromSingleApkAssets) { |