sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
mapnik/test/unit/svg/svg_parser_test.cpp

837 lines
40 KiB
C++
Raw Normal View History

started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
* Copyright (C) 2017 Artem Pavlenko
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#include "catch.hpp"
#include <mapnik/debug.hpp>
#include <mapnik/marker.hpp>
#include <mapnik/marker_cache.hpp>
#include <mapnik/vertex.hpp>
add tests for no-existing svg file + bogus color in `fill` and `stroke`
2015-07-22 11:52:18 +02:00
#include <mapnik/svg/svg_parser.hpp>
#include <mapnik/svg/svg_converter.hpp>
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
#include <mapnik/svg/svg_path_adapter.hpp>
#include <mapnik/svg/svg_path_attributes.hpp>
test svg - refactor common code into separate *.hpp
2016-01-21 18:14:17 +01:00
#include "util.hpp"
add tests for no-existing svg file + bogus color in `fill` and `stroke`
2015-07-22 11:52:18 +02:00
#include <fstream>
more test include gardening
2015-10-29 16:35:45 +01:00
#include <iterator>
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
namespace // internal
{
struct test_parser
{
mapnik::svg_storage_type path;
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage;
mapnik::svg::svg_path_adapter svg_path;
mapnik::svg::svg_converter_type svg;
mapnik::svg::svg_parser p;
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
explicit test_parser(bool strict = false)
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
: stl_storage(path.source())
, svg_path(stl_storage)
, svg(svg_path, path.attributes())
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
, p(svg, strict)
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
{}
mapnik::svg::svg_parser* operator->()
{
return &p;
}
};
template <typename C>
std::string join(C const& container)
{
std::string result;
for (auto const& str : container)
{
if (!result.empty()) result += "\n ";
result += str;
}
return result;
}
}
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
TEST_CASE("SVG parser") {
add tests for no-existing svg file + bogus color in `fill` and `stroke`
2015-07-22 11:52:18 +02:00
SECTION("SVG i/o")
{
Updated SVG unit test so that it no longer writes to std err. closes #3007
2015-07-31 19:31:54 +02:00
mapnik::logger::instance().set_severity(mapnik::logger::none);
add tests for no-existing svg file + bogus color in `fill` and `stroke`
2015-07-22 11:52:18 +02:00
std::string svg_name("FAIL");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_null>());
Updated SVG unit test so that it no longer writes to std err. closes #3007
2015-07-31 19:31:54 +02:00
mapnik::logger::instance().set_severity(mapnik::logger::error);
add tests for no-existing svg file + bogus color in `fill` and `stroke`
2015-07-22 11:52:18 +02:00
}
Adding percentage for linear gradient
2015-07-30 23:35:30 +02:00
SECTION("SVG::parse i/o")
{
std::string svg_name("FAIL");
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
char const* expected_errors[] =
Adding percentage for linear gradient
2015-07-30 23:35:30 +02:00
{
adapt to spelling fix in svg tests
2017-09-10 19:21:39 +02:00
"SVG error: unable to open \"FAIL\""
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
};
test_parser p;
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
try
{
p->parse(svg_name);
}
catch (std::exception const& ex)
{
REQUIRE(ex.what() == join(expected_errors));
}
Adding percentage for linear gradient
2015-07-30 23:35:30 +02:00
}
SECTION("SVG::parse_from_string syntax error")
Adding tests for radial gradients with percentages
2015-07-30 22:40:34 +02:00
{
std::string svg_name("./test/data/svg/invalid.svg");
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
char const* expected_errors[] =
{
svg-parser - unify error messages text + update unit test
2017-08-08 13:38:24 +02:00
"SVG error: unable to parse \"<?xml version=\"1.0\"?>\n<svg width=\"12cm\" height=\"4cm\" viewBox=\"0 0 1200 400\"\nxmlns=\"http://www.w3.org/2000/svg\" version=\"1.2\" baseProfile=\"tiny\">\n\""
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
};
Adding tests for radial gradients with percentages
2015-07-30 22:40:34 +02:00
std::ifstream in(svg_name.c_str());
std::string svg_str((std::istreambuf_iterator<char>(in)),
std::istreambuf_iterator<char>());
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
test_parser p;
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
try
{
p->parse_from_string(svg_str);
}
catch (std::exception const& ex)
{
REQUIRE(ex.what() == join(expected_errors));
}
Adding tests for radial gradients with percentages
2015-07-30 22:40:34 +02:00
}
Adding percentage for linear gradient
2015-07-30 23:35:30 +02:00
SECTION("SVG::parse_from_string syntax error")
{
std::string svg_name("./test/data/svg/invalid.svg");
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
char const* expected_errors[] =
Adding percentage for linear gradient
2015-07-30 23:35:30 +02:00
{
svg-parser - unify error messages text + update unit test
2017-08-08 13:38:24 +02:00
"SVG error: unable to parse \"./test/data/svg/invalid.svg\""
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
};
test_parser p;
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
try
{
p->parse(svg_name);
}
catch (std::exception const& ex)
{
REQUIRE(ex.what() == join(expected_errors));
}
Adding percentage for linear gradient
2015-07-30 23:35:30 +02:00
}
add tests for no-existing svg file + bogus color in `fill` and `stroke`
2015-07-22 11:52:18 +02:00
SECTION("SVG parser color <fail>")
{
std::string svg_name("./test/data/svg/color_fail.svg");
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
char const* expected_errors[] =
{
svg-parser - unify error messages text + update unit test
2017-08-08 13:38:24 +02:00
"SVG parse error: failed to parse <color> with value \"fail\"",
"SVG parse error: failed to parse <number> with value \"fail\"",
"SVG parse error: failed to parse <color> with value \"fail\""
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
};
add tests for no-existing svg file + bogus color in `fill` and `stroke`
2015-07-22 11:52:18 +02:00
std::ifstream in(svg_name.c_str());
std::string svg_str((std::istreambuf_iterator<char>(in)),
std::istreambuf_iterator<char>());
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
{
test_parser p;
p->parse_from_string(svg_str);
REQUIRE(join(p->err_handler().error_messages()) == join(expected_errors));
}
{
test_parser p(true);
try
{
p->parse_from_string(svg_str);
}
catch (std::exception const& ex)
{
REQUIRE(ex.what() == std::string(expected_errors[0]));
}
}
add tests for no-existing svg file + bogus color in `fill` and `stroke`
2015-07-22 11:52:18 +02:00
}
unit test - cope with incorrectly encoded geometries
2015-07-29 15:42:53 +02:00
SECTION("SVG - cope with erroneous geometries")
{
std::string svg_name("./test/data/svg/errors.svg");
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
char const* expected_errors[] =
{
svg-parser - unify error messages text + update unit test
2017-08-08 13:38:24 +02:00
"SVG validation error: invalid <rect> width \"-100\"",
"SVG parse error: failed to parse <number> with value \"FAIL\"",
"SVG validation error: invalid <rect> height \"-100\"",
"SVG validation error: invalid <rect> rx \"-1000\"",
"SVG validation error: invalid <rect> ry \"-1000\"",
"SVG parse error: failed to parse <number> with value \"100invalidunit\"",
"SVG parse error: failed to parse <path>",
"SVG parse error: failed to parse <path> with <id> \"fail-path\"",
"SVG parse error: failed to parse <path> with <id> \"fail-path\"",
"SVG validation error: invalid <circle> radius \"-50\"",
"SVG parse error: failed to parse <polygon> points",
"SVG parse error: failed to parse <polyline> points",
"SVG validation error: invalid <ellipse> rx \"-10\"",
"SVG validation error: invalid <ellipse> ry \"-10\""
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
};
unit test - cope with incorrectly encoded geometries
2015-07-29 15:42:53 +02:00
std::ifstream in(svg_name.c_str());
std::string svg_str((std::istreambuf_iterator<char>(in)),
std::istreambuf_iterator<char>());
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
{
test_parser p;
p->parse_from_string(svg_str);
REQUIRE(join(p->err_handler().error_messages()) == join(expected_errors));
}
{
// strict
test_parser p(true);
try
{
p->parse_from_string(svg_str);
}
catch (std::exception const& ex)
{
REQUIRE(ex.what() == std::string(expected_errors[0]));
}
}
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
}
SECTION("SVG parser double % <fail>")
{
std::string svg_name("./test/data/svg/gradient-radial-error.svg");
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
char const* expected_errors[] =
{
svg-parser - unify error messages text + update unit test
2017-08-08 13:38:24 +02:00
"SVG parse error: failed to parse <number> with value \"FAIL\""
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
};
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
std::ifstream in(svg_name.c_str());
std::string svg_str((std::istreambuf_iterator<char>(in)),
std::istreambuf_iterator<char>());
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
{
test_parser p;
p->parse_from_string(svg_str);
REQUIRE(join(p->err_handler().error_messages()) == join(expected_errors));
}
{
test_parser p(true);
try
{
p->parse_from_string(svg_str);
}
catch (std::exception const& ex)
{
REQUIRE(ex.what() == std::string(expected_errors[0]));
}
}
unit test - cope with incorrectly encoded geometries
2015-07-29 15:42:53 +02:00
}
add display=none test
2015-07-22 15:28:55 +02:00
SECTION("SVG parser display=none")
{
std::string svg_name("./test/data/svg/invisible.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
REQUIRE(bbox == mapnik::box2d<double>(0, 0, 1, 1));
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
REQUIRE(path.vertex(&x,&y) == mapnik::SEG_END);
}
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
SECTION("SVG parser stroke-linecap=square")
{
std::string svg_name("./test/data/svg/stroke-linecap-square.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
REQUIRE(bbox == mapnik::box2d<double>(5, 60, 220, 60));
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
auto const& attrs = storage->attributes();
agg::line_cap_e expected_cap(agg::square_cap);
REQUIRE(attrs.size() == 1 );
REQUIRE(attrs[0].line_cap == expected_cap);
double x,y;
unsigned cmd;
std::vector<std::tuple<double,double,unsigned>> vec;
while ((cmd = path.vertex(&x,&y)) != mapnik::SEG_END)
{
vec.emplace_back(x, y, cmd);
}
std::vector<std::tuple<double,double,unsigned>> expected = { std::make_tuple(5, 60, 1),
std::make_tuple(220, 60, 2) };
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin()));
}
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
SECTION("SVG <rect>")
{
//<rect width="20" height="15" style="fill:rgb(0,0,255);stroke-width:1;stroke:rgb(0,0,0)" />
std::string svg_name("./test/data/svg/rect.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
REQUIRE(bbox == mapnik::box2d<double>(0, 0, 20, 15));
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
unsigned cmd;
std::vector<std::tuple<double,double,unsigned>> vec;
while ((cmd = path.vertex(&x,&y)) != mapnik::SEG_END)
{
vec.emplace_back(x, y, cmd);
//std::cerr << x << "," << y << " cmd=" << cmd << std::endl;
}
support compilers that can't construct tuple from initializer list
2015-07-20 17:16:35 +02:00
std::vector<std::tuple<double,double,unsigned>> expected = { std::make_tuple(0, 0, 1),
std::make_tuple(20, 0, 2),
std::make_tuple(20, 15, 2),
std::make_tuple(0, 15, 2),
std::make_tuple(0, 0, 79) };
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin()));
}
SECTION("SVG rounded <rect>")
{
//<rect width="20" height="15" rx="5" ry="10" style="fill:rgb(0,0,255);stroke-width:1;stroke:rgb(0,0,0)" />
std::string svg_name("./test/data/svg/rounded_rect.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
REQUIRE(bbox == mapnik::box2d<double>(0, 0, 20, 15));
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
unsigned cmd;
std::vector<std::tuple<double,double,unsigned>> vec;
while ((cmd = path.vertex(&x,&y)) != mapnik::SEG_END)
{
vec.emplace_back(x, y, cmd);
}
support compilers that can't construct tuple from initializer list
2015-07-20 17:16:35 +02:00
std::vector<std::tuple<double,double,unsigned>> expected = {std::make_tuple(0, 5,1),
std::make_tuple(0.481856, 2.85842,2),
std::make_tuple(1.83455, 1.12961,2),
std::make_tuple(3.79736, 0.146789,2),
std::make_tuple(5, 0,2),
std::make_tuple(15, 0,2),
std::make_tuple(17.1416, 0.481856,2),
std::make_tuple(18.8704, 1.83455,2),
std::make_tuple(19.8532, 3.79736,2),
std::make_tuple(20, 5,2),
std::make_tuple(20, 10,2),
std::make_tuple(19.5181, 12.1416,2),
std::make_tuple(18.1654, 13.8704,2),
std::make_tuple(16.2026, 14.8532,2),
std::make_tuple(15, 15,2),
std::make_tuple(5, 15,2),
std::make_tuple(2.85842, 14.5181,2),
std::make_tuple(1.12961, 13.1654,2),
std::make_tuple(0.146789, 11.2026,2),
std::make_tuple(0, 10,2),
std::make_tuple(0, 10,95)};
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
minor unit test cleanups to prepare to test amalgamation
2016-03-03 19:53:58 +01:00
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(),vertex_equal<3>()));
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
}
Add viewbox fallback logic for dimension parsing SVG's now have fallback on viewbox. Still debugging the boost Qi parser
2015-09-23 22:39:02 +02:00
SECTION("SVG viewbox fallback")
{
std::string svg_name("./test/data/svg/viewbox-missing-width-and-height.svg");
std::ifstream in(svg_name.c_str());
std::string svg_str((std::istreambuf_iterator<char>(in)),
std::istreambuf_iterator<char>());
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
test_parser p;
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
p->parse_from_string(svg_str);
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
auto width = p.svg.width();
auto height = p.svg.height();
Add viewbox fallback logic for dimension parsing SVG's now have fallback on viewbox. Still debugging the boost Qi parser
2015-09-23 22:39:02 +02:00
REQUIRE(width == 100);
REQUIRE(height == 100);
}
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
SECTION("SVG rounded <rect>s missing rx or ry")
{
std::string svg_name("./test/data/svg/rounded_rect-missing-one-radius.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
REQUIRE(bbox == mapnik::box2d<double>(0, 0, 20, 15));
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
unsigned cmd;
std::vector<std::tuple<double,double,unsigned>> vec;
while ((cmd = path.vertex(&x,&y)) != mapnik::SEG_END)
{
vec.emplace_back(x, y, cmd);
}
std::vector<std::tuple<double,double,unsigned>> expected = {std::make_tuple(0, 5,1),
std::make_tuple(0.481856, 2.85842,2),
std::make_tuple(1.83455, 1.12961,2),
std::make_tuple(3.79736, 0.146789,2),
std::make_tuple(5, 0,2),
std::make_tuple(15, 0,2),
std::make_tuple(17.1416, 0.481856,2),
std::make_tuple(18.8704, 1.83455,2),
std::make_tuple(19.8532, 3.79736,2),
std::make_tuple(20, 5,2),
std::make_tuple(20, 10,2),
std::make_tuple(19.5181, 12.1416,2),
std::make_tuple(18.1654, 13.8704,2),
std::make_tuple(16.2026, 14.8532,2),
std::make_tuple(15, 15,2),
std::make_tuple(5, 15,2),
std::make_tuple(2.85842, 14.5181,2),
std::make_tuple(1.12961, 13.1654,2),
std::make_tuple(0.146789, 11.2026,2),
std::make_tuple(0, 10,2),
std::make_tuple(0, 10,95)};
minor unit test cleanups to prepare to test amalgamation
2016-03-03 19:53:58 +01:00
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(),vertex_equal<3>()));
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
}
SECTION("SVG beveled <rect>")
{
std::string svg_name("./test/data/svg/stroke-linejoin-bevel.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
REQUIRE(bbox == mapnik::box2d<double>(10, 10, 30, 25));
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
auto const& attrs = storage->attributes();
agg::line_join_e expected_join(agg::bevel_join);
REQUIRE(attrs.size() == 1 );
REQUIRE(attrs[0].line_join == expected_join);
}
SVG unit test - add <line> test (http://www.w3.org/TR/SVGTiny12/shapes.html#LineElement)
2015-07-20 17:44:47 +02:00
SECTION("SVG <line>")
{
//
std::string svg_name("./test/data/svg/line.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
//REQUIRE(bbox == mapnik::box2d<double>(0.3543307086614174,0.3543307086614174,
// 424.8425196850394059,141.3779527559055396));
SVG unit test - add <line> test (http://www.w3.org/TR/SVGTiny12/shapes.html#LineElement)
2015-07-20 17:44:47 +02:00
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
unsigned cmd;
std::vector<std::tuple<double,double,unsigned>> vec;
std::size_t num_vertices = path.total_vertices();
for (std::size_t i = 0; i < num_vertices; ++i)
{
cmd = path.vertex(&x,&y);
vec.emplace_back(x, y, cmd);
}
std::vector<std::tuple<double,double,unsigned>> expected = {std::make_tuple(1, 1, 1),
std::make_tuple(1199, 1, 2),
std::make_tuple(1199, 399, 2),
std::make_tuple(1, 399, 2),
std::make_tuple(1, 1, 79),
std::make_tuple(0, 0, 0),
std::make_tuple(100, 300, 1),
std::make_tuple(300, 100, 2),
std::make_tuple(0, 0, 0),
std::make_tuple(300, 300, 1),
std::make_tuple(500, 100, 2),
std::make_tuple(0, 0, 0),
std::make_tuple(500, 300, 1),
std::make_tuple(700, 100, 2),
std::make_tuple(0, 0, 0),
std::make_tuple(700, 300, 1),
std::make_tuple(900, 100, 2),
std::make_tuple(0, 0, 0),
std::make_tuple(900, 300, 1),
std::make_tuple(1100, 100, 2)};
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin()));
}
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
SECTION("SVG <polyline>")
{
//
std::string svg_name("./test/data/svg/polyline.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
//REQUIRE(bbox == mapnik::box2d<double>(1.0,1.0,1199.0,399.0));
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
unsigned cmd;
std::vector<std::tuple<double,double,unsigned>> vec;
std::size_t num_vertices = path.total_vertices();
for (std::size_t i = 0; i < num_vertices; ++i)
{
cmd = path.vertex(&x,&y);
vec.emplace_back(x, y, cmd);
}
support compilers that can't construct tuple from initializer list
2015-07-20 17:16:35 +02:00
std::vector<std::tuple<double,double,unsigned>> expected = {std::make_tuple(1, 1, 1),
std::make_tuple(1199, 1, 2),
std::make_tuple(1199, 399, 2),
std::make_tuple(1, 399, 2),
std::make_tuple(1, 1, 79),
std::make_tuple(0, 0, 0),
std::make_tuple(50, 375, 1),
std::make_tuple(150, 375, 2),
std::make_tuple(150, 325, 2),
std::make_tuple(250, 325, 2),
std::make_tuple(250, 375, 2),
std::make_tuple(350, 375, 2),
std::make_tuple(350, 250, 2),
std::make_tuple(450, 250, 2),
std::make_tuple(450, 375, 2),
std::make_tuple(550, 375, 2),
std::make_tuple(550, 175, 2),
std::make_tuple(650, 175, 2),
std::make_tuple(650, 375, 2),
std::make_tuple(750, 375, 2),
std::make_tuple(750, 100, 2),
std::make_tuple(850, 100, 2),
std::make_tuple(850, 375, 2),
std::make_tuple(950, 375, 2),
std::make_tuple(950, 25, 2),
std::make_tuple(1050, 25, 2),
std::make_tuple(1050, 375, 2),
std::make_tuple(1150, 375, 2)};
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin()));
}
SECTION("SVG <polygon>")
{
//
std::string svg_name("./test/data/svg/polygon.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
//REQUIRE(bbox == mapnik::box2d<double>(1.0,1.0,1199.0,399.0));
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
unsigned cmd;
std::vector<std::tuple<double,double,unsigned>> vec;
std::size_t num_vertices = path.total_vertices();
for (std::size_t i = 0; i < num_vertices; ++i)
{
cmd = path.vertex(&x,&y);
vec.emplace_back(x, y, cmd);
}
support compilers that can't construct tuple from initializer list
2015-07-20 17:16:35 +02:00
std::vector<std::tuple<double,double,unsigned>> expected = {std::make_tuple(1, 1, 1),
std::make_tuple(1199, 1, 2),
std::make_tuple(1199, 399, 2),
std::make_tuple(1, 399, 2),
std::make_tuple(1, 1, 79),
std::make_tuple(0, 0, 0),
std::make_tuple(350, 75, 1),
std::make_tuple(379, 161, 2),
std::make_tuple(469, 161, 2),
std::make_tuple(397, 215, 2),
std::make_tuple(423, 301, 2),
std::make_tuple(350, 250, 2),
std::make_tuple(277, 301, 2),
std::make_tuple(303, 215, 2),
std::make_tuple(231, 161, 2),
std::make_tuple(321, 161, 2),
std::make_tuple(350, 75, 79),
std::make_tuple(0, 0, 0),
std::make_tuple(850, 75, 1),
std::make_tuple(958, 137.5, 2),
std::make_tuple(958, 262.5, 2),
std::make_tuple(850, 325, 2),
std::make_tuple(742, 262.6, 2),
std::make_tuple(742, 137.5, 2),
std::make_tuple(850, 75, 79)};
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin()));
}
SVG - add gradient test (ref #2989)
2015-07-21 10:35:21 +02:00
SECTION("SVG <gradient>")
{
//
std::string svg_name("./test/data/svg/gradient.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
//REQUIRE(bbox == mapnik::box2d<double>(1.0,1.0,799.0,599.0));
SVG - add gradient test (ref #2989)
2015-07-21 10:35:21 +02:00
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
unsigned cmd;
add missing gradient definition test
2015-07-22 16:34:28 +02:00
std::vector<std::tuple<double,double,unsigned>> vec;
std::size_t num_vertices = path.total_vertices();
for (std::size_t i = 0; i < num_vertices; ++i)
{
cmd = path.vertex(&x,&y);
vec.emplace_back(x, y, cmd);
}
std::vector<std::tuple<double,double,unsigned>> expected = {std::make_tuple(1, 1, 1),
std::make_tuple(799, 1, 2),
std::make_tuple(799, 599, 2),
std::make_tuple(1, 599, 2),
std::make_tuple(1, 1, 79),
std::make_tuple(0, 0, 0),
std::make_tuple(100, 100, 1),
std::make_tuple(700, 100, 2),
std::make_tuple(700, 300, 2),
std::make_tuple(100, 300, 2),
std::make_tuple(100, 100, 79),
std::make_tuple(0, 0, 0),
std::make_tuple(100, 320, 1),
std::make_tuple(700, 320, 2),
std::make_tuple(700, 520, 2),
std::make_tuple(100, 520, 2),
std::make_tuple(100, 320, 79)};
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin()));
}
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
add missing gradient definition test
2015-07-22 16:34:28 +02:00
SECTION("SVG missing <gradient> def")
{
std::string svg_name("./test/data/svg/gradient-nodef.svg");
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
char const* expected_errors[] =
{
svg-parser - unify error messages text + update unit test
2017-08-08 13:38:24 +02:00
"SVG parse error: failed to locate <gradient> fill with <id> \"MyGradient\"",
"SVG parse error: failed to locate <gradient> stroke with <id> \"MyGradient\""
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
};
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
{
test_parser p;
p->parse(svg_name);
REQUIRE(join(p->err_handler().error_messages()) == join(expected_errors));
}
{
test_parser p(true);
try
{
p->parse(svg_name);
}
catch (std::exception const& ex)
{
REQUIRE(ex.what() == std::string(expected_errors[0]));
}
}
SVG - add gradient test (ref #2989)
2015-07-21 10:35:21 +02:00
}
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
SECTION("SVG missing <gradient> id")
{
std::string svg_name("./test/data/svg/gradient-no-id.svg");
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
char const* expected_errors[] =
{
svg-parser - unify error messages text + update unit test
2017-08-08 13:38:24 +02:00
"SVG parse error: failed to locate <gradient> fill with <id> \"MyGradient\"",
"SVG parse error: failed to locate <gradient> stroke with <id> \"MyGradient\""
refactor svg_parser_test - moved some boilerplate to helper struct test_parser - added REQUIRE(!parse...) to parsing error tests - changed parsing error tests to compare full error lists instead of just count and then individual messages (if count was different, you were left in the dark with no messages at all) - changed some double-quotes in errors to single-quotes (corresponding change to parser follows)
2016-01-23 20:21:05 +01:00
};
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
std::ifstream in(svg_name.c_str());
std::string svg_str((std::istreambuf_iterator<char>(in)),
std::istreambuf_iterator<char>());
Enforce consistent error handling policy - always throw on fatal errors (both strict and non-strict). In `strict` mode throw on first parsing error. Remove return values from `parse`,`parse_from_string` and `traverse_tree` methods. Update unit tests.
2017-07-31 10:18:12 +02:00
{
test_parser p;
p->parse_from_string(svg_str);
REQUIRE(join(p->err_handler().error_messages()) == join(expected_errors));
}
{
test_parser p(true);
try
{
p->parse_from_string(svg_str);
}
catch (std::exception const& ex)
{
REQUIRE(ex.what() == std::string(expected_errors[0]));
}
}
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
}
fix typo
2015-07-23 15:16:08 +02:00
SECTION("SVG missing <gradient> inheritance")
add "Gradients apply to leaf nodes" test and update test data
2015-07-23 12:58:38 +02:00
{
//
std::string svg_name("./test/data/svg/gradient-inherit.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
//REQUIRE(bbox == mapnik::box2d<double>(1.0,1.0,699.0,199.0));
add "Gradients apply to leaf nodes" test and update test data
2015-07-23 12:58:38 +02:00
auto storage = svg.get_data();
REQUIRE(storage);
mapnik::svg::vertex_stl_adapter<mapnik::svg::svg_path_storage> stl_storage(storage->source());
auto const& attrs = storage->attributes();
add bogus stroke-width test
2015-07-24 11:05:58 +02:00
REQUIRE(attrs.size() == 3 );
REQUIRE(attrs[1].fill_gradient == attrs[2].fill_gradient);
add "Gradients apply to leaf nodes" test and update test data
2015-07-23 12:58:38 +02:00
mapnik::svg::svg_path_adapter path(stl_storage);
double x,y;
unsigned cmd;
std::vector<std::tuple<double,double,unsigned>> vec;
std::size_t num_vertices = path.total_vertices();
for (std::size_t i = 0; i < num_vertices; ++i)
{
cmd = path.vertex(&x,&y);
vec.emplace_back(x, y, cmd);
}
std::vector<std::tuple<double,double,unsigned>> expected = {std::make_tuple(1, 1, 1),
std::make_tuple(699, 1, 2),
std::make_tuple(699, 199, 2),
std::make_tuple(1, 199, 2),
std::make_tuple(1, 1, 79),
std::make_tuple(0, 0, 0),
std::make_tuple(100, 50, 1),
std::make_tuple(300, 50, 2),
std::make_tuple(300, 150, 2),
std::make_tuple(100, 150, 2),
std::make_tuple(100, 50, 79),
std::make_tuple(0, 0, 0),
std::make_tuple(400, 50, 1),
std::make_tuple(600, 50, 2),
std::make_tuple(600, 150, 2),
std::make_tuple(400, 150, 2),
std::make_tuple(400, 50, 79)};
REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin()));
}
SVG - add gradient test (ref #2989)
2015-07-21 10:35:21 +02:00
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
SECTION("SVG <gradient> with transformations")
{
//
std::string svg_name("./test/data/svg/gradient-transform.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
//REQUIRE(bbox == mapnik::box2d<double>(1.0,1.0,799.0,599.0));
Improving svg test coverage - refs #3005
2015-07-30 04:26:28 +02:00
auto storage = svg.get_data();
REQUIRE(storage);
auto const& attrs = storage->attributes();
REQUIRE(attrs.size() == 3 );
REQUIRE(attrs[1].fill_gradient == attrs[2].fill_gradient);
REQUIRE(attrs[1].fill_gradient.get_gradient_type() == mapnik::RADIAL);
agg::trans_affine transform;
transform *= agg::trans_affine_translation(240,155);
REQUIRE(attrs[1].fill_gradient.get_transform() == transform);
}
Adding tests for radial gradients with percentages
2015-07-30 22:40:34 +02:00
Adding test for gradient xlink:href - refs #3005
2015-07-30 18:48:23 +02:00
SECTION("SVG <gradient> with xlink:href")
{
std::string svg_name("./test/data/svg/gradient-xhref.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
//REQUIRE(bbox == mapnik::box2d<double>(20,20,460,230));
Adding test for gradient xlink:href - refs #3005
2015-07-30 18:48:23 +02:00
auto storage = svg.get_data();
REQUIRE(storage);
auto const& attrs = storage->attributes();
REQUIRE(attrs.size() == 2 );
REQUIRE(attrs[0].fill_gradient.get_gradient_type() == mapnik::LINEAR);
REQUIRE(attrs[1].fill_gradient.get_gradient_type() == mapnik::LINEAR);
REQUIRE(attrs[1].fill_gradient.has_stop());
}
Adding tests for radial gradients with percentages
2015-07-30 22:40:34 +02:00
SECTION("SVG <gradient> with radial percents")
{
std::string svg_name("./test/data/svg/gradient-radial-percents.svg");
std::shared_ptr<mapnik::marker const> marker = mapnik::marker_cache::instance().find(svg_name, false);
REQUIRE(marker);
REQUIRE(marker->is<mapnik::marker_svg>());
mapnik::marker_svg const& svg = mapnik::util::get<mapnik::marker_svg>(*marker);
auto bbox = svg.bounding_box();
port "strict" SVG parsing, support for `<use>` element and use of switch statements from https://github.com/mapnik/mapnik/tree/svg-strict-parsing
2017-06-27 11:41:26 +02:00
//REQUIRE(bbox == mapnik::box2d<double>(0,0,200,200));
Adding tests for radial gradients with percentages
2015-07-30 22:40:34 +02:00
auto storage = svg.get_data();
REQUIRE(storage);
double x1, x2, y1, y2, r;
auto const& attrs = storage->attributes();
REQUIRE(attrs.size() == 1 );
REQUIRE(attrs[0].fill_gradient.get_gradient_type() == mapnik::RADIAL);
REQUIRE(attrs[0].fill_gradient.has_stop());
attrs[0].fill_gradient.get_control_points(x1, y1, x2, y2, r);
REQUIRE(x1 == 0);
fix parse_double_optional_percent grammar and update tests
2015-07-31 11:35:02 +02:00
REQUIRE(y1 == 0.25);
REQUIRE(x2 == 0.10);
REQUIRE(y2 == 0.10);
REQUIRE(r == 0.75);
Adding tests for radial gradients with percentages
2015-07-30 22:40:34 +02:00
}
started adding svg parsing tests to increase test coverage (work-in-progress)
2015-07-20 15:41:35 +02:00
}
Reference in a new issue Copy permalink