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

[test][windows] use utf8 encoding + stop using non-portable path comparison

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-12 08:59:54 -08:00
parent 632dd7e76d
commit 2204a983c6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/unit/datasource/csv.cpp
View file

@ -189,7 +189,7 @@ TEST_CASE("csv") {
int ret_posix = (ret >> 8) & 0x000000ff; int ret_posix = (ret >> 8) & 0x000000ff;
INFO(ret); INFO(ret);
INFO(ret_posix); INFO(ret_posix);
if (path != "test/data/csv/more_headers_than_column_values.csv") // mapnik-index won't create *.index for 0 features if (!boost::iends_with(path,"more_headers_than_column_values.csv")) // mapnik-index won't create *.index for 0 features
{ {
CHECK(mapnik::util::exists(path + ".index")); CHECK(mapnik::util::exists(path + ".index"));
} }
@ -878,7 +878,8 @@ TEST_CASE("csv") {
REQUIRE(bool(feature)); REQUIRE(bool(feature));
REQUIRE(feature->has_key("Name")); REQUIRE(feature->has_key("Name"));
std::string utf8; std::string utf8;
ustring expected_string(name.c_str()); mapnik::transcoder tr("utf-8");
ustring expected_string = tr.transcode(name.c_str());
mapnik::value val(expected_string); mapnik::value val(expected_string);
mapnik::to_utf8(expected_string,utf8); mapnik::to_utf8(expected_string,utf8);
INFO(feature->get("Name")); INFO(feature->get("Name"));