diff options
| author | Brian Orr <brianorr@google.com> | 2021-06-15 12:47:53 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-06-17 13:37:54 -0700 |
| commit | 71c831703ae59baf47e0afe611fecd714c481cdf (patch) | |
| tree | 06731a987032723085b9e1a65951cf96abbc19cf /libs/androidfw/tests/AssetManager2_test.cpp | |
| parent | 065c9e9a6e9d61d4383a91721eb56a3de253bdbe (diff) | |
| parent | 81833820d54b9a6b27894f9f8dfd72222d416992 (diff) | |
Merge SP1A.210604.001
Change-Id: I5200ee05285ae422d5e9c1c00f45709a5d6188be
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 e1c0fab77884..3c4ee4e63a76 100644 --- a/libs/androidfw/tests/AssetManager2_test.cpp +++ b/libs/androidfw/tests/AssetManager2_test.cpp @@ -765,7 +765,8 @@ TEST_F(AssetManager2Test, GetLastPathWithSingleApkAssets) { auto result = assetmanager.GetLastResourceResolution(); EXPECT_EQ("Resolution for 0x7f030000 com.android.basic:string/test1\n" - "\tFor config -de\n\tFound initial: com.android.basic (basic/basic.apk)", result); + "\tFor config - de\n" + "\tFound initial: basic/basic.apk", result); } TEST_F(AssetManager2Test, GetLastPathWithMultipleApkAssets) { @@ -784,9 +785,9 @@ TEST_F(AssetManager2Test, GetLastPathWithMultipleApkAssets) { auto result = assetmanager.GetLastResourceResolution(); EXPECT_EQ("Resolution for 0x7f030000 com.android.basic:string/test1\n" - "\tFor config -de\n" - "\tFound initial: com.android.basic (basic/basic.apk)\n" - "\tFound better: com.android.basic (basic/basic_de_fr.apk) -de", result); + "\tFor config - de\n" + "\tFound initial: basic/basic.apk\n" + "\tFound better: basic/basic_de_fr.apk - de", result); } TEST_F(AssetManager2Test, GetLastPathAfterDisablingReturnsEmpty) { |