diff options
Diffstat (limited to 'test/text')
-rw-r--r-- | test/text/bidi.test.cpp | 10 | ||||
-rw-r--r-- | test/text/tagged_string.test.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/test/text/bidi.test.cpp b/test/text/bidi.test.cpp index 7c0eb82884..a3a2ac12a8 100644 --- a/test/text/bidi.test.cpp +++ b/test/text/bidi.test.cpp @@ -61,27 +61,27 @@ TEST(BiDi, StyledText) { std::vector<StyledText> expected; StyledText input( applyArabicShaping(u"مكتبة الإسكندرية Maktabat al-Iskandarīyah"), - std::vector<uint8_t>{ 0,0,0,0,0,1,1,1,1,1,1,2,2,2,2,2,2,2,2,3,3,3,3,3,4,5,5,5,5,6,6,6,6,6,6,6,6,6,6,7,7,7 } + std::vector<std::size_t>{ 0,0,0,0,0,1,1,1,1,1,1,2,2,2,2,2,2,2,2,3,3,3,3,3,4,5,5,5,5,6,6,6,6,6,6,6,6,6,6,7,7,7 } ); expected.emplace_back(StyledText( u"ﺔﺒﺘﻜﻣ", - std::vector<uint8_t>{ 0,0,0,0,0 } + std::vector<std::size_t>{ 0,0,0,0,0 } )); EXPECT_EQ(expected.rbegin()->first.size(), expected.rbegin()->second.size()); expected.emplace_back(StyledText( u" ﺔﻳﺭﺪﻨﻜﺳﻹﺍ ", - std::vector<uint8_t>{ 2,2,2,2,2,2,2,1,1,1,1,1,1 } + std::vector<std::size_t>{ 2,2,2,2,2,2,2,1,1,1,1,1,1 } )); EXPECT_EQ(expected.rbegin()->first.size(), expected.rbegin()->second.size()); expected.emplace_back(StyledText( u"Maktabat al-", - std::vector<uint8_t>{ 2,3,3,3,3,3,4,5,5,5,5,6 } + std::vector<std::size_t>{ 2,3,3,3,3,3,4,5,5,5,5,6 } )); EXPECT_EQ(expected.rbegin()->first.size(), expected.rbegin()->second.size()); expected.emplace_back(StyledText( u"Iskandarīyah", - std::vector<uint8_t>{ 6,6,6,6,6,6,6,6,6,7,7,7 } + std::vector<std::size_t>{ 6,6,6,6,6,6,6,6,6,7,7,7 } )); EXPECT_EQ(expected.rbegin()->first.size(), expected.rbegin()->second.size()); diff --git a/test/text/tagged_string.test.cpp b/test/text/tagged_string.test.cpp index de74126db8..d3a2176eba 100644 --- a/test/text/tagged_string.test.cpp +++ b/test/text/tagged_string.test.cpp @@ -7,22 +7,22 @@ using namespace mbgl; using namespace std::literals; TEST(TaggedString, Trim) { - TaggedString basic(u" \t\ntrim that and not this \n\t", SectionOptions(1.0f, 0)); + TaggedString basic(u" \t\ntrim that and not this \n\t", SectionOptions(1.0f, {})); basic.trim(); EXPECT_EQ(basic.rawText(), u"trim that and not this"); TaggedString twoSections; - twoSections.addSection(u" \t\ntrim that", 1.5f, 1); - twoSections.addSection(u" and not this \n\t", 0.5f, 2); + twoSections.addSection(u" \t\ntrim that", 1.5f, {}); + twoSections.addSection(u" and not this \n\t", 0.5f, {}); twoSections.trim(); EXPECT_EQ(twoSections.rawText(), u"trim that and not this"); - TaggedString empty(u"\n\t\v \r \t\n", SectionOptions(1.0f, 0)); + TaggedString empty(u"\n\t\v \r \t\n", SectionOptions(1.0f, {})); empty.trim(); EXPECT_EQ(empty.rawText(), u""); - TaggedString noTrim(u"no trim!", SectionOptions(1.0f, 0)); + TaggedString noTrim(u"no trim!", SectionOptions(1.0f, {})); noTrim.trim(); EXPECT_EQ(noTrim.rawText(), u"no trim!"); } |