summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-05-10 22:42:48 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-05-14 11:29:24 +0300
commit953ee5e81bee613680468438e3efe4f7c3ff68f6 (patch)
tree453d9145093448a0222c4b54edce4cf2dac4e81f /test
parent81823e35a68eb87d9433457fe9983d06793a77bf (diff)
downloadqtlocation-mapboxgl-953ee5e81bee613680468438e3efe4f7c3ff68f6.tar.gz
[core] Create glyph manager at renderer construction time
Avoid unnecessary glyph manager presence check in `Renderer::Impl::()`.
Diffstat (limited to 'test')
-rw-r--r--test/style/source.test.cpp2
-rw-r--r--test/text/glyph_manager.test.cpp8
-rw-r--r--test/tile/custom_geometry_tile.test.cpp2
-rw-r--r--test/tile/geojson_tile.test.cpp2
-rw-r--r--test/tile/raster_dem_tile.test.cpp2
-rw-r--r--test/tile/raster_tile.test.cpp2
-rw-r--r--test/tile/vector_tile.test.cpp4
7 files changed, 11 insertions, 11 deletions
diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp
index 289e41c75f..77a9440490 100644
--- a/test/style/source.test.cpp
+++ b/test/style/source.test.cpp
@@ -57,7 +57,7 @@ public:
Style style { fileSource, 1 };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager;
TileParameters tileParameters {
1.0,
diff --git a/test/text/glyph_manager.test.cpp b/test/text/glyph_manager.test.cpp
index 3dcf1e204c..1193780631 100644
--- a/test/text/glyph_manager.test.cpp
+++ b/test/text/glyph_manager.test.cpp
@@ -68,7 +68,7 @@ public:
StubFileSource fileSource;
StubGlyphManagerObserver observer;
StubGlyphRequestor requestor;
- GlyphManager glyphManager{ fileSource, std::make_unique<StubLocalGlyphRasterizer>() };
+ GlyphManager glyphManager{ std::make_unique<StubLocalGlyphRasterizer>() };
void run(const std::string& url, GlyphDependencies dependencies) {
// Squelch logging.
@@ -76,7 +76,7 @@ public:
glyphManager.setURL(url);
glyphManager.setObserver(&observer);
- glyphManager.getGlyphs(requestor, std::move(dependencies));
+ glyphManager.getGlyphs(requestor, std::move(dependencies), fileSource);
loop.run();
}
@@ -298,7 +298,7 @@ TEST(GlyphManager, ImmediateFileSource) {
StubFileSource fileSource = { StubFileSource::ResponseType::Synchronous };
StubGlyphManagerObserver observer;
StubGlyphRequestor requestor;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager;
void run(const std::string& url, GlyphDependencies dependencies) {
// Squelch logging.
@@ -306,7 +306,7 @@ TEST(GlyphManager, ImmediateFileSource) {
glyphManager.setURL(url);
glyphManager.setObserver(&observer);
- glyphManager.getGlyphs(requestor, std::move(dependencies));
+ glyphManager.getGlyphs(requestor, std::move(dependencies), fileSource);
loop.run();
}
diff --git a/test/tile/custom_geometry_tile.test.cpp b/test/tile/custom_geometry_tile.test.cpp
index 50bc7d0e8f..39f6e33caf 100644
--- a/test/tile/custom_geometry_tile.test.cpp
+++ b/test/tile/custom_geometry_tile.test.cpp
@@ -28,7 +28,7 @@ public:
style::Style style { fileSource, 1 };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager;
TileParameters tileParameters {
1.0,
diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp
index 4f4435182f..75e9ccbc7a 100644
--- a/test/tile/geojson_tile.test.cpp
+++ b/test/tile/geojson_tile.test.cpp
@@ -27,7 +27,7 @@ public:
style::Style style { fileSource, 1 };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager;
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
TileParameters tileParameters {
diff --git a/test/tile/raster_dem_tile.test.cpp b/test/tile/raster_dem_tile.test.cpp
index e2e7d44b9b..8abd6efe12 100644
--- a/test/tile/raster_dem_tile.test.cpp
+++ b/test/tile/raster_dem_tile.test.cpp
@@ -22,7 +22,7 @@ public:
style::Style style { fileSource, 1 };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager;
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
TileParameters tileParameters {
diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp
index 2e35a94025..3437061fa5 100644
--- a/test/tile/raster_tile.test.cpp
+++ b/test/tile/raster_tile.test.cpp
@@ -22,7 +22,7 @@ public:
style::Style style { fileSource, 1 };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager;
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
TileParameters tileParameters {
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index c610d8c1a7..05c415fb22 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -28,7 +28,7 @@ public:
style::Style style { fileSource, 1 };
AnnotationManager annotationManager { style };
ImageManager imageManager;
- GlyphManager glyphManager { fileSource };
+ GlyphManager glyphManager;
Tileset tileset { { "https://example.com" }, { 0, 22 }, "none" };
TileParameters tileParameters {
@@ -103,4 +103,4 @@ TEST(VectorTileData, ParseResults) {
ASSERT_EQ(properties.at("disputed"), *feature->getValue("disputed"));
ASSERT_EQ(feature->getValue("invalid"), nullopt);
-} \ No newline at end of file
+}