diff options
| author | Chris Loer <chris.loer@gmail.com> | 2016-11-16 12:50:57 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-11-17 14:33:03 -0800 |
| commit | d4fc66af3924805d40576989c1e139ddafcc4670 (patch) | |
| tree | 87e8dac7bc21051086f2765b4d04e884aad4cec7 /test | |
| parent | bceeba29a3fa85105c21718ed0be8704508ab585 (diff) | |
| download | qtlocation-mapboxgl-d4fc66af3924805d40576989c1e139ddafcc4670.tar.gz | |
[core] Add minimal line breaking support for RTL text.
Diffstat (limited to 'test')
| -rw-r--r-- | test/util/merge_lines.test.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/test/util/merge_lines.test.cpp b/test/util/merge_lines.test.cpp index 30cd1af068..8383183e0a 100644 --- a/test/util/merge_lines.test.cpp +++ b/test/util/merge_lines.test.cpp @@ -9,21 +9,21 @@ const std::u16string bbb = u"b"; TEST(MergeLines, SameText) { // merges lines with the same text std::vector<mbgl::SymbolFeature> input1 = { - { {{{0, 0}, {1, 0}, {2, 0}}}, aaa, {}, 0 }, - { {{{4, 0}, {5, 0}, {6, 0}}}, bbb, {}, 0 }, - { {{{8, 0}, {9, 0}}}, aaa, {}, 0 }, - { {{{2, 0}, {3, 0}, {4, 0}}}, aaa, {}, 0 }, - { {{{6, 0}, {7, 0}, {8, 0}}}, aaa, {}, 0 }, - { {{{5, 0}, {6, 0}}}, aaa, {}, 0 } + { {{{0, 0}, {1, 0}, {2, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{4, 0}, {5, 0}, {6, 0}}}, bbb, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{8, 0}, {9, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{2, 0}, {3, 0}, {4, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{6, 0}, {7, 0}, {8, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{5, 0}, {6, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 } }; const std::vector<mbgl::SymbolFeature> expected1 = { - { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}}}, aaa, {}, 0 }, - { {{{4, 0}, {5, 0}, {6, 0}}}, bbb, {}, 0 }, - { {{{5, 0}, {6, 0}, {7, 0}, {8, 0}, {9, 0}}}, aaa, {}, 0 }, - { {{}}, aaa, {}, 0 }, - { {{}}, aaa, {}, 0 }, - { {{}}, aaa, {}, 0 } + { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{4, 0}, {5, 0}, {6, 0}}}, bbb, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{5, 0}, {6, 0}, {7, 0}, {8, 0}, {9, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 } }; mbgl::util::mergeLines(input1); @@ -36,15 +36,15 @@ TEST(MergeLines, SameText) { TEST(MergeLines, BothEnds) { // mergeLines handles merge from both ends std::vector<mbgl::SymbolFeature> input2 = { - { {{{0, 0}, {1, 0}, {2, 0}}}, aaa, {}, 0 }, - { {{{4, 0}, {5, 0}, {6, 0}}}, aaa, {}, 0 }, - { {{{2, 0}, {3, 0}, {4, 0}}}, aaa, {}, 0 } + { {{{0, 0}, {1, 0}, {2, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{4, 0}, {5, 0}, {6, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{2, 0}, {3, 0}, {4, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 } }; const std::vector<mbgl::SymbolFeature> expected2 = { - { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}}}, aaa, {}, 0 }, - { {{}}, aaa, {}, 0 }, - { {{}}, aaa, {}, 0 } + { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 } }; mbgl::util::mergeLines(input2); @@ -57,15 +57,15 @@ TEST(MergeLines, BothEnds) { TEST(MergeLines, CircularLines) { // mergeLines handles circular lines std::vector<mbgl::SymbolFeature> input3 = { - { {{{0, 0}, {1, 0}, {2, 0}}}, aaa, {}, 0 }, - { {{{2, 0}, {3, 0}, {4, 0}}}, aaa, {}, 0 }, - { {{{4, 0}, {0, 0}}}, aaa, {}, 0 } + { {{{0, 0}, {1, 0}, {2, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{2, 0}, {3, 0}, {4, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{{4, 0}, {0, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 } }; const std::vector<mbgl::SymbolFeature> expected3 = { - { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {0, 0}}}, aaa, {}, 0 }, - { {{}}, aaa, {}, 0 }, - { {{}}, aaa, {}, 0 } + { {{{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {0, 0}}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 }, + { {{}}, aaa, mbgl::WritingDirection::LeftToRight, {}, 0 } }; mbgl::util::mergeLines(input3); |