From db5ac4785fdc02b4e233201bb3c6f55270e3c65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 18 Feb 2016 12:41:09 +0100
Subject: [test] rearrange test files so they're not in the fixtures folder

---
 test/style/comparisons.cpp  | 2 +-
 test/style/functions.cpp    | 2 +-
 test/style/glyph_store.cpp  | 6 +++---
 test/style/source.cpp       | 8 ++++----
 test/style/style.cpp        | 4 ++--
 test/style/style_layer.cpp  | 2 +-
 test/style/style_parser.cpp | 5 ++---
 test/style/variant.cpp      | 2 +-
 8 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'test/style')

diff --git a/test/style/comparisons.cpp b/test/style/comparisons.cpp
index 88f2645be8..4eab5d2cb8 100644
--- a/test/style/comparisons.cpp
+++ b/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>
diff --git a/test/style/functions.cpp b/test/style/functions.cpp
index d19d2ea88e..26b952d7b4 100644
--- a/test/style/functions.cpp
+++ b/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>
diff --git a/test/style/glyph_store.cpp b/test/style/glyph_store.cpp
index ff88841450..126317e7ad 100644
--- a/test/style/glyph_store.cpp
+++ b/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>
diff --git a/test/style/source.cpp b/test/style/source.cpp
index bbe37fcf05..73367f639f 100644
--- a/test/style/source.cpp
+++ b/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>
diff --git a/test/style/style.cpp b/test/style/style.cpp
index 1d3b3beb47..4b01b0a146 100644
--- a/test/style/style.cpp
+++ b/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>
diff --git a/test/style/style_layer.cpp b/test/style/style_layer.cpp
index 40c4df2b43..3b1d3be337 100644
--- a/test/style/style_layer.cpp
+++ b/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>
diff --git a/test/style/style_parser.cpp b/test/style/style_parser.cpp
index 64ee4af9fc..f549d638a4 100644
--- a/test/style/style_parser.cpp
+++ b/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>
 
diff --git a/test/style/variant.cpp b/test/style/variant.cpp
index c55de3d27f..199606d666 100644
--- a/test/style/variant.cpp
+++ b/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>
-- 
cgit v1.2.1