Merge branch 'stylesource' into fuzz-pipe

10 files changed, 228 insertions, 16 deletions

diff --git a/test/fixtures/fixture_log.cpp b/test/fixtures/fixture_log.cpp
new file mode 100644
index 0000000000..d260927b5e
--- /dev/null
+++ b/test/fixtures/fixture_log.cpp
@@ -0,0 +1,42 @@
+#include "fixture_log.hpp"
+
+#include <iostream>
+
+namespace llmr {
+
+size_t FixtureLogBackend::count(const LogMessage &message) const {
+    size_t count = 0;
+    for (const LogMessage &msg : messages) {
+        if (msg == message) {
+            count++;
+            msg.checked = true;
+        }
+    }
+    return count;
+}
+
+std::vector<FixtureLogBackend::LogMessage> FixtureLogBackend::unchecked() const {
+    std::vector<LogMessage> unchecked;
+    for (const LogMessage &msg : messages) {
+        if (!msg.checked) {
+            unchecked.push_back(msg);
+        }
+    }
+    return unchecked;
+}
+
+::std::ostream& operator<<(::std::ostream& os, const std::vector<FixtureLogBackend::LogMessage>& messages) {
+    for (const FixtureLogBackend::LogMessage &message : messages) {
+        os << "- " << message;
+    }
+    return os;
+}
+
+::std::ostream& operator<<(::std::ostream& os, const FixtureLogBackend::LogMessage& message) {
+    os << "[\"" << message.severity.get() << "\", \"" << message.event.get();
+    if (message.code) os << "\", " << message.code.get();
+    if (message.msg) os << ", \"" << message.msg.get();
+    return os << "\"]" << std::endl;
+}
+
+}
\ No newline at end of file
diff --git a/test/fixtures/fixture_log.hpp b/test/fixtures/fixture_log.hpp
new file mode 100644
index 0000000000..befba8b2c7
--- /dev/null
+++ b/test/fixtures/fixture_log.hpp
@@ -0,0 +1,66 @@
+#ifndef LLMR_TEST_FIXTURE_LOG
+#define LLMR_TEST_FIXTURE_LOG
+
+#include <llmr/platform/log.hpp>
+
+#include <boost/optional.hpp>
+
+#include <vector>
+
+namespace llmr {
+
+class FixtureLogBackend : public LogBackend {
+public:
+    struct LogMessage {
+        inline LogMessage(EventSeverity severity, Event event, int64_t code, const std::string &msg)
+            : severity(severity), event(event), code(code), msg(msg) {}
+        inline LogMessage(EventSeverity severity, Event event, int64_t code)
+            : severity(severity), event(event), code(code) {}
+        inline LogMessage(EventSeverity severity, Event event, const std::string &msg)
+            : severity(severity), event(event), msg(msg) {}
+        inline LogMessage(EventSeverity severity, Event event)
+            : severity(severity), event(event) {}
+
+        inline bool operator==(const LogMessage &rhs) const {
+            return (!severity || !rhs.severity || severity.get() == rhs.severity.get()) &&
+                   (!event || !rhs.event || event.get() == rhs.event.get()) &&
+                   (!code || !rhs.code || code.get() == rhs.code.get()) &&
+                   (!msg || !rhs.msg || msg.get() == rhs.msg.get());
+        }
+
+        const boost::optional<EventSeverity> severity;
+        const boost::optional<Event> event;
+        const boost::optional<int64_t> code;
+        const boost::optional<std::string> msg;
+
+        mutable bool checked = false;
+    };
+
+    inline ~FixtureLogBackend() = default;
+
+    void record(EventSeverity severity, Event event, const std::string &msg) {
+        messages.emplace_back(severity, event, msg);
+    }
+
+    void record(EventSeverity severity, Event event, int64_t code) {
+        messages.emplace_back(severity, event, code);
+    }
+
+    void record(EventSeverity severity, Event event, int64_t code, const std::string &msg) {
+        messages.emplace_back(severity, event, code, msg);
+    }
+
+    size_t count(const LogMessage &message) const;
+    std::vector<LogMessage> unchecked() const;
+
+public:
+    std::vector<LogMessage> messages;
+};
+
+::std::ostream& operator<<(::std::ostream& os, const std::vector<FixtureLogBackend::LogMessage>& messages);
+::std::ostream& operator<<(::std::ostream& os, const FixtureLogBackend::LogMessage& message);
+
+
+}
+
+#endif
diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp
index 8bf1e282b5..c2e209bc61 100644
--- a/test/fixtures/fixture_request.cpp
+++ b/test/fixtures/fixture_request.cpp
@@ -1,6 +1,7 @@
 #include <llmr/platform/platform.hpp>
 #include <llmr/platform/request.hpp>
 #include <llmr/util/uv.hpp>
