diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java index 77025c8fa5..2f638ff651 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/MarkerTest.java @@ -1,9 +1,7 @@ package com.mapbox.mapboxsdk.testapp.annotations; -import android.support.test.espresso.Espresso; import android.support.test.espresso.UiController; import android.support.test.espresso.ViewAction; -import android.support.test.rule.ActivityTestRule; import android.view.View; import com.mapbox.mapboxsdk.annotations.Marker; @@ -11,16 +9,12 @@ import com.mapbox.mapboxsdk.annotations.MarkerOptions; import com.mapbox.mapboxsdk.geometry.LatLng; 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; -import com.mapbox.mapboxsdk.testapp.utils.ViewUtils; import org.hamcrest.Matcher; -import org.junit.After; -import org.junit.Before; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; import static android.support.test.espresso.Espresso.onView; @@ -30,25 +24,19 @@ import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; import static org.junit.Assert.assertEquals; -public class MarkerTest { +public class MarkerTest extends BaseActivityTest { - @Rule - public final ActivityTestRule<EspressoTestActivity> rule = new ActivityTestRule<>(EspressoTestActivity.class); - - private OnMapReadyIdlingResource idlingResource; private Marker marker; - @Before - public void registerIdlingResource() { - idlingResource = new OnMapReadyIdlingResource(rule.getActivity()); - Espresso.registerIdlingResources(idlingResource); + @Override + protected Class getActivityClass() { + return EspressoTestActivity.class; } @Test @Ignore public void addMarkerTest() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); assertEquals("Markers should be empty", 0, mapboxMap.getMarkers().size()); MarkerOptions options = new MarkerOptions(); @@ -69,8 +57,7 @@ public class MarkerTest { @Test @Ignore public void showInfoWindowTest() { - ViewUtils.checkViewIsDisplayed(R.id.mapView); - MapboxMap mapboxMap = rule.getActivity().getMapboxMap(); + validateTestSetup(); final MarkerOptions options = new MarkerOptions(); options.setPosition(new LatLng()); @@ -133,10 +120,4 @@ public class MarkerTest { } } - - - @After - public void unregisterIdlingResource() { - Espresso.unregisterIdlingResources(idlingResource); - } } |