summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/map/transform.cpp37
-rw-r--r--test/src/mbgl/test/mock_view.hpp26
-rw-r--r--test/style/source.cpp4
-rw-r--r--test/test.gypi1
-rw-r--r--test/util/tile_cover.cpp4
5 files changed, 14 insertions, 58 deletions
diff --git a/test/map/transform.cpp b/test/map/transform.cpp
index b9a905274a..3cf542c4f3 100644
--- a/test/map/transform.cpp
+++ b/test/map/transform.cpp
@@ -1,5 +1,4 @@
#include <mbgl/test/util.hpp>
-#include <mbgl/test/mock_view.hpp>
#include <mbgl/map/transform.hpp>
#include <mbgl/util/geo.hpp>
@@ -7,8 +6,7 @@
using namespace mbgl;
TEST(Transform, InvalidScale) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
@@ -47,8 +45,7 @@ TEST(Transform, InvalidScale) {
}
TEST(Transform, InvalidLatLng) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
@@ -83,8 +80,7 @@ TEST(Transform, InvalidLatLng) {
TEST(Transform, InvalidBearing) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
@@ -108,10 +104,9 @@ TEST(Transform, InvalidBearing) {
}
TEST(Transform, PerspectiveProjection) {
- MockView view;
LatLng loc;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({{ 1000, 1000 }});
transform.setScale(2 << 9);
transform.setPitch(0.9);
@@ -141,8 +136,7 @@ TEST(Transform, PerspectiveProjection) {
}
TEST(Transform, UnwrappedLatLng) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({{ 1000, 1000 }});
transform.setScale(2 << 9);
transform.setPitch(0.9);
@@ -172,10 +166,9 @@ TEST(Transform, UnwrappedLatLng) {
}
TEST(Transform, ConstrainHeightOnly) {
- MockView view;
LatLng loc;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({{ 1000, 1000 }});
transform.setScale(std::pow(2, util::MAX_ZOOM));
@@ -191,10 +184,9 @@ TEST(Transform, ConstrainHeightOnly) {
}
TEST(Transform, ConstrainWidthAndHeight) {
- MockView view;
LatLng loc;
- Transform transform(view, ConstrainMode::WidthAndHeight, ViewportMode::Default);
+ Transform transform(nullptr, ConstrainMode::WidthAndHeight);
transform.resize({{ 1000, 1000 }});
transform.setScale(std::pow(2, util::MAX_ZOOM));
@@ -210,8 +202,7 @@ TEST(Transform, ConstrainWidthAndHeight) {
}
TEST(Transform, Anchor) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({{ 1000, 1000 }});
const LatLng latLng { 10, -100 };
@@ -311,8 +302,7 @@ TEST(Transform, Anchor) {
}
TEST(Transform, Padding) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({{ 1000, 1000 }});
ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
@@ -349,8 +339,7 @@ TEST(Transform, Padding) {
}
TEST(Transform, MoveBy) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({{ 1000, 1000 }});
transform.setLatLngZoom({ 0, 0 }, 10);
@@ -377,8 +366,7 @@ TEST(Transform, MoveBy) {
}
TEST(Transform, Antimeridian) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({{ 1000, 1000 }});
transform.setLatLngZoom({ 0, 0 }, 1);
@@ -421,8 +409,7 @@ TEST(Transform, Antimeridian) {
}
TEST(Transform, Camera) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({{ 1000, 1000 }});
const LatLng latLng1 { 45, 135 };
diff --git a/test/src/mbgl/test/mock_view.hpp b/test/src/mbgl/test/mock_view.hpp
deleted file mode 100644
index 50ae466d19..0000000000
--- a/test/src/mbgl/test/mock_view.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef TEST_FIXTURES_MOCK_VIEW
-#define TEST_FIXTURES_MOCK_VIEW
-
-#include <mbgl/map/view.hpp>
-
-#include <array>
-
-namespace mbgl {
-
-class MockView : public View {
-public:
- MockView() = default;
-
- // View implementation.
- float getPixelRatio() const override { return 1; }
- std::array<uint16_t, 2> getSize() const override { return {{ 0, 0 }}; }
- std::array<uint16_t, 2> getFramebufferSize() const override { return {{ 0, 0 }}; }
-
- void activate() override {};
- void deactivate() override {};
- void invalidate() override {}
-};
-
-}
-
-#endif
diff --git a/test/style/source.cpp b/test/style/source.cpp
index 156aff71ad..622ec7ae7e 100644
--- a/test/style/source.cpp
+++ b/test/style/source.cpp
@@ -1,6 +1,5 @@
#include <mbgl/test/util.hpp>
#include <mbgl/test/stub_file_source.hpp>
-#include <mbgl/test/mock_view.hpp>
#include <mbgl/test/stub_style_observer.hpp>
#include <mbgl/source/source.hpp>
@@ -24,8 +23,7 @@ public:
util::RunLoop loop;
StubFileSource fileSource;
StubStyleObserver observer;
- MockView view;
- Transform transform { view, ConstrainMode::HeightOnly, ViewportMode::Default };
+ Transform transform;
TransformState transformState;
Worker worker { 1 };
gl::TexturePool texturePool;
diff --git a/test/test.gypi b/test/test.gypi
index 1db886e097..5c04262644 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -80,7 +80,6 @@
'src/mbgl/test/stub_file_source.hpp',
'src/mbgl/test/stub_file_source.cpp',
- 'src/mbgl/test/mock_view.hpp',
'src/mbgl/test/util.hpp',
'src/mbgl/test/util.cpp',
'src/mbgl/test/fixture_log_observer.hpp',
diff --git a/test/util/tile_cover.cpp b/test/util/tile_cover.cpp
index a0cc8eb3eb..cc183509d9 100644
--- a/test/util/tile_cover.cpp
+++ b/test/util/tile_cover.cpp
@@ -1,7 +1,6 @@
#include <mbgl/util/tile_cover.hpp>
#include <mbgl/util/geo.hpp>
#include <mbgl/map/transform.hpp>
-#include <mbgl/test/mock_view.hpp>
#include <gtest/gtest.h>
@@ -29,8 +28,7 @@ TEST(TileCover, WorldZ0) {
}
TEST(TileCover, Pitch) {
- MockView view;
- Transform transform(view, ConstrainMode::HeightOnly, ViewportMode::Default);
+ Transform transform;
transform.resize({ { 512, 512 } });
transform.setZoom(2);
transform.setPitch(40.0 * M_PI / 180.0);
View Lorry Controller Status