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

fix paths for font_registration_test.cpp - refs #2787

Browse source
This commit is contained in:
Dane Springmeyer 2015-04-30 07:12:30 -07:00
parent ad2e8afb55
commit 77d9c886a2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/standalone/font_registration_test.cpp
View file

@ -86,12 +86,12 @@ SECTION("registration") {
REQUIRE( mapnik::freetype_engine::face_names().size() == 0 ); REQUIRE( mapnik::freetype_engine::face_names().size() == 0 );
// bogus, emtpy file that looks like font // bogus, emtpy file that looks like font
REQUIRE( mapnik::freetype_engine::register_font("test-data/fonts/fake.ttf") == false ); REQUIRE( mapnik::freetype_engine::register_font("test/data/fonts/fake.ttf") == false );
REQUIRE( mapnik::freetype_engine::register_fonts("test-data/fonts/fake.ttf") == false ); REQUIRE( mapnik::freetype_engine::register_fonts("test/data/fonts/fake.ttf") == false );
REQUIRE( mapnik::freetype_engine::face_names().size() == 0 ); REQUIRE( mapnik::freetype_engine::face_names().size() == 0 );
REQUIRE( mapnik::freetype_engine::register_font("test-data/fonts/intentionally-broken.ttf") == false ); REQUIRE( mapnik::freetype_engine::register_font("test/data/fonts/intentionally-broken.ttf") == false );
REQUIRE( mapnik::freetype_engine::register_fonts("test-data/fonts/intentionally-broken.ttf") == false ); REQUIRE( mapnik::freetype_engine::register_fonts("test/data/fonts/intentionally-broken.ttf") == false );
REQUIRE( mapnik::freetype_engine::face_names().size() == 0 ); REQUIRE( mapnik::freetype_engine::face_names().size() == 0 );
// now restore the original severity // now restore the original severity
@ -109,7 +109,7 @@ SECTION("registration") {
REQUIRE( face_names.size() == 1 ); REQUIRE( face_names.size() == 1 );
// single dejavu font in separate location // single dejavu font in separate location
std::string dejavu_bold_oblique("test-data/fonts/DejaVuSansMono-BoldOblique.ttf"); std::string dejavu_bold_oblique("test/data/fonts/DejaVuSansMono-BoldOblique.ttf");
REQUIRE( mapnik::freetype_engine::register_font(dejavu_bold_oblique) ); REQUIRE( mapnik::freetype_engine::register_font(dejavu_bold_oblique) );
face_names = mapnik::freetype_engine::face_names(); face_names = mapnik::freetype_engine::face_names();
REQUIRE( face_names.size() == 2 ); REQUIRE( face_names.size() == 2 );
@ -164,7 +164,7 @@ SECTION("registration") {
// check that we can correctly read a .ttc containing // check that we can correctly read a .ttc containing
// multiple valid faces // multiple valid faces
// https://github.com/mapnik/mapnik/issues/2274 // https://github.com/mapnik/mapnik/issues/2274
REQUIRE( mapnik::freetype_engine::register_font("test-data/fonts/NotoSans-Regular.ttc") ); REQUIRE( mapnik::freetype_engine::register_font("test/data/fonts/NotoSans-Regular.ttc") );
face_names = mapnik::freetype_engine::face_names(); face_names = mapnik::freetype_engine::face_names();
REQUIRE( face_names.size() == 24 ); REQUIRE( face_names.size() == 24 );