From 9eadd48d7b588d01f6bd115bd305332d68437f15 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 22 Jul 2015 11:52:18 +0200
Subject: [PATCH] add tests for no-existing svg file + bogus color in `fill`
 and `stroke`

---
 src/svg/svg_parser.cpp            |  1 +
 test/data                         |  2 +-
 test/unit/svg/svg_parser_test.cpp | 44 ++++++++++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/svg/svg_parser.cpp b/src/svg/svg_parser.cpp
index 72a4baebc..6fc51674d 100644
--- a/src/svg/svg_parser.cpp
+++ b/src/svg/svg_parser.cpp
@@ -109,6 +109,7 @@ mapnik::color parse_color(T & error_messages, const char* str)
     }
     catch (mapnik::config_error const& ex)
     {
+
         error_messages.emplace_back(ex.what());
     }
     return c;
diff --git a/test/data b/test/data
index d1795652a..41793d29b 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit d1795652ab1e9fce645498b94a33ca660d3650f4
+Subproject commit 41793d29ba9068e68c7ec46da3e4d5e1c2f75b1a
diff --git a/test/unit/svg/svg_parser_test.cpp b/test/unit/svg/svg_parser_test.cpp
index 6bd37bede..8ff4013bd 100644
--- a/test/unit/svg/svg_parser_test.cpp
+++ b/test/unit/svg/svg_parser_test.cpp
@@ -27,11 +27,21 @@
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/vertex.hpp>
+
+//#include <mapnik/svg/svg_path_adapter.hpp>
+//#include <mapnik/svg/svg_renderer_agg.hpp>
+//#include <mapnik/svg/svg_path_attributes.hpp>
+
+#include <mapnik/svg/svg_parser.hpp>
+#include <mapnik/svg/svg_storage.hpp>
+#include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
-#include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_attributes.hpp>
+
 #include <libxml/parser.h> // for xmlInitParser(), xmlCleanupParser()
 #include <cmath>
+#include <fstream>
+#include <streambuf>
 
 namespace detail {
 
@@ -52,6 +62,38 @@ struct vertex_equal
 TEST_CASE("SVG parser") {
 
     xmlInitParser();
+    SECTION("SVG i/o")
+    {
+        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>());
+    }
+
+    SECTION("SVG parser color <fail>")
+    {
+
+        std::string svg_name("./test/data/svg/color_fail.svg");
+        std::ifstream in(svg_name.c_str());
+        std::string svg_str((std::istreambuf_iterator<char>(in)),
+                        std::istreambuf_iterator<char>());
+
+        using namespace mapnik::svg;
+        mapnik::svg_storage_type path;
+        vertex_stl_adapter<svg_path_storage> stl_storage(path.source());
+        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))
+        {
+            for (auto const& msg : p.error_messages())
+            {
+                REQUIRE(msg == "Failed to parse color: \"fail\"");
+            }
+        }
+    }
+
     SECTION("SVG <rect>")
     {
         //<rect width="20" height="15" style="fill:rgb(0,0,255);stroke-width:1;stroke:rgb(0,0,0)" />