tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Update Source.GeoJSONSourceTilesAfterDataReset unit test

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-11-26 15:25:36 +02:00
parent b6fbd1221e
commit 5c271dba24
1 changed files with 46 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
test/style/source.test.cpp
View File

@@ -63,16 +63,16 @@ public:
ImageManager imageManager;
GlyphManager glyphManager;
TileParameters tileParameters {
1.0,
MapDebugOptions(),
transformState,
fileSource,
MapMode::Continuous,
annotationManager,
imageManager,
glyphManager,
0
TileParameters tileParameters(MapMode mapMode = MapMode::Continuous) {
return {1.0,
MapDebugOptions(),
transformState,
fileSource,
mapMode,
annotationManager,
imageManager,
glyphManager,
0};
};
SourceTest() {
@@ -172,11 +172,7 @@ TEST(Source, RasterTileEmpty) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -211,11 +207,7 @@ TEST(Source, RasterDEMTileEmpty) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -252,11 +244,7 @@ TEST(Source, VectorTileEmpty) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -291,11 +279,7 @@ TEST(Source, RasterTileFail) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -330,11 +314,7 @@ TEST(Source, RasterDEMTileFail) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -371,11 +351,7 @@ TEST(Source, VectorTileFail) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -409,11 +385,7 @@ TEST(Source, RasterTileCorrupt) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -447,11 +419,7 @@ TEST(Source, RasterDEMTileCorrupt) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -486,11 +454,7 @@ TEST(Source, VectorTileCorrupt) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -523,11 +487,7 @@ TEST(Source, RasterTileCancel) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -560,11 +520,7 @@ TEST(Source, RasterDEMTileCancel) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -599,11 +555,7 @@ TEST(Source, VectorTileCancel) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -644,11 +596,7 @@ TEST(Source, RasterTileAttribution) {
source.loadDescription(*test.fileSource);
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -687,11 +635,7 @@ TEST(Source, RasterDEMTileAttribution) {
source.loadDescription(*test.fileSource);
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.run();
}
@@ -783,11 +727,7 @@ TEST(Source, CustomGeometrySourceSetTileData) {
auto renderSource = RenderSource::create(source.baseImpl);
renderSource->setObserver(&test.renderSourceObserver);
renderSource->update(source.baseImpl,
layers,
true,
true,
test.tileParameters);
renderSource->update(source.baseImpl, layers, true, true, test.tileParameters());
test.loop.invoke([&] () {
// Set Tile Data
@@ -859,15 +799,15 @@ TEST(Source, InvisibleSourcesTileNecessity) {
makeMutable<LineLayerProperties>(staticImmutableCast<LineLayer::Impl>(layer.baseImpl));
std::vector<Immutable<LayerProperties>> layers{layerProperties};
EXPECT_CALL(renderTilesetSource, tileSetNecessity(TileNecessity::Required)).Times(1);
renderSource->update(initialized.baseImpl, layers, true, true, test.tileParameters);
renderSource->update(initialized.baseImpl, layers, true, true, test.tileParameters());
// Necessity for invisible tiles must be set to `optional`.
EXPECT_CALL(renderTilesetSource, tileSetNecessity(TileNecessity::Optional)).Times(1);
renderSource->update(initialized.baseImpl, layers, false, false, test.tileParameters);
renderSource->update(initialized.baseImpl, layers, false, false, test.tileParameters());
// Necessity is again `required` once tiles get back visible.
EXPECT_CALL(renderTilesetSource, tileSetNecessity(TileNecessity::Required)).Times(1);
renderSource->update(initialized.baseImpl, layers, true, false, test.tileParameters);
renderSource->update(initialized.baseImpl, layers, true, false, test.tileParameters());
}
TEST(Source, RenderTileSetSourceUpdate) {
@@ -903,19 +843,20 @@ TEST(Source, RenderTileSetSourceUpdate) {
// Check that `updateInternal()` is called even if the updated source has not yet loaded description.
EXPECT_CALL(renderTilesetSource, mockedUpdateInternal()).Times(2);
RenderSource* renderSource = &renderTilesetSource;
renderSource->update(initialized.baseImpl, layers, true, true, test.tileParameters);
renderSource->update(initialized.baseImpl, layers, true, true, test.tileParameters());
VectorSource uninitialized("source", "http://url");
renderSource->update(uninitialized.baseImpl, layers, true, true, test.tileParameters);
renderSource->update(uninitialized.baseImpl, layers, true, true, test.tileParameters());
}
TEST(Source, GeoJSONSourceTilesRemainAfterDataReset) {
TEST(Source, GeoJSONSourceTilesAfterDataReset) {
SourceTest test;
GeoJSONSource source("source");
source.setGeoJSONData(GeoJSONData::create(
auto geoJSONData = GeoJSONData::create(
mapbox::geojson::parse(
R"({"geometry": {"type": "Point", "coordinates": [1.1, 1.1]}, "type": "Feature", "properties": {}})"),
{}));
{});
source.setGeoJSONData(geoJSONData);
RenderGeoJSONSource renderSource{staticImmutableCast<GeoJSONSource::Impl>(source.baseImpl)};
CircleLayer layer("id", "source");
@@ -923,10 +864,19 @@ TEST(Source, GeoJSONSourceTilesRemainAfterDataReset) {
makeMutable<CircleLayerProperties>(staticImmutableCast<CircleLayer::Impl>(layer.baseImpl));
std::vector<Immutable<LayerProperties>> layers{layerProperties};
static_cast<RenderSource&>(renderSource).update(source.baseImpl, layers, true, true, test.tileParameters);
static_cast<RenderSource&>(renderSource).update(source.baseImpl, layers, true, true, test.tileParameters());
EXPECT_FALSE(renderSource.isLoaded()); // loaded == false, means that the source contains pending tiles.
source.setGeoJSONData(nullptr);
static_cast<RenderSource&>(renderSource).update(source.baseImpl, layers, true, true, test.tileParameters);
EXPECT_FALSE(renderSource.isLoaded()); // Tiles remain.
static_cast<RenderSource&>(renderSource).update(source.baseImpl, layers, true, true, test.tileParameters());
EXPECT_FALSE(renderSource.isLoaded()); // Tiles remain in continous mode.
source.setGeoJSONData(geoJSONData);
static_cast<RenderSource&>(renderSource).update(source.baseImpl, layers, true, true, test.tileParameters());
EXPECT_FALSE(renderSource.isLoaded());
source.setGeoJSONData(nullptr);
static_cast<RenderSource&>(renderSource)
.update(source.baseImpl, layers, true, true, test.tileParameters(MapMode::Static));
EXPECT_TRUE(renderSource.isLoaded()); // Tiles are reset in static mode.
}