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

Merge branch 'master' into large_csv

Browse source
This commit is contained in:
artemp 2015-08-19 12:02:50 +02:00
commit 153c93d345
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/data

@ -1 +1 @@
Subproject commit 8168048ec719219f154cde0a8bc7517264828324
Subproject commit cb1e7f2ed8f2482bf8fb370981ec450922fa36de

4
test/unit/svg/svg_parser_test.cpp
View file

@ -163,11 +163,10 @@ TEST_CASE("SVG parser") {
svg_path_adapter svg_path(stl_storage);
svg_converter_type svg(svg_path, path.attributes());
svg_parser p(svg);
if (!p.parse_from_string(svg_str))
{
auto const& errors = p.error_messages();
REQUIRE(errors.size() == 14);
REQUIRE(errors.size() == 13);
REQUIRE(errors[0] == "parse_rect: Invalid width");
REQUIRE(errors[1] == "Failed to parse double: \"FAIL\"");
REQUIRE(errors[2] == "parse_rect: Invalid height");
@ -181,7 +180,6 @@ TEST_CASE("SVG parser") {
REQUIRE(errors[10] == "Failed to parse <polyline> 'points'");
REQUIRE(errors[11] == "parse_ellipse: Invalid rx");
REQUIRE(errors[12] == "parse_ellipse: Invalid ry");
REQUIRE(errors[13] == "parse_rect: Invalid height");
}
}