Run tests using http requests

We now start a local HTTP server on port 2900 that serves the test fixtures. This is the same port we also use in the JS test suite

fixes #532

4 files changed, 51 insertions, 87 deletions

diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp
deleted file mode 100644
index cc01760ae1..0000000000
--- a/test/fixtures/fixture_request.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <mbgl/storage/http_request_baton.hpp>
-#include <mbgl/storage/file_request_baton.hpp>
-#include <mbgl/storage/response.hpp>
-#include <mbgl/util/url.hpp>
-#include <mbgl/util/std.hpp>
-#include <mbgl/platform/log.hpp>
-#include <iostream>
-
-#include <uv.h>
-
-#include <cassert>
-
-
-const std::string base_directory = []{
-    std::string fn = __FILE__;
-    fn.erase(fn.find_last_of("/"));
-    fn.erase(fn.find_last_of("/"));
-    fn.erase(fn.find_last_of("/"));
-    return fn + "/test/suite/";
-}();
-
-namespace mbgl {
-
-void HTTPRequestBaton::start(const util::ptr<HTTPRequestBaton> &baton) {
-    assert(uv_thread_self() == baton->thread_id);
-
-    std::string clean_url = util::percentDecode(baton->path);
-    if (clean_url.find("local://") == 0) {
-        clean_url = base_directory + clean_url.substr(8);
-    }
-
-    baton->response = std::make_unique<Response>();
-    FILE *file = fopen(clean_url.c_str(),"rb");
-    if (file != NULL) {
-        fseek(file, 0, SEEK_END);
-        const size_t size = ftell(file);
-        fseek(file, 0, SEEK_SET);
-        baton->response->data.resize(size);
-        const size_t read = fread(&baton->response->data[0], 1, size, file);
-        fclose(file);
-
-        if (read == size) {
-            baton->response->code = 200;
-            baton->type = HTTPResponseType::Successful;
-        } else {
-            baton->response->code = 500;
-            baton->type = HTTPResponseType::PermanentError;
-            baton->response->message = "Read bytes differed from file size";
-        }
-    } else {
-        baton->type = HTTPResponseType::PermanentError;
-        baton->response->code = 404;
-    }
-
-    uv_async_send(baton->async);
-}
-
-void HTTPRequestBaton::stop(const util::ptr<HTTPRequestBaton> &/*baton*/) {
-    fprintf(stderr, "HTTP request cannot be canceled because it is answered immediately");
-    abort();
-}
-
-namespace platform {
-
-std::string defaultCacheDatabase() {
-    // Disables the cache.
-    return "";
-}
-
-}
-
-}
diff --git a/test/headless.cpp b/test/headless.cpp
index 4605d7f288..98aee6bebf 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -15,22 +15,58 @@
 #include "./fixtures/fixture_log.hpp"
 
 #include <dirent.h>
+#include <signal.h>
+#include <libgen.h>
+
+std::string base_directory;
+
+
+class ServerEnvironment : public ::testing::Environment {
+public:
+    virtual void SetUp() {
+        pid = fork();
+        if (pid < 0) {
+            throw std::runtime_error("Cannot create web server");
+        } else if (pid == 0) {
+            int ret = execve((base_directory + "bin/server.py").c_str(), nullptr, nullptr);
+            // This call should not return. In case execve failed, we exit anyway.
+            if (ret < 0) {
+                fprintf(stderr, "Failed to start server: %s\n", strerror(errno));
+            }
+            exit(0);
+        } else {
+            display = std::make_shared<mbgl::HeadlessDisplay>();
+        }
+    }
+    virtual void TearDown() {
+        ASSERT_TRUE(pid);
+        kill(pid, SIGHUP);
+    }
+
+    std::shared_ptr<mbgl::HeadlessDisplay> display;
 
-const std::string base_directory = []{
-    std::string fn = __FILE__;
-    fn.erase(fn.find_last_of("/"));
-    fn.erase(fn.find_last_of("/"));
-    return fn + "/test/suite/";
-}();
+private:
+    pid_t pid = 0;
+};
 
-auto display_ = std::make_shared<mbgl::HeadlessDisplay>();
+
+ServerEnvironment* env = nullptr;
+
+
+GTEST_API_ int main(int argc, char *argv[]) {
+    base_directory = std::string(dirname(argv[0])) + "/" + dirname(const_cast<char *>(__FILE__)) + "/suite/";
+    testing::InitGoogleTest(&argc, argv);
+    env = new ServerEnvironment();
+    ::testing::AddGlobalTestEnvironment(env);
+    return RUN_ALL_TESTS();
+}
 
 class HeadlessTest : public ::testing::TestWithParam<std::string> {};
 
 TEST_P(HeadlessTest, render) {
     using namespace mbgl;
 
-    const std::string &base = GetParam();
+    const std::string& base = GetParam();
 
     std::string style = util::read_file(base_directory + "tests/" + base + "/style.json");
     std::string info = util::read_file(base_directory + "tests/" + base + "/info.json");
@@ -55,8 +91,10 @@ TEST_P(HeadlessTest, render) {
     Log::Set<FixtureLogBackend>();
 
     for (auto it = infoDoc.MemberBegin(), end = infoDoc.MemberEnd(); it != end; it++) {
-        const std::string name { it->name.GetString(), it->name.GetStringLength() };
-        const rapidjson::Value &value = it->value;
+        const std::string name {
+            it->name.GetString(), it->name.GetStringLength()
+        };
+        const rapidjson::Value& value = it->value;
         ASSERT_TRUE(value.IsObject());
         if (value.HasMember("center")) ASSERT_TRUE(value["center"].IsArray());
 
@@ -72,16 +110,16 @@ TEST_P(HeadlessTest, render) {
 
         std::vector<std::string> classes;
         if (value.HasMember("classes")) {
-            const rapidjson::Value &js_classes = value["classes"];
+            const rapidjson::Value& js_classes = value["classes"];
             ASSERT_TRUE(js_classes.IsArray());
             for (rapidjson::SizeType i = 0; i < js_classes.Size(); i++) {
-                const rapidjson::Value &js_class = js_classes[i];
+                const rapidjson::Value& js_class = js_classes[i];
                 ASSERT_TRUE(js_class.IsString());
                 classes.push_back({ js_class.GetString(), js_class.GetStringLength() });
             }
         }
 
-        HeadlessView view(display_);
+        HeadlessView view(env->display);
         Map map(view);
 
         map.setStyleJSON(style, base_directory);
diff --git a/test/suite b/test/suite
-Subproject 1651a3df444ff83c98f6eff00679d6b84dc8845
+Subproject 8f03d5dabfb7ec6447696b25691794280f39947
diff --git a/test/test.gyp b/test/test.gyp
index 8ae475d1c1..96e0917a52 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -162,9 +162,7 @@
       'product_name': 'test_headless',
       'type': 'executable',
       'sources': [
-        './main.cpp',
         './headless.cpp',
-        './fixtures/fixture_request.cpp',
         './fixtures/fixture_log.cpp',
       ],
       'conditions': [