diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-11 14:16:53 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-11 14:56:29 +0300 |
commit | 1a71d0ca03f6bd6c7e3fa14fd9fedc037c0585a4 (patch) | |
tree | dc3a9cbc42de7f9f50b74a212646634161546af1 /test/storage/sync_file_source.test.cpp | |
parent | dbe0f706c34852cd18637ba28167731e72712de6 (diff) | |
download | qtlocation-mapboxgl-1a71d0ca03f6bd6c7e3fa14fd9fedc037c0585a4.tar.gz |
test
Diffstat (limited to 'test/storage/sync_file_source.test.cpp')
-rw-r--r-- | test/storage/sync_file_source.test.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/storage/sync_file_source.test.cpp b/test/storage/sync_file_source.test.cpp index 4bd964199d..f466ac32aa 100644 --- a/test/storage/sync_file_source.test.cpp +++ b/test/storage/sync_file_source.test.cpp @@ -1,5 +1,4 @@ #include <mbgl/util/run_loop.hpp> -#include <mbgl/util/io.hpp> #include <mbgl/storage/file_source.hpp> #include <mbgl/gfx/headless_frontend.hpp> #include <mbgl/map/map.hpp> @@ -8,6 +7,8 @@ #include <mbgl/test/map_adapter.hpp> #include <unordered_map> +#include <mapbox/io.hpp> + #include <gtest/gtest.h> using namespace mbgl; @@ -39,12 +40,13 @@ TEST(SyncFileSource, LoadSyncRender) { util::RunLoop loop; auto fs = std::make_shared<SyncFileSource>(); fs->add("mapbox://mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v7", - util::read_file("test/fixtures/resources/source_vector.json")); + *mapbox::base::io::readFile("test/fixtures/resources/source_vector.json")); fs->add("mapbox://sprites/mapbox/streets-v9.png", - util::read_file("test/fixtures/resources/sprite.png")); + *mapbox::base::io::readFile("test/fixtures/resources/sprite.png")); fs->add("mapbox://sprites/mapbox/streets-v9.json", - util::read_file("test/fixtures/resources/sprite.json")); + *mapbox::base::io::readFile("test/fixtures/resources/sprite.json")); HeadlessFrontend frontend{ { 512, 512 }, 1.0 }; MapAdapter map{ frontend, MapObserver::nullObserver(), fs, MapOptions() }; - map.getStyle().loadJSON(util::read_file("test/fixtures/resources/style_vector.json")); + map.getStyle().loadJSON( + *mapbox::base::io::readFile("test/fixtures/resources/style_vector.json")); } |