diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-02-18 12:41:09 +0100 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-22 11:56:01 -0700 |
| commit | db5ac4785fdc02b4e233201bb3c6f55270e3c65d (patch) | |
| tree | 0c730d62e471d211924c486e1eeadf5efb305eaf /test/storage | |
| parent | 61920071cd221d0d0627e01893185f0f19b55a98 (diff) | |
| download | qtlocation-mapboxgl-db5ac4785fdc02b4e233201bb3c6f55270e3c65d.tar.gz | |
[test] rearrange test files so they're not in the fixtures folder
Diffstat (limited to 'test/storage')
| -rw-r--r-- | test/storage/headers.cpp | 2 | ||||
| -rw-r--r-- | test/storage/offline_database.cpp | 3 | ||||
| -rw-r--r-- | test/storage/offline_download.cpp | 2 | ||||
| -rw-r--r-- | test/storage/storage.cpp | 5 | ||||
| -rw-r--r-- | test/storage/storage.hpp | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/test/storage/headers.cpp b/test/storage/headers.cpp index 2ec409e8e0..3ef4fe25e5 100644 --- a/test/storage/headers.cpp +++ b/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> diff --git a/test/storage/offline_database.cpp b/test/storage/offline_database.cpp index 23269a98ed..4c55ca8bb4 100644 --- a/test/storage/offline_database.cpp +++ b/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> diff --git a/test/storage/offline_download.cpp b/test/storage/offline_download.cpp index 26d0fb29e5..f7fe0b4064 100644 --- a/test/storage/offline_download.cpp +++ b/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> diff --git a/test/storage/storage.cpp b/test/storage/storage.cpp index 91f21107ad..28f64bfb1c 100644 --- a/test/storage/storage.cpp +++ b/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() { diff --git a/test/storage/storage.hpp b/test/storage/storage.hpp index 3dc13d0d9f..e7cd960546 100644 --- a/test/storage/storage.hpp +++ b/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> |