sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify test

Browse source
This commit is contained in:
artemp 2017-02-20 14:23:09 +01:00
parent 3584970fee
commit 745c291b1a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/unit/text/shaping.cpp
View file

@ -6,8 +6,8 @@
TEST_CASE("shaping") TEST_CASE("shaping")
{ {
mapnik::freetype_engine::register_fonts("test/data/fonts/Noto");
mapnik::freetype_engine::register_font("test/data/fonts/NotoSans-Regular.ttc"); mapnik::freetype_engine::register_font("test/data/fonts/NotoSans-Regular.ttc");
mapnik::freetype_engine::register_fonts("test/data/fonts/Noto");
mapnik::font_set fontset("fontset"); mapnik::font_set fontset("fontset");
for (auto const& name : mapnik::freetype_engine::face_names()) for (auto const& name : mapnik::freetype_engine::face_names())
{ {
@ -27,13 +27,13 @@ TEST_CASE("shaping")
props->text_size = 64; props->text_size = 64;
std::vector<std::tuple<unsigned, unsigned>> expected = std::vector<std::tuple<unsigned, unsigned>> expected =
{{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {0, 10}, {0, 11}, {0, 12}, {12, 13}}; {{0, 0}, {0, 3}, {0, 4}, {0, 7}, {3, 8}, {11, 9}, {68, 10}, {69, 11}, {70, 12}, {12, 13}};
// with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^ // with default NotoSans-Regular.ttc and NotoNaskhArabic-Regular.ttf ^^^
//std::vector<std::tuple<unsigned, unsigned>> expected = //std::vector<std::tuple<unsigned, unsigned>> expected =
// {{977,0},{1094,3}{1038,4},{1168,4},{9,7},{3,8},{9,9},{20827,10},{11294,11},{42895,12},{10,13}}; // {{977,0}, {1094,3}, {1038,4}, {1168,4}, {9,7}, {3,8}, {11,9}, {68,10}, {69,11}, {70,12}, {12,13}};
// expected results if NotoSansCJKjp-Regular.otf and "NotoSansTibetan-Regular.ttf available and registered^^ // expected results if "NotoSansTibetan-Regular.ttf is registered^^
auto ustr = tr.transcode("སྤུ་ཧྲེང (普兰镇)"); auto ustr = tr.transcode("སྤུ་ཧྲེང (abc)");
auto length = ustr.length(); auto length = ustr.length();
itemizer.add_text(ustr, props); itemizer.add_text(ustr, props);
@ -49,7 +49,6 @@ TEST_CASE("shaping")
{ {
unsigned glyph_index, char_index; unsigned glyph_index, char_index;
std::tie(glyph_index, char_index) = expected[index++]; std::tie(glyph_index, char_index) = expected[index++];
//std::cerr << g.glyph_index << ":" << g.char_index << std::endl;
REQUIRE(glyph_index == g.glyph_index); REQUIRE(glyph_index == g.glyph_index);
REQUIRE(char_index == g.char_index); REQUIRE(char_index == g.char_index);
} }