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

15 files changed, 15 insertions, 15 deletions

diff --git a/test/util/assert.cpp b/test/util/assert.cpp
index f3eba009f0..8740bdb201 100644
--- a/test/util/assert.cpp
+++ b/test/util/assert.cpp
@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/assert.hpp>
 
diff --git a/test/util/async_task.cpp b/test/util/async_task.cpp
index 8073670fe1..95cf160548 100644
--- a/test/util/async_task.cpp
+++ b/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>
 
diff --git a/test/util/clip_ids.cpp b/test/util/clip_ids.cpp
index fb7616d8ff..6bb0716a32 100644
--- a/test/util/clip_ids.cpp
+++ b/test/util/clip_ids.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <algorithm>
 
diff --git a/test/util/geo.cpp b/test/util/geo.cpp
index bdf335dc47..0e00fdc6a3 100644
--- a/test/util/geo.cpp
+++ b/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>
diff --git a/test/util/image.cpp b/test/util/image.cpp
index 9886eede45..445b32ce2a 100644
--- a/test/util/image.cpp
+++ b/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>
diff --git a/test/util/mapbox.cpp b/test/util/mapbox.cpp
index 4fc22d3b34..e5da25991d 100644
--- a/test/util/mapbox.cpp
+++ b/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>
diff --git a/test/util/math.cpp b/test/util/math.cpp
index 0074b43509..c833ca41e2 100644
--- a/test/util/math.cpp
+++ b/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>
diff --git a/test/util/merge_lines.cpp b/test/util/merge_lines.cpp
index ed59182d76..6e7273d48c 100644
--- a/test/util/merge_lines.cpp
+++ b/test/util/merge_lines.cpp
@@ -1,4 +1,4 @@
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/merge_lines.hpp>
 
diff --git a/test/util/run_loop.cpp b/test/util/run_loop.cpp
index 565ce2c066..57bc613f9e 100644
--- a/test/util/run_loop.cpp
+++ b/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;
 
diff --git a/test/util/text_conversions.cpp b/test/util/text_conversions.cpp
index 78d88ed12e..29f02e988a 100644
--- a/test/util/text_conversions.cpp
+++ b/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>
diff --git a/test/util/thread.cpp b/test/util/thread.cpp
index f60d7d43dd..40e4d8ede4 100644
--- a/test/util/thread.cpp
+++ b/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;
 
diff --git a/test/util/thread_local.cpp b/test/util/thread_local.cpp
index aeaf187540..98b3948fc8 100644
--- a/test/util/thread_local.cpp
+++ b/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;
 
diff --git a/test/util/timer.cpp b/test/util/timer.cpp
index 1ac72d8068..71e35da919 100644
--- a/test/util/timer.cpp
+++ b/test/util/timer.cpp
@@ -5,7 +5,7 @@
 
 #include <memory>
 
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 using namespace mbgl::util;
 
diff --git a/test/util/token.cpp b/test/util/token.cpp
index add31afbad..79da03a97e 100644
--- a/test/util/token.cpp
+++ b/test/util/token.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "../fixtures/util.hpp"
+#include <mbgl/test/util.hpp>
 
 #include <mbgl/util/token.hpp>
 
diff --git a/test/util/work_queue.cpp b/test/util/work_queue.cpp
index a6cd6c3f88..c8cce4f97b 100644
--- a/test/util/work_queue.cpp
+++ b/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>