[test] rearrange test files so they're not in the fixtures folder

test/api/annotations.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/annotation/point_annotation.hpp>
 #include <mbgl/annotation/shape_annotation.hpp>

test/api/api_misuse.cpp

@@ -1,5 +1,5 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/fixture_log_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/default/headless_display.hpp>

test/api/custom_layer.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/default/headless_display.hpp>

test/api/offline.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/platform/default/headless_display.hpp>
 #include <mbgl/platform/default/headless_view.hpp>

test/api/render_missing.cpp

@@ -1,5 +1,5 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/fixture_log_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/default/headless_view.hpp>

test/api/repeated_render.cpp

@@ -1,5 +1,5 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/fixture_log_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/default/headless_view.hpp>

test/api/set_style.cpp

@@ -1,5 +1,5 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/fixture_log_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/default/headless_view.hpp>

test/geometry/binpack.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/geometry/binpack.hpp>
 

test/map/map.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/default/headless_view.hpp>

test/map/map_context.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/map_context.hpp>

test/map/tile.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/map/tile_id.hpp>
 

test/map/transform.cpp

@@ -1,5 +1,5 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/mock_view.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/mock_view.hpp>
 
 #include <mbgl/map/transform.hpp>
 #include <mbgl/util/geo.hpp>

test/sprite/sprite_atlas.cpp

@@ -1,5 +1,5 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/fixture_log_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
 
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/sprite/sprite_store.hpp>

test/sprite/sprite_image.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/util/image.hpp>

test/sprite/sprite_parser.cpp

@@ -1,5 +1,5 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/fixture_log_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
 
 #include <mbgl/sprite/sprite_parser.hpp>
 #include <mbgl/sprite/sprite_image.hpp>

test/sprite/sprite_store.cpp

@@ -1,7 +1,7 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/fixture_log_observer.hpp"
-#include "../fixtures/stub_file_source.hpp"
-#include "../fixtures/stub_style_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
+#include <mbgl/test/stub_file_source.hpp>
+#include <mbgl/test/stub_style_observer.hpp>
 
 #include <mbgl/sprite/sprite_store.hpp>
 #include <mbgl/util/run_loop.hpp>

test/src/fixture_log_observer.cpp

