[core] remove MockView and View dependency in Transform

This commit is contained in:
Konstantin Käfer
2016-05-11 13:45:27 +02:00
parent 1d84a8964e
commit 002393bdea
10 changed files with 76 additions and 91 deletions

View File

@@ -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 };