From ab5e496219609b1e0a71508db9ed9d5fef29e7df Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 27 Jun 2018 13:28:05 -0700 Subject: [tests] Replaced the ZoomHistory test with a render test --- test/api/zoom_history.cpp | 71 -------------------------------- test/fixtures/zoom_history/expected.png | Bin 3894 -> 0 bytes 2 files changed, 71 deletions(-) delete mode 100644 test/api/zoom_history.cpp delete mode 100644 test/fixtures/zoom_history/expected.png (limited to 'test') diff --git a/test/api/zoom_history.cpp b/test/api/zoom_history.cpp deleted file mode 100644 index df9b6ff2a3..0000000000 --- a/test/api/zoom_history.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace mbgl; -using namespace mbgl::style; - -TEST(API, ZoomHistory) { - util::RunLoop loop; - - StubFileSource fileSource; - ThreadPool threadPool(4); - float pixelRatio { 1 }; - - HeadlessFrontend frontend { pixelRatio, fileSource, threadPool }; - auto map = std::make_unique(frontend, MapObserver::nullObserver(), frontend.getSize(), - pixelRatio, fileSource, threadPool, MapMode::Static); - - EXPECT_TRUE(map); - - map->getStyle().loadJSON(util::read_file("test/fixtures/api/empty.json")); - - auto source = std::make_unique("source"); - source->setGeoJSON({ LineString { { 45, -45 }, { -45, 45 } } }); - map->getStyle().addSource(std::move(source)); - - auto layer = std::make_unique("layer-1", "source"); - layer->setLineWidth(CameraFunction { ExponentialStops {{ { 0, 8 }, { 1, 16 } }} }); - layer->setLineDasharray({ std::vector { 1, 1 } }); - layer->setLineColor( { Color::black() } ); - map->getStyle().addLayer(std::move(layer)); - - layer = std::make_unique("layer-2", "source"); - layer->setLineWidth(CameraFunction { ExponentialStops {{ { 0, 4 }, { 1, 8 } }} }); - layer->setLineDasharray({ std::vector { 2, 2 } }); - layer->setLineColor( { Color::red() } ); - map->getStyle().addLayer(std::move(layer)); - - // ZoomHistory.lastIntegerZoom is 1. - map->setZoom(1.0); - frontend.render(*map); - - map->setZoom(0.0); - frontend.render(*map); - - // ZoomHistory.lastIntegerZoom should be 0. - map->setZoom(0.5); - test::checkImage("test/fixtures/zoom_history", frontend.render(*map), 0.0002); - - map->setZoom(1.0); - frontend.render(*map); - - map->setZoom(0.5); - test::checkImage("test/fixtures/zoom_history", frontend.render(*map), 0.0002); -} diff --git a/test/fixtures/zoom_history/expected.png b/test/fixtures/zoom_history/expected.png deleted file mode 100644 index 100dc508a4..0000000000 Binary files a/test/fixtures/zoom_history/expected.png and /dev/null differ -- cgit v1.2.1