diff options
| author | Steven Laver <lavers@google.com> | 2019-11-05 13:42:59 -0800 |
|---|---|---|
| committer | Steven Laver <lavers@google.com> | 2019-11-09 01:16:30 +0000 |
| commit | 7c6cc72e18cc1df5205fd2bc47664e6cc2534ad2 (patch) | |
| tree | fc34e4ad6037cf231cccc3b56ccd13e82917520a /libs/androidfw/tests/AssetManager2_test.cpp | |
| parent | 8f4f93bf3ba75d8e83cb0a8618cb80f226ada5ac (diff) | |
| parent | da5e1bd24a9a0ca24e7e49fad9e604409e573376 (diff) | |
Merge RP1A.191024.001
Change-Id: I5cda3bba276e99d948b752be87d4599e9f882e0f
Diffstat (limited to 'libs/androidfw/tests/AssetManager2_test.cpp')
| -rw-r--r-- | libs/androidfw/tests/AssetManager2_test.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libs/androidfw/tests/AssetManager2_test.cpp b/libs/androidfw/tests/AssetManager2_test.cpp index 40c8e46e4d84..b3190be8caf1 100644 --- a/libs/androidfw/tests/AssetManager2_test.cpp +++ b/libs/androidfw/tests/AssetManager2_test.cpp @@ -707,7 +707,7 @@ TEST_F(AssetManager2Test, GetLastPathAfterDisablingReturnsEmpty) { EXPECT_EQ("", resultDisabled); } -TEST_F(AssetManager2Test, GetOverlayableMap) { +TEST_F(AssetManager2Test, GetOverlayablesToString) { ResTable_config desired_config; memset(&desired_config, 0, sizeof(desired_config)); @@ -718,9 +718,17 @@ TEST_F(AssetManager2Test, GetOverlayableMap) { const auto map = assetmanager.GetOverlayableMapForPackage(0x7f); ASSERT_NE(nullptr, map); - ASSERT_EQ(2, map->size()); + ASSERT_EQ(3, map->size()); ASSERT_EQ(map->at("OverlayableResources1"), "overlay://theme"); ASSERT_EQ(map->at("OverlayableResources2"), "overlay://com.android.overlayable"); + ASSERT_EQ(map->at("OverlayableResources3"), ""); + + std::string api; + ASSERT_TRUE(assetmanager.GetOverlayablesToString("com.android.overlayable", &api)); + ASSERT_EQ(api.find("not_overlayable"), std::string::npos); + ASSERT_NE(api.find("resource='com.android.overlayable:string/overlayable2' overlayable='OverlayableResources1' actor='overlay://theme' policy='0x0000000a'\n"), + std::string::npos); + } } // namespace android |