summaryrefslogtreecommitdiff
path: root/test/tile
diff options
context:
space:
mode:
Diffstat (limited to 'test/tile')
-rw-r--r--test/tile/custom_geometry_tile.test.cpp11
-rw-r--r--test/tile/geojson_tile.test.cpp11
-rw-r--r--test/tile/raster_dem_tile.test.cpp11
-rw-r--r--test/tile/raster_tile.test.cpp11
-rw-r--r--test/tile/vector_tile.test.cpp11
5 files changed, 35 insertions, 20 deletions
diff --git a/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp
index 834f02879b..4e31ea4dd4 100644
--- a/test/tile/custom_geometry_tile.test.cpp
+++ b/test/tile/custom_geometry_tile.test.cpp
@@ -13,6 +13,7 @@
#include <mbgl/annotation/annotation_manager.hpp>
#include <mbgl/renderer/image_manager.hpp>
#include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
#include <memory>
@@ -21,19 +22,21 @@ using namespace mbgl::style;
class CustomTileTest {
public:
- FakeFileSource fileSource;
+ FileSourceOptions fakeFileSourceOptions;
+ std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+ fakeFileSourceOptions, std::make_shared<FakeFileSource>());
TransformState transformState;
util::RunLoop loop;
- style::Style style { fileSource, 1 };
+ style::Style style { 1.0, fakeFileSourceOptions };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager { fakeFileSourceOptions };
TileParameters tileParameters {
1.0,
+ fileSource,
MapDebugOptions(),
transformState,
- fileSource,
MapMode::Continuous,
annotationManager,
imageManager,
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index e68103f4a0..3c78edf6ea 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -12,6 +12,7 @@
#include <mbgl/annotation/annotation_manager.hpp>
#include <mbgl/renderer/image_manager.hpp>
#include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
#include <memory>
@@ -20,20 +21,22 @@ using namespace mbgl::style;
class GeoJSONTileTest {
public:
- FakeFileSource fileSource;
+ FileSourceOptions fakeFileSourceOptions;
+ std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+ fakeFileSourceOptions, std::make_shared<FakeFileSource>());
TransformState transformState;
util::RunLoop loop;
- style::Style style { fileSource, 1 };
+ style::Style style { 1.0, fakeFileSourceOptions };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager { fakeFileSourceOptions };
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
TileParameters tileParameters {
1.0,
+ fileSource,
MapDebugOptions(),
transformState,
- fileSource,
MapMode::Continuous,
annotationManager,
imageManager,
diff --git a/test/tile/raster_dem_tile.test.cpp b/test/tile/raster_dem_tile.test.cpp
index e2e7d44b9b..1b0460cb9a 100644
--- a/test/tile/raster_dem_tile.test.cpp
+++ b/test/tile/raster_dem_tile.test.cpp
@@ -11,25 +11,28 @@
#include <mbgl/renderer/buckets/hillshade_bucket.hpp>
#include <mbgl/renderer/image_manager.hpp>
#include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
using namespace mbgl;
class RasterDEMTileTest {
public:
- FakeFileSource fileSource;
+ FileSourceOptions fakeFileSourceOptions;
+ std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+ fakeFileSourceOptions, std::make_shared<FakeFileSource>());
TransformState transformState;
util::RunLoop loop;
- style::Style style { fileSource, 1 };
+ style::Style style { 1.0, fakeFileSourceOptions };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager { fakeFileSourceOptions };
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
TileParameters tileParameters {
1.0,
+ fileSource,
MapDebugOptions(),
transformState,
- fileSource,
MapMode::Continuous,
annotationManager,
imageManager,
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index 2e35a94025..1bce370d95 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -11,25 +11,28 @@
#include <mbgl/renderer/buckets/raster_bucket.hpp>
#include <mbgl/renderer/image_manager.hpp>
#include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
using namespace mbgl;
class RasterTileTest {
public:
- FakeFileSource fileSource;
+ FileSourceOptions fakeFileSourceOptions;
+ std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+ fakeFileSourceOptions, std::make_shared<FakeFileSource>());
TransformState transformState;
util::RunLoop loop;
- style::Style style { fileSource, 1 };
+ style::Style style { 1.0, fakeFileSourceOptions };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager { fakeFileSourceOptions };
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
TileParameters tileParameters {
1.0,
+ fileSource,
MapDebugOptions(),
transformState,
- fileSource,
MapMode::Continuous,
annotationManager,
imageManager,
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index c610d8c1a7..c32a4c42be 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -15,6 +15,7 @@
#include <mbgl/annotation/annotation_manager.hpp>
#include <mbgl/renderer/image_manager.hpp>
#include <mbgl/text/glyph_manager.hpp>
+#include <mbgl/platform/factory.hpp>
#include <memory>
@@ -22,20 +23,22 @@ using namespace mbgl;
class VectorTileTest {
public:
- FakeFileSource fileSource;
+ FileSourceOptions fakeFileSourceOptions;
+ std::shared_ptr<FileSource> fileSource = platform::Factory::sharedFileSource(
+ fakeFileSourceOptions, std::make_shared<FakeFileSource>());
TransformState transformState;
util::RunLoop loop;
- style::Style style { fileSource, 1 };
+ style::Style style { 1.0, fakeFileSourceOptions };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager { fakeFileSourceOptions };
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
TileParameters tileParameters {
1.0,
+ fileSource,
MapDebugOptions(),
transformState,
- fileSource,
MapMode::Continuous,
annotationManager,
imageManager,
View Lorry Controller Status