From 11933f6ab81248a884db3b1f69be714a60b6a86c Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 18 Jul 2017 20:21:57 -0700 Subject: [core] Remove API tests that are covered by node tests --- cmake/test-files.cmake | 2 - test/api/render_missing.test.cpp | 71 ---------------------- test/api/repeated_render.test.cpp | 80 ------------------------- test/fixtures/api/repeated_render/expected.png | Bin 31046 -> 0 bytes 4 files changed, 153 deletions(-) delete mode 100644 test/api/render_missing.test.cpp delete mode 100644 test/api/repeated_render.test.cpp delete mode 100644 test/fixtures/api/repeated_render/expected.png diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 3595233f2a..1bae959bb7 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -17,8 +17,6 @@ set(MBGL_TEST_FILES test/api/api_misuse.test.cpp test/api/custom_layer.test.cpp test/api/query.test.cpp - test/api/render_missing.test.cpp - test/api/repeated_render.test.cpp # gl test/gl/bucket.test.cpp diff --git a/test/api/render_missing.test.cpp b/test/api/render_missing.test.cpp deleted file mode 100644 index 02c19d359b..0000000000 --- a/test/api/render_missing.test.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#if TEST_HAS_SERVER -#define TEST_REQUIRES_SERVER(name) name -#else -#define TEST_REQUIRES_SERVER(name) DISABLED_ ## name -#endif - -TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) { - using namespace mbgl; - - util::RunLoop loop; - - const auto style = util::read_file("test/fixtures/api/water_missing_tiles.json"); - - HeadlessBackend backend; - BackendScope scope { backend }; - OffscreenView view { backend.getContext(), { 256, 512 } }; - float pixelRatio { 1 }; - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); - ThreadPool threadPool(4); - StubRendererFrontend rendererFrontend { std::make_unique(backend, pixelRatio, fileSource, threadPool), view }; - - Log::setObserver(std::make_unique()); - - Map map { rendererFrontend, MapObserver::nullObserver(), view.getSize(), pixelRatio, fileSource, - threadPool, MapMode::Still }; - - std::string message; - - // This host does not respond (== connection error). - // Are you seeing this test fail? Make sure you don't have a server running on port 3001! - map.getStyle().loadJSON(style); - map.renderStill([&](std::exception_ptr err) { - ASSERT_TRUE(err.operator bool()); - try { - std::rethrow_exception(err); - } catch (const std::exception& ex) { - message = ex.what(); - EXPECT_TRUE(message.find("onnect") != std::string::npos); // [C|c]onnect - } - loop.stop(); - }); - - loop.run(); - - auto observer = Log::removeObserver(); - auto flo = dynamic_cast(observer.get()); - EXPECT_EQ(1u, flo->count(FixtureLog::Message( - EventSeverity::Error, Event::Style, -1, - std::string("Failed to load tile 0/0/0=>0 for source mapbox: " + message)))); - auto unchecked = flo->unchecked(); - EXPECT_TRUE(unchecked.empty()) << unchecked; -} diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp deleted file mode 100644 index be5336fe24..0000000000 --- a/test/api/repeated_render.test.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -using namespace mbgl; - - -TEST(API, RepeatedRender) { - - util::RunLoop loop; - - const auto style = util::read_file("test/fixtures/api/water.json"); - - HeadlessBackend backend; - BackendScope scope { backend }; - OffscreenView view { backend.getContext(), { 512, 512 } }; - float pixelRatio { 1 }; - DefaultFileSource fileSource(":memory:", "test/fixtures/api/assets"); - ThreadPool threadPool(4); - StubRendererFrontend rendererFrontend { - std::make_unique(backend, pixelRatio, fileSource, threadPool), view }; - - Log::setObserver(std::make_unique()); - - Map map(rendererFrontend, MapObserver::nullObserver(), view.getSize(), pixelRatio, fileSource, - threadPool, MapMode::Still); - - { - map.getStyle().loadJSON(style); - PremultipliedImage result; - map.renderStill([&](std::exception_ptr) { - result = view.readStillImage(); - }); - - while (!result.valid()) { - loop.runOnce(); - } - - ASSERT_EQ(512u, result.size.width); - ASSERT_EQ(512u, result.size.height); - test::checkImage("test/fixtures/api/repeated_render", result, 0.0003, 0.1); - } - - { - map.getStyle().loadJSON(style); - PremultipliedImage result; - map.renderStill([&](std::exception_ptr) { - result = view.readStillImage(); - }); - - while (!result.valid()) { - loop.runOnce(); - } - - ASSERT_EQ(512u, result.size.width); - ASSERT_EQ(512u, result.size.height); - test::checkImage("test/fixtures/api/repeated_render", result, 0.0003, 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/repeated_render/expected.png b/test/fixtures/api/repeated_render/expected.png deleted file mode 100644 index 927f6d4c82..0000000000 Binary files a/test/fixtures/api/repeated_render/expected.png and /dev/null differ -- cgit v1.2.1