Merge branch 'stylesource' into fuzz-pipe

4 files changed, 23 insertions, 5 deletions

diff --git a/test/fixtures/fixture_log.cpp b/test/fixtures/fixture_log.cpp
index d260927b5e..159f927e29 100644
--- a/test/fixtures/fixture_log.cpp
+++ b/test/fixtures/fixture_log.cpp
@@ -4,6 +4,10 @@
 
 namespace llmr {
 
+FixtureLogBackend::~FixtureLogBackend() {
+    std::cerr << unchecked();
+}
+
 size_t FixtureLogBackend::count(const LogMessage &message) const {
     size_t count = 0;
     for (const LogMessage &msg : messages) {
diff --git a/test/fixtures/fixture_log.hpp b/test/fixtures/fixture_log.hpp
index befba8b2c7..8a41241858 100644
--- a/test/fixtures/fixture_log.hpp
+++ b/test/fixtures/fixture_log.hpp
@@ -6,6 +6,7 @@
 #include <boost/optional.hpp>
 
 #include <vector>
+#include <cstdarg>
 
 namespace llmr {
 
@@ -36,12 +37,24 @@ public:
         mutable bool checked = false;
     };
 
-    inline ~FixtureLogBackend() = default;
+    ~FixtureLogBackend();
 
     void record(EventSeverity severity, Event event, const std::string &msg) {
         messages.emplace_back(severity, event, msg);
     }
 
+    void record(EventSeverity severity, Event event, const char* format, ...) {
+        va_list args;
+        va_start(args, format);
+        const size_t len = vsnprintf(NULL, 0, format, args);
+        va_end(args);
+        std::unique_ptr<char[]> buffer(new char[len + 1]);
+        va_start(args, format);
+        vsnprintf(buffer.get(), len + 1, format, args);
+        va_end(args);
+        messages.emplace_back(severity, event, std::string { buffer.get(), len });
+    }
+
     void record(EventSeverity severity, Event event, int64_t code) {
         messages.emplace_back(severity, event, code);
     }
diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp
index c2e209bc61..b106dfe306 100644
--- a/test/fixtures/fixture_request.cpp
+++ b/test/fixtures/fixture_request.cpp
@@ -54,7 +54,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;
     }
@@ -72,7 +72,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;
     }
@@ -84,14 +84,13 @@ 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;
     }
 
     req->res->body.swap(body);
     req->res->code = 200;
-    // fprintf(stderr, "[INFO] fixture request completed: %s\n", clean_url.c_str());
     Log::Info(Event::HttpRequest, 200, url);
     req->complete();
 
diff --git a/test/headless.cpp b/test/headless.cpp
index fac38f9fdc..523f66d0d2 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -35,6 +35,8 @@ TEST_P(HeadlessTest, render) {
     ASSERT_EQ(false, doc.HasParseError());
     ASSERT_EQ(true, doc.IsObject());
 
+    Log::Set<FixtureLogBackend>();
+
     // Setup OpenGL
     HeadlessView view;
     Map map(view);