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

refactor to make it easier to run multiple tests

Browse source
This commit is contained in:
artemp 2017-02-21 12:43:54 +01:00
parent 745c291b1a
commit 677ed0ebab
1 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,41 @@
#include <mapnik/text/font_library.hpp>
#include <mapnik/unicode.hpp>
namespace {
void test_shaping( mapnik::font_set const& fontset, mapnik::face_manager& fm,
std::vector<std::tuple<unsigned, unsigned>> const& expected, char const* str)
{
mapnik::transcoder tr("utf8");
std::map<unsigned,double> width_map;
mapnik::text_itemizer itemizer;
auto props = std::make_unique<mapnik::detail::evaluated_format_properties>();
props->fontset = fontset;
props->text_size = 32;
double scale_factor = 1;
auto ustr = tr.transcode(str);
auto length = ustr.length();
itemizer.add_text(ustr, props);
mapnik::text_line line(0, length);
mapnik::harfbuzz_shaper::shape_text(line, itemizer,
width_map,
fm,
scale_factor);
std::size_t index = 0;
for (auto const& g : line)
{
unsigned glyph_index, char_index;
CHECK(index < expected.size());
std::tie(glyph_index, char_index) = expected[index++];
REQUIRE(glyph_index == g.glyph_index);
REQUIRE(char_index == g.char_index);
}
}
}
TEST_CASE("shaping")
{
mapnik::freetype_engine::register_font("test/data/fonts/NotoSans-Regular.ttc");
@ -13,54 +48,26 @@ TEST_CASE("shaping")
{
fontset.add_face_name(name);
}
mapnik::transcoder tr("utf8");
std::map<unsigned,double> width_map;
double scale_factor = 1;
mapnik::font_library fl;
mapnik::freetype_engine::font_file_mapping_type font_file_mapping;
mapnik::freetype_engine::font_memory_cache_type font_memory_cache;
mapnik::face_manager fm(fl, font_file_mapping, font_memory_cache);
mapnik::text_itemizer itemizer;
auto props = std::make_unique<mapnik::detail::evaluated_format_properties>();
props->fontset = fontset;
props->text_size = 64;
std::vector<std::tuple<unsigned, unsigned>> expected =
{{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 ^^^
//std::vector<std::tuple<unsigned, unsigned>> expected =
// {{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 "NotoSansTibetan-Regular.ttf is registered^^
auto ustr = tr.transcode("སྤུ་ཧྲེང (abc)");
auto length = ustr.length();
itemizer.add_text(ustr, props);
{
std::vector<std::tuple<unsigned, unsigned>> expected =
{{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 ^^^
//std::vector<std::tuple<unsigned, unsigned>> expected =
// {{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 "NotoSansTibetan-Regular.ttf is registered^^
test_shaping(fontset, fm, expected, "སྤུ་ཧྲེང (abc)");
}
{
mapnik::text_line line(0, length);
mapnik::harfbuzz_shaper::shape_text(line, itemizer,
width_map,
fm,
scale_factor);
std::size_t index = 0;
for (auto const& g : line)
{
unsigned glyph_index, char_index;
std::tie(glyph_index, char_index) = expected[index++];
REQUIRE(glyph_index == g.glyph_index);
REQUIRE(char_index == g.char_index);
}
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}};
test_shaping(fontset, fm, expected, "སྤུ་ཧྲེང (普兰镇)");
}
#if 0
{
mapnik::text_line line(0, length);
mapnik::icu_shaper::shape_text(line,itemizer,
width_map,
fm,
scale_factor);
}
#endif
}