From c85193a0ad05fd4040ee711d606129e510dc45fe Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 21 Jul 2017 15:24:27 -0700 Subject: [PATCH] [core] Replace API.ZoomHistory test with integration test --- mapbox-gl-js | 2 +- platform/node/test/ignores.json | 2 + test/api/repeated_render.test.cpp | 63 ------------------------------ test/fixtures/api/z0/expected.png | Bin 5042 -> 0 bytes test/fixtures/api/z1/expected.png | Bin 5648 -> 0 bytes 5 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 test/fixtures/api/z0/expected.png delete mode 100644 test/fixtures/api/z1/expected.png diff --git a/mapbox-gl-js b/mapbox-gl-js index 0c225291a..9d72cc2c4 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit 0c225291ab77c6aa5e4b4ca41168c1e501d94be1 +Subproject commit 9d72cc2c461673525f1a6321314d2460c0f3324d diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index 1fbb93a4f..3a3358d8c 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -42,6 +42,8 @@ "render-tests/icon-text-fit/height": "https://github.com/mapbox/mapbox-gl-native/issues/5602", "render-tests/icon-text-fit/width-padding": "https://github.com/mapbox/mapbox-gl-native/issues/5602", "render-tests/icon-text-fit/width": "https://github.com/mapbox/mapbox-gl-native/issues/5602", + "render-tests/line-join/property-function": "https://github.com/mapbox/mapbox-gl-native/pull/9583", + "render-tests/line-join/property-function-dasharray": "https://github.com/mapbox/mapbox-gl-native/pull/9583", "render-tests/line-width/property-function": "https://github.com/mapbox/mapbox-gl-js/issues/3682#issuecomment-264348200", "render-tests/regressions/mapbox-gl-js#2305": "https://github.com/mapbox/mapbox-gl-native/issues/6927", "render-tests/regressions/mapbox-gl-js#3010": "skip - needs issue", diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp index 0e8a2715b..be5336fe2 100644 --- a/test/api/repeated_render.test.cpp +++ b/test/api/repeated_render.test.cpp @@ -78,66 +78,3 @@ TEST(API, RepeatedRender) { auto unchecked = flo->unchecked(); EXPECT_TRUE(unchecked.empty()) << unchecked; } - -TEST(API, ZoomHistory) { - util::RunLoop loop; - - const auto style = util::read_file("test/fixtures/api/empty.json"); - - HeadlessBackend backend; - BackendScope scope { backend }; - OffscreenView view { backend.getContext(), { 512, 512 } }; - DefaultFileSource fileSource(":memory:", "."); - ThreadPool threadPool(4); - - Log::setObserver(std::make_unique()); - - float pixelRatio { 1 }; - StubRendererFrontend rendererFrontend { - std::make_unique(backend, pixelRatio, fileSource, threadPool), view }; - Map map(rendererFrontend, MapObserver::nullObserver(), view.getSize(), pixelRatio, fileSource, threadPool, MapMode::Still); - map.getStyle().loadJSON(style); - - auto geojson = mapbox::geojson::parse(R"t({ "type": "FeatureCollection", "features": [{ "type": "Feature", "properties": {}, "geometry": { "type": "LineString", "coordinates": [ [ -150, -75 ], [ 150, 75 ] ] } } ] })t"); - auto source = std::make_unique("testSource"); - source->setGeoJSON(std::move(geojson)); - map.getStyle().addSource(std::move(source)); - - auto layer = std::make_unique("testLayer", "testSource"); - layer->setLineDasharray({ { 1.0f, 2.0f } }); - layer->setLineWidth({ 16.0f }); - map.getStyle().addLayer(std::move(layer)); - - { - PremultipliedImage result; - map.renderStill([&](std::exception_ptr) { - result = view.readStillImage(); - }); - - while (!result.valid()) { - loop.runOnce(); - } - - test::checkImage("test/fixtures/api/z0", result, 0.0002, 0.1); - } - - { - map.setZoom(1.0); - - PremultipliedImage result; - map.renderStill([&](std::exception_ptr) { - result = view.readStillImage(); - }); - - while (!result.valid()) { - loop.runOnce(); - } - - test::checkImage("test/fixtures/api/z1", result, 0.0002, 0.1); - } - - auto observer = Log::removeObserver(); - auto flo = dynamic_cast(observer.get()); - auto unchecked = flo->unchecked(); - EXPECT_TRUE(unchecked.empty()) << unchecked; -} diff --git a/test/fixtures/api/z0/expected.png b/test/fixtures/api/z0/expected.png deleted file mode 100644 index 0867a8cbf640b12f7ce2fd4544dd88b62b1522af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5042 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 IZ-RgL9|jurhyVZp diff --git a/test/fixtures/api/z1/expected.png b/test/fixtures/api/z1/expected.png deleted file mode 100644 index 897dc196ccb1d2ebeb3a43124913ac0354156cee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5648 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 Ks`@AO@P7l_G*!9)