diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java | 47 |
1 files changed, 14 insertions, 33 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java index d4b0dbad72..c2b2781905 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/camera/CameraAnimateTest.java @@ -14,6 +14,7 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.testapp.R; +import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource; import com.mapbox.mapboxsdk.testapp.utils.TestConstants; @@ -31,24 +32,17 @@ import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static android.support.test.espresso.matcher.ViewMatchers.withId; import static org.junit.Assert.assertEquals; -public class CameraAnimateTest { +public class CameraAnimateTest extends BaseActivityTest { - @Rule - public final ActivityTestRule<EspressoTestActivity> rule = new ActivityTestRule<>(EspressoTestActivity.class); - - private OnMapReadyIdlingResource idlingResource; - - @Before - public void registerIdlingResource() { - idlingResource = new OnMapReadyIdlingResource(rule.getActivity()); - Espresso.registerIdlingResources(idlingResource); + @Override + protected Class getActivityClass() { + return EspressoTestActivity.class; } @Test @Ignore public void testAnimateToCameraPositionTarget() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); /*TODO remove zoom #6474*/ float zoom = 1.0f; @@ -70,8 +64,7 @@ public class CameraAnimateTest { @Test @Ignore public void testAnimateToCameraPositionTargetZoom() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); final float moveZoom = 15.5f; final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003); @@ -88,8 +81,7 @@ public class CameraAnimateTest { @Test public void testAnimateToCameraPosition() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); final LatLng moveTarget = new LatLng(1.0000000001, 1.0000000003); final float moveZoom = 15.5f; @@ -119,8 +111,7 @@ public class CameraAnimateTest { @Test @Ignore public void testAnimateToBounds() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); final LatLng centerBounds = new LatLng(1, 1); LatLng cornerOne = new LatLng(); @@ -148,8 +139,7 @@ public class CameraAnimateTest { @Test @Ignore public void testAnimateToMoveBy() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); final PointF centerPoint = mapboxMap.getProjection().toScreenLocation(mapboxMap.getCameraPosition().target); final LatLng moveTarget = new LatLng(2, 2); @@ -168,8 +158,7 @@ public class CameraAnimateTest { @Test @Ignore public void testAnimateToZoomIn() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); /*TODO fix zoom #6474*/ float zoom = 1.0f; @@ -183,8 +172,7 @@ public class CameraAnimateTest { @Test @Ignore public void testAnimateToZoomOut() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); /*TODO fix zoom #6474*/ float zoom = 10.0f; @@ -199,8 +187,7 @@ public class CameraAnimateTest { @Test @Ignore public void testAnimateToZoomBy() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); /*TODO fix zoom #6474*/ float zoom = 1.0f; @@ -215,8 +202,7 @@ public class CameraAnimateTest { @Test @Ignore public void testAnimateToZoomTo() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - final MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); /*TODO fix zoom #6474*/ final float zoomTo = 2.45f; @@ -227,11 +213,6 @@ public class CameraAnimateTest { TestConstants.ZOOM_DELTA); } - @After - public void unregisterIdlingResource() { - Espresso.unregisterIdlingResources(idlingResource); - } - private class AnimateCameraAction implements ViewAction { private MapboxMap mapboxMap; |