diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-07-10 20:43:41 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-07-10 21:03:23 +0300 |
| commit | 0d444026280a2c6bdffbcb302c871786fc14d9c3 (patch) | |
| tree | f9a4884790cc86bfc774fefff0fc844c841ce6c9 /test | |
| parent | 8a9665b08546408dabc4a0a59102039fda58a503 (diff) | |
| download | qtlocation-mapboxgl-0d444026280a2c6bdffbcb302c871786fc14d9c3.tar.gz | |
Move MockFileSource to fixtures
It is going to be used by another test that needs to emulate
asynchronous requests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/mock_file_source.cpp (renamed from test/style/mock_file_source.cpp) | 0 | ||||
| -rw-r--r-- | test/fixtures/mock_file_source.hpp (renamed from test/style/mock_file_source.hpp) | 0 | ||||
| -rw-r--r-- | test/style/pending_resources.cpp | 2 | ||||
| -rw-r--r-- | test/style/resource_loading.cpp | 2 | ||||
| -rw-r--r-- | test/style/sprite.cpp | 2 | ||||
| -rw-r--r-- | test/test.gypi | 6 |
6 files changed, 6 insertions, 6 deletions
diff --git a/test/style/mock_file_source.cpp b/test/fixtures/mock_file_source.cpp index b420ba7298..b420ba7298 100644 --- a/test/style/mock_file_source.cpp +++ b/test/fixtures/mock_file_source.cpp diff --git a/test/style/mock_file_source.hpp b/test/fixtures/mock_file_source.hpp index 6bee95dcf8..6bee95dcf8 100644 --- a/test/style/mock_file_source.hpp +++ b/test/fixtures/mock_file_source.hpp diff --git a/test/style/pending_resources.cpp b/test/style/pending_resources.cpp index 8eea81191d..4513d18645 100644 --- a/test/style/pending_resources.cpp +++ b/test/style/pending_resources.cpp @@ -1,6 +1,6 @@ #include "../fixtures/fixture_log_observer.hpp" +#include "../fixtures/mock_file_source.hpp" #include "../fixtures/util.hpp" -#include "mock_file_source.hpp" #include <mbgl/map/map.hpp> #include <mbgl/map/still_image.hpp> diff --git a/test/style/resource_loading.cpp b/test/style/resource_loading.cpp index a295294f55..025b9b0271 100644 --- a/test/style/resource_loading.cpp +++ b/test/style/resource_loading.cpp @@ -1,7 +1,7 @@ #include "../fixtures/fixture_log_observer.hpp" #include "../fixtures/util.hpp" +#include "../fixtures/mock_file_source.hpp" #include "../fixtures/mock_view.hpp" -#include "mock_file_source.hpp" #include <mbgl/map/map_data.hpp> #include <mbgl/map/transform.hpp> diff --git a/test/style/sprite.cpp b/test/style/sprite.cpp index 41ded0afe2..1c3f9b2271 100644 --- a/test/style/sprite.cpp +++ b/test/style/sprite.cpp @@ -1,6 +1,6 @@ #include "../fixtures/fixture_log_observer.hpp" +#include "../fixtures/mock_file_source.hpp" #include "../fixtures/util.hpp" -#include "mock_file_source.hpp" #include <mbgl/map/sprite.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/test/test.gypi b/test/test.gypi index c32b02746a..ece68fcc8e 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -30,6 +30,9 @@ ], 'sources': [ 'fixtures/main.cpp', + 'fixtures/mock_file_source.cpp', + 'fixtures/mock_file_source.hpp', + 'fixtures/mock_view.hpp', 'fixtures/util.hpp', 'fixtures/util.cpp', 'fixtures/fixture_log_observer.hpp', @@ -83,9 +86,6 @@ 'storage/http_other_loop.cpp', 'storage/http_reading.cpp', - 'style/mock_file_source.cpp', - 'style/mock_file_source.hpp', - 'style/mock_view.hpp', 'style/pending_resources.cpp', 'style/resource_loading.cpp', 'style/sprite.cpp', |