diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-07-28 17:10:35 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-07-31 17:46:28 -0700 |
| commit | 060b53d0287f9e685fb5b49b52a864ef85315a22 (patch) | |
| tree | f6011faf3724d6db46fafd68fd73dcdcb462928c /tools/aapt2/ResourceParser_test.cpp | |
| parent | b74691663d0c181e171b7157d57359d5ce789853 (diff) | |
AAPT2: Ensure style strings are always first in StringPool
Move the styled strings to a separate section of the StringPool so
that sorting can never mess up the order of Styles.
Bug: 63570514
Test: make aapt2_tests
Change-Id: Id2ce1355b92be1bb31ce0daa7e54ae9b5b6c2ffe
Diffstat (limited to 'tools/aapt2/ResourceParser_test.cpp')
| -rw-r--r-- | tools/aapt2/ResourceParser_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/ResourceParser_test.cpp b/tools/aapt2/ResourceParser_test.cpp index d47a529036bc..1683c64a6a5c 100644 --- a/tools/aapt2/ResourceParser_test.cpp +++ b/tools/aapt2/ResourceParser_test.cpp @@ -117,7 +117,7 @@ TEST_F(ResourceParserTest, ParseStyledString) { StyledString* str = test::GetValue<StyledString>(&table_, "string/foo"); ASSERT_THAT(str, NotNull()); - EXPECT_THAT(*str->value->str, Eq("This is my aunt\u2019s fickle string")); + EXPECT_THAT(str->value->value, Eq("This is my aunt\u2019s fickle string")); EXPECT_THAT(str->value->spans, SizeIs(2)); EXPECT_THAT(str->untranslatable_sections, IsEmpty()); @@ -190,7 +190,7 @@ TEST_F(ResourceParserTest, RecordUntranslateableXliffSectionsInStyledString) { StyledString* str = test::GetValue<StyledString>(&table_, "string/foo"); ASSERT_THAT(str, NotNull()); - EXPECT_THAT(*str->value->str, Eq("There are %1$d apples")); + EXPECT_THAT(str->value->value, Eq("There are %1$d apples")); ASSERT_THAT(str->untranslatable_sections, SizeIs(1)); // We expect indices and lengths that span to include the whitespace |