diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2018-11-08 19:09:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-08 19:09:47 +0000 |
| commit | 45ac8e40024ed729ef85c51356b8047d27750433 (patch) | |
| tree | 161f22b3bb932c663d37902b1bfa141adc254678 /libs/androidfw/tests | |
| parent | 7d54535d6259b631a97599cc97f90b61c3fc2774 (diff) | |
| parent | c2b0782c3798ccab5059b0a2fec33d9bd8a08e66 (diff) | |
Merge "Fix flaky idmap test"
Diffstat (limited to 'libs/androidfw/tests')
| -rw-r--r-- | libs/androidfw/tests/Idmap_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/androidfw/tests/Idmap_test.cpp b/libs/androidfw/tests/Idmap_test.cpp index 9eb4a13f34d1..26d28965d459 100644 --- a/libs/androidfw/tests/Idmap_test.cpp +++ b/libs/androidfw/tests/Idmap_test.cpp @@ -94,15 +94,15 @@ TEST_F(IdmapTest, OverlaidResourceHasSameName) { target_table_.add(overlay_data_.data(), overlay_data_.size(), data_, data_size_)); ResTable::resource_name res_name; - ASSERT_TRUE(target_table_.getResourceName(R::array::integerArray1, false, &res_name)); + ASSERT_TRUE(target_table_.getResourceName(R::array::integerArray1, true, &res_name)); ASSERT_TRUE(res_name.package != NULL); ASSERT_TRUE(res_name.type != NULL); - ASSERT_TRUE(res_name.name != NULL); + ASSERT_TRUE(res_name.name8 != NULL); EXPECT_EQ(String16("com.android.basic"), String16(res_name.package, res_name.packageLen)); EXPECT_EQ(String16("array"), String16(res_name.type, res_name.typeLen)); - EXPECT_EQ(String16("integerArray1"), String16(res_name.name, res_name.nameLen)); + EXPECT_EQ(String8("integerArray1"), String8(res_name.name8, res_name.nameLen)); } constexpr const uint32_t kNonOverlaidResourceId = 0x7fff0000u; |