@@ -1,5 +1,5 @@
-#include "fixture_log_observer.hpp"
-#include "../fixtures/util.hpp"
+#include <mbgl/test/fixture_log_observer.hpp>
+#include <mbgl/test/util.hpp>
 
 namespace mbgl {
 

test/src/main.cpp

@@ -1,4 +1,4 @@
-#include "util.hpp"
+#include <mbgl/test/util.hpp>
 
 GTEST_API_ int main(int argc, char *argv[]) {
     testing::InitGoogleTest(&argc, argv);

test/src/stub_file_source.cpp

@@ -1,4 +1,4 @@
-#include "stub_file_source.hpp"
+#include <mbgl/test/stub_file_source.hpp>
 
 namespace mbgl {
 

test/src/util.cpp

@@ -1,4 +1,4 @@
-#include "util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/log.hpp>
@@ -97,10 +97,12 @@ void checkImage(const std::string& base,
                 const PremultipliedImage& actual,
                 double imageThreshold,
                 double pixelThreshold) {
+#if !TEST_READ_ONLY
     if (getenv("UPDATE")) {
         util::write_file(base + "/expected.png", encodePNG(actual));
         return;
     }
+#endif
 
     PremultipliedImage expected = decodeImage(util::read_file(base + "/expected.png"));
     PremultipliedImage diff { expected.width, expected.height };
@@ -117,8 +119,10 @@ void checkImage(const std::string& base,
 
     EXPECT_LE(pixels / (expected.width * expected.height), imageThreshold);
 
+#if !TEST_READ_ONLY
     util::write_file(base + "/actual.png", encodePNG(actual));
     util::write_file(base + "/diff.png", encodePNG(diff));
+#endif
 }
 
 } // namespace test

test/storage/headers.cpp

@@ -1,5 +1,5 @@
 #include "storage.hpp"
-#include "../fixtures/fixture_log_observer.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/http_header.hpp>
 

test/storage/offline_database.cpp

@@ -1,4 +1,5 @@
-#include "../fixtures/fixture_log_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
 
 #include <mbgl/storage/offline_database.hpp>
 #include <mbgl/storage/resource.hpp>

test/storage/offline_download.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/stub_file_source.hpp"
+#include <mbgl/test/stub_file_source.hpp>
 
 #include <mbgl/storage/offline.hpp>
 #include <mbgl/storage/offline_database.hpp>

test/storage/storage.cpp

@@ -1,12 +1,9 @@
 #include "storage.hpp"
 
-#include <mbgl/platform/platform.hpp>
-
 std::unique_ptr<mbgl::test::Server> Storage::server;
 
 void Storage::SetUpTestCase() {
-    const auto program = mbgl::platform::applicationRoot() + "/TEST_DATA/storage/server.js";
-    server = std::make_unique<mbgl::test::Server>(program.c_str());
+    server = std::make_unique<mbgl::test::Server>("test/storage/server.js");
 }
 
 void Storage::TearDownTestCase() {

test/storage/storage.hpp

@@ -1,7 +1,7 @@
 #ifndef MBGL_TEST_STORAGE_STORAGE
 #define MBGL_TEST_STORAGE_STORAGE
 
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 #include <mbgl/storage/response.hpp>
 #include <memory>
 

test/style/comparisons.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/tile/vector_tile.hpp>
 #include <mbgl/style/filter_expression.hpp>

test/style/functions.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/style/function.hpp>
 #include <mbgl/style/style_calculation_parameters.hpp>

test/style/glyph_store.cpp

@@ -1,6 +1,6 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/stub_file_source.hpp"
-#include "../fixtures/stub_style_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/stub_file_source.hpp>
+#include <mbgl/test/stub_style_observer.hpp>
 
 #include <mbgl/text/font_stack.hpp>
 #include <mbgl/text/glyph_store.hpp>

test/style/source.cpp

@@ -1,7 +1,7 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/stub_file_source.hpp"
-#include "../fixtures/mock_view.hpp"
-#include "../fixtures/stub_style_observer.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/stub_file_source.hpp>
+#include <mbgl/test/mock_view.hpp>
+#include <mbgl/test/stub_style_observer.hpp>
 
 #include <mbgl/source/source.hpp>
 #include <mbgl/util/run_loop.hpp>

test/style/style.cpp

@@ -1,5 +1,5 @@
-#include "../fixtures/util.hpp"
-#include "../fixtures/stub_file_source.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/stub_file_source.hpp>
 
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/style/style.hpp>

test/style/style_layer.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/layer/background_layer.hpp>

test/style/style_parser.cpp

@@ -1,12 +1,11 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
+#include <mbgl/test/fixture_log_observer.hpp>
 
 #include <mbgl/style/style_parser.hpp>
 #include <mbgl/util/io.hpp>
 
 #include <rapidjson/document.h>
 
-#include "../fixtures/fixture_log_observer.hpp"
-
 #include <iostream>
 #include <fstream>
 

test/style/variant.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/style/value.hpp>
 #include <mbgl/style/value_comparison.hpp>

test/test.gypi

@@ -2,39 +2,35 @@
   'includes': [
     '../gyp/common.gypi',
   ],
+
   'targets': [
-    { 'target_name': 'symlink_TEST_DATA',
-      'type': 'none',
-      'hard_dependency': 1,
-      'actions': [
-        {
-          'action_name': 'Symlink Fixture Directory',
-          'inputs': ['<!@(pwd)/../test'],
-          'outputs': ['<(PRODUCT_DIR)/TEST_DATA'], # symlinks the test dir into TEST_DATA
-          'action': ['ln', '-s', '-f', '-n', '<@(_inputs)', '<@(_outputs)' ],
-        }
-      ],
-    },
     { 'target_name': 'test',
       'type': 'executable',
-      'include_dirs': [ '../include', '../src', '../platform/default' ],
+
+      'include_dirs': [
+        '../src',
+        '../platform/default',
+        'include',
+      ],
+
       'dependencies': [
-        'symlink_TEST_DATA',
         'mbgl.gyp:core',
         'mbgl.gyp:platform-<(platform_lib)',
         'mbgl.gyp:http-<(http_lib)',
         'mbgl.gyp:asset-<(asset_lib)',
         'mbgl.gyp:headless-<(headless_lib)',
       ],
+
       'sources': [
-        'fixtures/main.cpp',
-        'fixtures/stub_file_source.cpp',
-        'fixtures/stub_file_source.hpp',
-        'fixtures/mock_view.hpp',
-        'fixtures/util.hpp',
-        'fixtures/util.cpp',
-        'fixtures/fixture_log_observer.hpp',
-        'fixtures/fixture_log_observer.cpp',
+        # Test helper files
+        'src/main.cpp',
+        'src/stub_file_source.cpp',
+        'include/mbgl/test/stub_file_source.hpp',
+        'include/mbgl/test/mock_view.hpp',
+        'include/mbgl/test/util.hpp',
+        'src/util.cpp',
+        'include/mbgl/test/fixture_log_observer.hpp',
+        'src/fixture_log_observer.cpp',
 
         'util/assert.cpp',
         'util/async_task.cpp',
@@ -102,6 +98,7 @@
         'sprite/sprite_parser.cpp',
         'sprite/sprite_store.cpp',
       ],
+
       'variables': {
         'cflags_cc': [
           '<@(gtest_cflags)',
@@ -123,6 +120,7 @@
           '<@(geojsonvt_static_libs)',
         ],
       },
+
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {

test/util/assert.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/assert.hpp>
 

test/util/async_task.cpp

@@ -2,7 +2,7 @@
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/thread.hpp>
 
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <vector>
 

test/util/clip_ids.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <algorithm>
 

test/util/geo.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/geo.hpp>

test/util/image.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/premultiply.hpp>
 #include <mbgl/util/image.hpp>

test/util/mapbox.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/platform/log.hpp>
 #include <mbgl/util/mapbox.hpp>

test/util/math.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/math.hpp>

test/util/merge_lines.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/merge_lines.hpp>
 

test/util/run_loop.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/timer.hpp>
 
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 using namespace mbgl::util;
 

test/util/text_conversions.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/utf.hpp>
 #include <mbgl/platform/platform.hpp>

test/util/thread.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/util/thread.hpp>
 #include <mbgl/util/run_loop.hpp>
 
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 using namespace mbgl::util;
 

test/util/thread_local.cpp

@@ -2,7 +2,7 @@
 #include <mbgl/util/thread.hpp>
 #include <mbgl/util/thread_local.hpp>
 
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 using namespace mbgl::util;
 

test/util/timer.cpp

@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 using namespace mbgl::util;
 

test/util/token.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/token.hpp>
 

test/util/work_queue.cpp

@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/run_loop.hpp>
 #include <mbgl/util/thread.hpp>