+#include <llmr/platform/log.hpp>
 
 const std::string base_directory = []{
     std::string fn = __FILE__;
@@ -40,7 +41,7 @@ platform::request_http(const std::string &url,
     if (err < 0) {
         req->res->code = err;
         req->res->error_message = uv_strerror(err);
-        fprintf(stderr, "[WARNING] fixture request: %s\n", uv_strerror(err));
+        Log::Warning(Event::HttpRequest, err, url + ": " + uv_strerror(err));
         req->complete();
         return req;
     }
@@ -90,7 +91,8 @@ platform::request_http(const std::string &url,
 
     req->res->body.swap(body);
     req->res->code = 200;
-    fprintf(stderr, "[INFO] fixture request completed: %s\n", clean_url.c_str());
+    // fprintf(stderr, "[INFO] fixture request completed: %s\n", clean_url.c_str());
+    Log::Info(Event::HttpRequest, 200, url);
     req->complete();
 
     return req;
diff --git a/test/fixtures/styles/line-color.info.json b/test/fixtures/styles/line-color.info.json
index 03e33581dc..d9be88b102 100644
--- a/test/fixtures/styles/line-color.info.json
+++ b/test/fixtures/styles/line-color.info.json
@@ -2,12 +2,26 @@
     "default": {
         "zoom": 14,
         "center": [52.499167, 13.418056],
-        "height": 256
+        "height": 256,
+        "log": [
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5375.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5375.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5374.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5374.vector.pbf"],
+            [4, "INFO", "HttpRequest"]
+        ]
     },
     "colored": {
         "zoom": 14,
         "center": [52.499167, 13.418056],
         "height": 256,
-        "classes": ["colored"]
+        "classes": ["colored"],
+        "log": [
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5375.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5375.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5374.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5374.vector.pbf"],
+            [4, "INFO", "HttpRequest"]
+        ]
     }
 }
diff --git a/test/fixtures/styles/road-width.info.json b/test/fixtures/styles/road-width.info.json
index 0c7033e4e4..0094f715ca 100644
--- a/test/fixtures/styles/road-width.info.json
+++ b/test/fixtures/styles/road-width.info.json
@@ -2,21 +2,44 @@
     "z13.9": {
         "zoom": 13.9,
         "center": [52.499167, 13.418056],
-        "height": 256
+        "height": 256,
+        "log": [
+            [1, "INFO", "HttpRequest", 200, "tiles/13-4401-2687.vector.pbf"],
+            [1, "INFO", "HttpRequest"]
+        ]
     },
     "z14.0": {
         "zoom": 14,
         "center": [52.499167, 13.418056],
-        "height": 256
+        "height": 256,
+        "log": [
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5375.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5375.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5374.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5374.vector.pbf"],
+            [4, "INFO", "HttpRequest"]
+        ]
     },
     "z14.1": {
         "zoom": 14.1,
         "center": [52.499167, 13.418056],
-        "height": 256
+        "height": 256,
+        "log": [
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5375.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5375.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5374.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5374.vector.pbf"],
+            [4, "INFO", "HttpRequest"]
+        ]
     },
     "z14.2": {
         "zoom": 14.2,
         "center": [52.499167, 13.418056],
-        "height": 256
+        "height": 256,
+        "log": [
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8803-5374.vector.pbf"],
+            [1, "INFO", "HttpRequest", 200, "tiles/14-8802-5374.vector.pbf"],
+            [2, "INFO", "HttpRequest"]
+        ]
     }
 }
diff --git a/test/fixtures/styles/world-aa.info.json b/test/fixtures/styles/world-aa.info.json
index 3a61efdd19..e5e123dcef 100644
--- a/test/fixtures/styles/world-aa.info.json
+++ b/test/fixtures/styles/world-aa.info.json
@@ -1,6 +1,9 @@
 {
     "plain": {
         "center": [0, 0],
-        "zoom": 0
+        "zoom": 0,
+        "log": [
+            [ 1, "INFO", "HttpRequest", 200, "tiles/0-0-0.vector.pbf" ]
+        ]
     }
 }
diff --git a/test/fixtures/styles/world-no-aa.info.json b/test/fixtures/styles/world-no-aa.info.json
index 3a61efdd19..f5bc0c1462 100644
--- a/test/fixtures/styles/world-no-aa.info.json
+++ b/test/fixtures/styles/world-no-aa.info.json
@@ -1,6 +1,10 @@
 {
     "plain": {
         "center": [0, 0],
-        "zoom": 0
+        "zoom": 0,
+        "log": [
+            [1, "INFO", "HttpRequest", 200, "tiles/0-0-0.vector.pbf"],
+            [1, "INFO", "HttpRequest"]
+        ]
     }
 }
diff --git a/test/fixtures/tiles/13-4401-2687.vector.pbf b/test/fixtures/tiles/13-4401-2687.vector.pbf
new file mode 100644
index 0000000000..f2165b8fe5
--- /dev/null
+++ b/test/fixtures/tiles/13-4401-2687.vector.pbf
diff --git a/test/headless.cpp b/test/headless.cpp
index 97a5e581a3..fac38f9fdc 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -9,6 +9,8 @@
 
 #include "../common/headless_view.hpp"
 
+#include "./fixtures/fixture_log.hpp"
+
 #include <dirent.h>
 
 const std::string base_directory = []{
@@ -20,10 +22,12 @@ const std::string base_directory = []{
 class HeadlessTest : public ::testing::TestWithParam<std::string> {};
 
 TEST_P(HeadlessTest, render) {
+    using namespace llmr;
+
     const std::string &base = GetParam();
 
-    const std::string style = llmr::util::read_file(base_directory + "/" + base + ".style.json");
-    const std::string info = llmr::util::read_file(base_directory + "/" + base + ".info.json");
+    const std::string style = util::read_file(base_directory + "/" + base + ".style.json");
+    const std::string info = util::read_file(base_directory + "/" + base + ".info.json");
 
     // Parse settings.
     rapidjson::Document doc;
@@ -32,10 +36,12 @@ TEST_P(HeadlessTest, render) {
     ASSERT_EQ(true, doc.IsObject());
 
     // Setup OpenGL
-    llmr::HeadlessView view;
-    llmr::Map map(view);
+    HeadlessView view;
+    Map map(view);
 
     for (auto it = doc.MemberBegin(), end = doc.MemberEnd(); it != end; it++) {
+        const FixtureLogBackend &log = Log::Set<FixtureLogBackend>();
+
         const std::string name { it->name.GetString(), it->name.GetStringLength() };
         const rapidjson::Value &value = it->value;
         ASSERT_EQ(true, value.IsObject());
@@ -74,8 +80,58 @@ TEST_P(HeadlessTest, render) {
         const std::unique_ptr<uint32_t[]> pixels(new uint32_t[width * height]);
         glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels.get());
 
-        const std::string image = llmr::util::compress_png(width, height, pixels.get(), true);
-        llmr::util::write_file(actual_image, image);
+        const std::string image = util::compress_png(width, height, pixels.get(), true);
+        util::write_file(actual_image, image);
+
+        if (value.HasMember("log")) {
+            const rapidjson::Value &js_log = value["log"];
+            ASSERT_EQ(true, js_log.IsArray());
+            for (rapidjson::SizeType i = 0; i < js_log.Size(); i++) {
+                const rapidjson::Value &js_entry = js_log[i];
+                ASSERT_EQ(true, js_entry.IsArray());
+                if (js_entry.Size() == 5) {
+                    const uint32_t count = js_entry[rapidjson::SizeType(0)].GetUint();
+                    const FixtureLogBackend::LogMessage message {
+                        parseEventSeverity(js_entry[rapidjson::SizeType(1)].GetString()),
+                        parseEvent(js_entry[rapidjson::SizeType(2)].GetString()),
+                        js_entry[rapidjson::SizeType(3)].GetInt64(),
+                        js_entry[rapidjson::SizeType(4)].GetString()
+                    };
+                    ASSERT_EQ(count, log.count(message)) << "Message: " << message << "Full Log: " << std::endl << log.messages;
+                } else if (js_entry.Size() == 4) {
+                    const uint32_t count = js_entry[rapidjson::SizeType(0)].GetUint();
+                    if (js_entry[rapidjson::SizeType(3)].IsString()) {
+                        const FixtureLogBackend::LogMessage message {
+                            parseEventSeverity(js_entry[rapidjson::SizeType(1)].GetString()),
+                            parseEvent(js_entry[rapidjson::SizeType(2)].GetString()),
+                            js_entry[rapidjson::SizeType(3)].GetString()
+                        };
+                        ASSERT_EQ(count, log.count(message)) << "Message: " << message << "Full Log: " << std::endl << log.messages;
+                    } else {
+                        const FixtureLogBackend::LogMessage message {
+                            parseEventSeverity(js_entry[rapidjson::SizeType(1)].GetString()),
+                            parseEvent(js_entry[rapidjson::SizeType(2)].GetString()),
+                             js_entry[rapidjson::SizeType(3)].GetInt64()
+                        };
+                        ASSERT_EQ(count, log.count(message)) << "Message: " << message << "Full Log: " << std::endl << log.messages;
+                    }
+                } else if (js_entry.Size() == 3) {
+                    const uint32_t count = js_entry[rapidjson::SizeType(0)].GetUint();
+                    const FixtureLogBackend::LogMessage message {
+                        parseEventSeverity(js_entry[rapidjson::SizeType(1)].GetString()),
+                        parseEvent(js_entry[rapidjson::SizeType(2)].GetString())
+                    };
+                    ASSERT_EQ(count, log.count(message)) << "Message: " << message << "Full Log: " << std::endl << log.messages;
+                } else {
+                    FAIL();
+                }
+            }
+        }
+
+        const auto &unchecked = log.unchecked();
+        if (unchecked.size()) {
+            std::cerr << "Unchecked Log Messages (" << base << "/" << name << "): " << std::endl << unchecked;
+        }
     }
 
 }
diff --git a/test/test.gyp b/test/test.gyp
index 1dce410533..477413027b 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -167,6 +167,8 @@
             "../common/headless_view.hpp",
             "../common/headless_view.cpp",
             "./fixtures/fixture_request.cpp",
+            "./fixtures/fixture_log.hpp",
+            "./fixtures/fixture_log.cpp",
         ],
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",