From 9841621f0b0dc96e777230f7a89faef7ca023783 Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Tue, 31 Oct 2017 14:48:08 -0700 Subject: Update unit test stubs to match new collision code. Disable annotation_tile test -- seems like maybe it makes sense to delete? --- test/gl/bucket.test.cpp | 4 +++- test/tile/annotation_tile.test.cpp | 8 +++++++- test/tile/geojson_tile.test.cpp | 2 -- test/tile/vector_tile.test.cpp | 5 ++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp index 0e73dfb28f..f43fedb1c3 100644 --- a/test/gl/bucket.test.cpp +++ b/test/gl/bucket.test.cpp @@ -109,9 +109,11 @@ TEST(Buckets, SymbolBucket) { style::SymbolLayoutProperties::PossiblyEvaluated layout; bool sdfIcons = false; bool iconsNeedLinear = false; + bool sortFeaturesByY = false; + std::vector symbolInstances; gl::Context context; - SymbolBucket bucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear }; + SymbolBucket bucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, symbolInstances }; ASSERT_FALSE(bucket.hasIconData()); ASSERT_FALSE(bucket.hasTextData()); ASSERT_FALSE(bucket.hasCollisionBoxData()); diff --git a/test/tile/annotation_tile.test.cpp b/test/tile/annotation_tile.test.cpp index b637fcf4a3..0107bbec4c 100644 --- a/test/tile/annotation_tile.test.cpp +++ b/test/tile/annotation_tile.test.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -47,8 +46,13 @@ public: }; }; +// TODO: Does it make sense to try to port this test to the new CollisionIndex model? The whole pathway this test exercised is basically gone... + // Don't query stale collision tile TEST(AnnotationTile, Issue8289) { + +/* + AnnotationTileTest test; AnnotationTile tile(OverscaledTileID(0, 0, 0), test.tileParameters); @@ -91,5 +95,7 @@ TEST(AnnotationTile, Issue8289) { tile.queryRenderedFeatures(result, queryGeometry, transformState, {}, options); EXPECT_TRUE(result.empty()); + */ + } diff --git a/test/tile/geojson_tile.test.cpp b/test/tile/geojson_tile.test.cpp index 953c3b8a5f..c05e04bc8d 100644 --- a/test/tile/geojson_tile.test.cpp +++ b/test/tile/geojson_tile.test.cpp @@ -66,7 +66,6 @@ TEST(GeoJSONTile, Issue7648) { tile.setLayers({{ layer.baseImpl }}); tile.setObserver(&observer); - tile.setPlacementConfig({}); while (!tile.isComplete()) { test.loop.runOnce(); @@ -93,7 +92,6 @@ TEST(GeoJSONTile, Issue9927) { GeoJSONTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, features); tile.setLayers({{ layer.baseImpl }}); - tile.setPlacementConfig({}); while (!tile.isComplete()) { test.loop.runOnce(); diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index 7e8b659b7a..5963e7f154 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -71,12 +70,13 @@ TEST(VectorTile, Issue7615) { VectorTile tile(OverscaledTileID(0, 0, 0), "source", test.tileParameters, test.tileset); style::SymbolLayer symbolLayer("symbol", "source"); + std::vector symbolInstances; auto symbolBucket = std::make_shared( style::SymbolLayoutProperties::PossiblyEvaluated(), std::map< std::string, std::pair>(), - 16.0f, 1.0f, 0.0f, false, false); + 16.0f, 1.0f, 0.0f, false, false, false, symbolInstances); // Simulate placement of a symbol layer. tile.onPlacement(GeometryTile::PlacementResult { @@ -84,7 +84,6 @@ TEST(VectorTile, Issue7615) { symbolLayer.getID(), symbolBucket }}, - nullptr, {}, {}, }, 0); -- cgit v1.2.1