diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-19 16:57:36 +0200 |
---|---|---|
committer | Alf Watt <alf.watt@mapbox.com> | 2019-03-21 12:25:12 -0700 |
commit | ba6dfea248b6fc5224c840ea536ac7abf57d80f1 (patch) | |
tree | 9ad248db128b3d1847985efb5c79bf13a4d56d36 /test/gl/context.test.cpp | |
parent | 15c6dbe967f4150a0d9f555781c7e353ecf20043 (diff) | |
download | qtlocation-mapboxgl-ba6dfea248b6fc5224c840ea536ac7abf57d80f1.tar.gz |
[core] Remove file source from public Map ctor
Diffstat (limited to 'test/gl/context.test.cpp')
-rw-r--r-- | test/gl/context.test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/gl/context.test.cpp b/test/gl/context.test.cpp index 3c055c2ce0..ff9b2ecac2 100644 --- a/test/gl/context.test.cpp +++ b/test/gl/context.test.cpp @@ -5,9 +5,9 @@ #include <mbgl/map/map.hpp> #include <mbgl/map/map_options.hpp> #include <mbgl/util/default_thread_pool.hpp> -#include <mbgl/storage/default_file_source.hpp> #include <mbgl/gl/defines.hpp> #include <mbgl/gl/headless_frontend.hpp> +#include <mbgl/storage/resource_options.hpp> #include <mbgl/style/style.hpp> #include <mbgl/style/layers/custom_layer.hpp> #include <mbgl/style/layers/fill_layer.hpp> @@ -86,14 +86,14 @@ struct Buffer { TEST(GLContextMode, Shared) { util::RunLoop loop; - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); ThreadPool threadPool(4); float pixelRatio { 1 }; HeadlessFrontend frontend { pixelRatio, threadPool, {}, GLContextMode::Shared }; - Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, - fileSource, threadPool, MapOptions().withMapMode(MapMode::Static)); + Map map(frontend, MapObserver::nullObserver(), frontend.getSize(), pixelRatio, threadPool, + MapOptions().withMapMode(MapMode::Static), + ResourceOptions().withCachePath(":memory:").withAssetPath("test/fixtures/api/assets")); map.getStyle().loadJSON(util::read_file("test/fixtures/api/water.json")); map.jumpTo(CameraOptions().withCenter(LatLng { 37.8, -122.5 }).withZoom(10.0)); |