diff options
author | Tobrun <tobrun@mapbox.com> | 2017-04-21 23:07:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-21 23:07:19 +0200 |
commit | eed7dedf030ed71aac6d004becef42dbec5606bf (patch) | |
tree | 4f3b6a327990887f8046e1c1988ebfdb757562a4 /platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java | |
parent | 43cc8dbdb80fb89ef13dd2fb039a481bc5a9f6ce (diff) | |
download | qtlocation-mapboxgl-eed7dedf030ed71aac6d004becef42dbec5606bf.tar.gz |
[android] - rework instrumentation tests (#8793)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java | 204 |
1 files changed, 127 insertions, 77 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java index 7263b5de73..1c23dd366b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java @@ -22,6 +22,7 @@ import com.mapbox.mapboxsdk.style.layers.LineLayer; import com.mapbox.mapboxsdk.testapp.R; import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity; import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource; +import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest; import org.junit.After; import org.junit.Before; @@ -37,28 +38,22 @@ import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; import com.mapbox.mapboxsdk.style.layers.TransitionOptions; +import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** * Basic smoke tests for LineLayer */ @RunWith(AndroidJUnit4.class) -public class LineLayerTest extends BaseStyleTest { - - @Rule - public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); +public class LineLayerTest extends BaseActivityTest { private LineLayer layer; - private OnMapReadyIdlingResource idlingResource; - - private MapboxMap mapboxMap; - - @Before - public void setup() { - idlingResource = new OnMapReadyIdlingResource(rule.getActivity()); - Espresso.registerIdlingResources(idlingResource); - mapboxMap = rule.getActivity().getMapboxMap(); + @Override + protected Class getActivityClass() { + return EspressoTestActivity.class; + } + private void setupLayer(){ if ((layer = mapboxMap.getLayerAs("my-layer")) == null) { Timber.i("Adding layer"); layer = new LineLayer("my-layer", "composite"); @@ -71,7 +66,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testSetVisibility() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("Visibility"); assertNotNull(layer); @@ -85,8 +81,9 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testSourceLayer() { - checkViewIsDisplayed(R.id.mapView); - Timber.i("Visibility"); + validateTestSetup(); + setupLayer(); + Timber.i("SourceLayer"); assertNotNull(layer); // Get initial @@ -100,7 +97,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineCapAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-cap"); assertNotNull(layer); @@ -111,7 +109,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineCapAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-cap"); assertNotNull(layer); @@ -136,7 +135,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineJoinAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-join"); assertNotNull(layer); @@ -147,7 +147,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineJoinAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-join"); assertNotNull(layer); @@ -172,7 +173,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineMiterLimitAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-miter-limit"); assertNotNull(layer); @@ -183,7 +185,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineMiterLimitAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-miter-limit"); assertNotNull(layer); @@ -209,7 +212,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineRoundLimitAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-round-limit"); assertNotNull(layer); @@ -220,7 +224,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineRoundLimitAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-round-limit"); assertNotNull(layer); @@ -246,7 +251,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOpacityTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-opacityTransitionOptions"); assertNotNull(layer); @@ -258,7 +264,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOpacityAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-opacity"); assertNotNull(layer); @@ -269,7 +276,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOpacityAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-opacity"); assertNotNull(layer); @@ -295,7 +303,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOpacityAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-opacity"); assertNotNull(layer); @@ -314,7 +323,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOpacityAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-opacity"); assertNotNull(layer); @@ -340,7 +350,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOpacityAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-opacity"); assertNotNull(layer); @@ -369,7 +380,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOpacityAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-opacity"); assertNotNull(layer); @@ -403,7 +415,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineColorTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-colorTransitionOptions"); assertNotNull(layer); @@ -415,7 +428,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineColorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-color"); assertNotNull(layer); @@ -426,7 +440,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineColorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-color"); assertNotNull(layer); @@ -452,7 +467,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineColorAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-color"); assertNotNull(layer); @@ -471,7 +487,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineColorAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-color"); assertNotNull(layer); @@ -497,7 +514,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineColorAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-color"); assertNotNull(layer); @@ -526,7 +544,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineColorAsIntConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-color"); assertNotNull(layer); @@ -537,7 +556,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineTranslateTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-translateTransitionOptions"); assertNotNull(layer); @@ -549,7 +569,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineTranslateAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-translate"); assertNotNull(layer); @@ -560,7 +581,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineTranslateAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-translate"); assertNotNull(layer); @@ -586,7 +608,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineTranslateAnchorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-translate-anchor"); assertNotNull(layer); @@ -597,7 +620,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineTranslateAnchorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-translate-anchor"); assertNotNull(layer); @@ -622,7 +646,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineWidthTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-widthTransitionOptions"); assertNotNull(layer); @@ -634,7 +659,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineWidthAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-width"); assertNotNull(layer); @@ -645,7 +671,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineWidthAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-width"); assertNotNull(layer); @@ -671,7 +698,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineGapWidthTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-gap-widthTransitionOptions"); assertNotNull(layer); @@ -683,7 +711,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineGapWidthAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-gap-width"); assertNotNull(layer); @@ -694,7 +723,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineGapWidthAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-gap-width"); assertNotNull(layer); @@ -720,7 +750,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineGapWidthAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-gap-width"); assertNotNull(layer); @@ -739,7 +770,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineGapWidthAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-gap-width"); assertNotNull(layer); @@ -765,7 +797,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineGapWidthAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-gap-width"); assertNotNull(layer); @@ -794,7 +827,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineGapWidthAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-gap-width"); assertNotNull(layer); @@ -828,7 +862,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOffsetTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-offsetTransitionOptions"); assertNotNull(layer); @@ -840,7 +875,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOffsetAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-offset"); assertNotNull(layer); @@ -851,7 +887,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOffsetAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-offset"); assertNotNull(layer); @@ -877,7 +914,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOffsetAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-offset"); assertNotNull(layer); @@ -896,7 +934,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOffsetAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-offset"); assertNotNull(layer); @@ -922,7 +961,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOffsetAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-offset"); assertNotNull(layer); @@ -951,7 +991,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineOffsetAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-offset"); assertNotNull(layer); @@ -985,7 +1026,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineBlurTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-blurTransitionOptions"); assertNotNull(layer); @@ -997,7 +1039,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineBlurAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-blur"); assertNotNull(layer); @@ -1008,7 +1051,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineBlurAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-blur"); assertNotNull(layer); @@ -1034,7 +1078,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineBlurAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-blur"); assertNotNull(layer); @@ -1053,7 +1098,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineBlurAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-blur"); assertNotNull(layer); @@ -1079,7 +1125,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineBlurAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-blur"); assertNotNull(layer); @@ -1108,7 +1155,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineBlurAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-blur"); assertNotNull(layer); @@ -1142,7 +1190,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineDasharrayTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-dasharrayTransitionOptions"); assertNotNull(layer); @@ -1154,7 +1203,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineDasharrayAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-dasharray"); assertNotNull(layer); @@ -1165,7 +1215,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLineDasharrayAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-dasharray"); assertNotNull(layer); @@ -1190,7 +1241,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLinePatternTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-patternTransitionOptions"); assertNotNull(layer); @@ -1202,7 +1254,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLinePatternAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-pattern"); assertNotNull(layer); @@ -1213,7 +1266,8 @@ public class LineLayerTest extends BaseStyleTest { @Test public void testLinePatternAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("line-pattern"); assertNotNull(layer); @@ -1236,8 +1290,4 @@ public class LineLayerTest extends BaseStyleTest { assertEquals(1, ((IntervalStops) layer.getLinePattern().getFunction().getStops()).size()); } - @After - public void unregisterIntentServiceIdlingResource() { - Espresso.unregisterIdlingResources(idlingResource); - } } |