diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java | 530 |
1 files changed, 344 insertions, 186 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java index e8af375d66..1685c30569 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java @@ -22,6 +22,7 @@ import com.mapbox.mapboxsdk.style.layers.SymbolLayer; 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 SymbolLayer */ @RunWith(AndroidJUnit4.class) -public class SymbolLayerTest extends BaseStyleTest { - - @Rule - public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class); +public class SymbolLayerTest extends BaseActivityTest { private SymbolLayer 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 SymbolLayer("my-layer", "composite"); @@ -71,7 +66,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testSetVisibility() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("Visibility"); assertNotNull(layer); @@ -86,7 +82,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testSymbolPlacementAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("symbol-placement"); assertNotNull(layer); @@ -97,7 +94,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testSymbolPlacementAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("symbol-placement"); assertNotNull(layer); @@ -123,7 +121,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testSymbolSpacingAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("symbol-spacing"); assertNotNull(layer); @@ -134,7 +133,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testSymbolSpacingAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("symbol-spacing"); assertNotNull(layer); @@ -161,7 +161,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testSymbolAvoidEdgesAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("symbol-avoid-edges"); assertNotNull(layer); @@ -172,7 +173,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testSymbolAvoidEdgesAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("symbol-avoid-edges"); assertNotNull(layer); @@ -198,7 +200,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconAllowOverlapAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-allow-overlap"); assertNotNull(layer); @@ -209,7 +212,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconAllowOverlapAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-allow-overlap"); assertNotNull(layer); @@ -235,7 +239,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconIgnorePlacementAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-ignore-placement"); assertNotNull(layer); @@ -246,7 +251,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconIgnorePlacementAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-ignore-placement"); assertNotNull(layer); @@ -272,7 +278,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOptionalAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-optional"); assertNotNull(layer); @@ -283,7 +290,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOptionalAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-optional"); assertNotNull(layer); @@ -309,7 +317,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconRotationAlignmentAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-rotation-alignment"); assertNotNull(layer); @@ -320,7 +329,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconRotationAlignmentAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-rotation-alignment"); assertNotNull(layer); @@ -346,7 +356,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconSizeAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-size"); assertNotNull(layer); @@ -357,7 +368,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconSizeAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-size"); assertNotNull(layer); @@ -384,7 +396,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTextFitAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-text-fit"); assertNotNull(layer); @@ -395,7 +408,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTextFitAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-text-fit"); assertNotNull(layer); @@ -421,7 +435,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTextFitPaddingAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-text-fit-padding"); assertNotNull(layer); @@ -432,7 +447,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTextFitPaddingAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-text-fit-padding"); assertNotNull(layer); @@ -459,7 +475,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconImageAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-image"); assertNotNull(layer); @@ -470,7 +487,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconImageAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-image"); assertNotNull(layer); @@ -493,10 +511,10 @@ public class SymbolLayerTest extends BaseStyleTest { assertEquals(1, ((IntervalStops) layer.getIconImage().getFunction().getStops()).size()); } - @Test public void testIconImageAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-image"); assertNotNull(layer); @@ -515,7 +533,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconImageAsIntervalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-image"); assertNotNull(layer); @@ -539,9 +558,11 @@ public class SymbolLayerTest extends BaseStyleTest { assertEquals(IntervalStops.class, layer.getIconImage().getFunction().getStops().getClass()); } + @Test public void testIconRotateAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-rotate"); assertNotNull(layer); @@ -552,7 +573,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconRotateAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-rotate"); assertNotNull(layer); @@ -578,7 +600,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconRotateAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-rotate"); assertNotNull(layer); @@ -597,7 +620,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconRotateAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-rotate"); assertNotNull(layer); @@ -623,7 +647,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconRotateAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-rotate"); assertNotNull(layer); @@ -652,7 +677,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconRotateAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-rotate"); assertNotNull(layer); @@ -687,7 +713,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconPaddingAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-padding"); assertNotNull(layer); @@ -698,7 +725,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconPaddingAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-padding"); assertNotNull(layer); @@ -725,7 +753,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconKeepUprightAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-keep-upright"); assertNotNull(layer); @@ -736,7 +765,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconKeepUprightAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-keep-upright"); assertNotNull(layer); @@ -762,7 +792,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOffsetAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-offset"); assertNotNull(layer); @@ -773,7 +804,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOffsetAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-offset"); assertNotNull(layer); @@ -799,7 +831,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOffsetAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-offset"); assertNotNull(layer); @@ -818,7 +851,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOffsetAsIntervalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-offset"); assertNotNull(layer); @@ -845,7 +879,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextPitchAlignmentAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-pitch-alignment"); assertNotNull(layer); @@ -856,7 +891,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextPitchAlignmentAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-pitch-alignment"); assertNotNull(layer); @@ -882,7 +918,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextRotationAlignmentAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-rotation-alignment"); assertNotNull(layer); @@ -893,7 +930,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextRotationAlignmentAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-rotation-alignment"); assertNotNull(layer); @@ -919,7 +957,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextFieldAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-field"); assertNotNull(layer); @@ -930,7 +969,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextFieldAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-field"); assertNotNull(layer); @@ -955,7 +995,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextFieldAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-field"); assertNotNull(layer); @@ -974,7 +1015,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextFieldAsIntervalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-field"); assertNotNull(layer); @@ -1001,7 +1043,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextFontAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-font"); assertNotNull(layer); @@ -1012,7 +1055,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextFontAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-font"); assertNotNull(layer); @@ -1038,7 +1082,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextSizeAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-size"); assertNotNull(layer); @@ -1049,7 +1094,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextSizeAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-size"); assertNotNull(layer); @@ -1076,7 +1122,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextMaxWidthAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-max-width"); assertNotNull(layer); @@ -1087,7 +1134,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextMaxWidthAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-max-width"); assertNotNull(layer); @@ -1114,7 +1162,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextLineHeightAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-line-height"); assertNotNull(layer); @@ -1125,7 +1174,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextLineHeightAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-line-height"); assertNotNull(layer); @@ -1152,7 +1202,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextLetterSpacingAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-letter-spacing"); assertNotNull(layer); @@ -1163,7 +1214,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextLetterSpacingAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-letter-spacing"); assertNotNull(layer); @@ -1190,7 +1242,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextJustifyAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-justify"); assertNotNull(layer); @@ -1201,7 +1254,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextJustifyAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-justify"); assertNotNull(layer); @@ -1227,7 +1281,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextAnchorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-anchor"); assertNotNull(layer); @@ -1238,7 +1293,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextAnchorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-anchor"); assertNotNull(layer); @@ -1264,7 +1320,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextMaxAngleAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-max-angle"); assertNotNull(layer); @@ -1275,7 +1332,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextMaxAngleAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-max-angle"); assertNotNull(layer); @@ -1302,7 +1360,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextRotateAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-rotate"); assertNotNull(layer); @@ -1313,7 +1372,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextRotateAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-rotate"); assertNotNull(layer); @@ -1337,10 +1397,10 @@ public class SymbolLayerTest extends BaseStyleTest { assertEquals(1, ((ExponentialStops) layer.getTextRotate().getFunction().getStops()).size()); } - @Test public void testTextRotateAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-rotate"); assertNotNull(layer); @@ -1359,7 +1419,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextRotateAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-rotate"); assertNotNull(layer); @@ -1385,7 +1446,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextRotateAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-rotate"); assertNotNull(layer); @@ -1414,7 +1476,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextRotateAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-rotate"); assertNotNull(layer); @@ -1446,9 +1509,11 @@ public class SymbolLayerTest extends BaseStyleTest { assertEquals(0.9f, stop.out, 0.001f); } + @Test public void testTextPaddingAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-padding"); assertNotNull(layer); @@ -1459,7 +1524,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextPaddingAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-padding"); assertNotNull(layer); @@ -1486,7 +1552,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextKeepUprightAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-keep-upright"); assertNotNull(layer); @@ -1497,7 +1564,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextKeepUprightAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-keep-upright"); assertNotNull(layer); @@ -1523,7 +1591,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTransformAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-transform"); assertNotNull(layer); @@ -1534,7 +1603,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTransformAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-transform"); assertNotNull(layer); @@ -1559,7 +1629,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTransformAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-transform"); assertNotNull(layer); @@ -1578,7 +1649,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTransformAsIntervalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-transform"); assertNotNull(layer); @@ -1605,7 +1677,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOffsetAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-offset"); assertNotNull(layer); @@ -1616,7 +1689,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOffsetAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-offset"); assertNotNull(layer); @@ -1642,7 +1716,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOffsetAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-offset"); assertNotNull(layer); @@ -1661,7 +1736,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOffsetAsIntervalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-offset"); assertNotNull(layer); @@ -1688,7 +1764,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextAllowOverlapAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-allow-overlap"); assertNotNull(layer); @@ -1699,7 +1776,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextAllowOverlapAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-allow-overlap"); assertNotNull(layer); @@ -1725,7 +1803,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextIgnorePlacementAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-ignore-placement"); assertNotNull(layer); @@ -1736,7 +1815,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextIgnorePlacementAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-ignore-placement"); assertNotNull(layer); @@ -1762,7 +1842,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOptionalAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-optional"); assertNotNull(layer); @@ -1773,7 +1854,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOptionalAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-optional"); assertNotNull(layer); @@ -1798,7 +1880,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOpacityTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-opacityTransitionOptions"); assertNotNull(layer); @@ -1810,7 +1893,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOpacityAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-opacity"); assertNotNull(layer); @@ -1821,7 +1905,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOpacityAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-opacity"); assertNotNull(layer); @@ -1847,7 +1932,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOpacityAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-opacity"); assertNotNull(layer); @@ -1866,7 +1952,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOpacityAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-opacity"); assertNotNull(layer); @@ -1892,7 +1979,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOpacityAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-opacity"); assertNotNull(layer); @@ -1921,7 +2009,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconOpacityAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-opacity"); assertNotNull(layer); @@ -1955,7 +2044,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconColorTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-colorTransitionOptions"); assertNotNull(layer); @@ -1967,7 +2057,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconColorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-color"); assertNotNull(layer); @@ -1978,7 +2069,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconColorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-color"); assertNotNull(layer); @@ -2004,7 +2096,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconColorAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-color"); assertNotNull(layer); @@ -2023,7 +2116,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconColorAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-color"); assertNotNull(layer); @@ -2049,7 +2143,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconColorAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-color"); assertNotNull(layer); @@ -2078,7 +2173,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconColorAsIntConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-color"); assertNotNull(layer); @@ -2089,7 +2185,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloColorTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-colorTransitionOptions"); assertNotNull(layer); @@ -2101,7 +2198,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloColorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-color"); assertNotNull(layer); @@ -2112,7 +2210,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloColorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-color"); assertNotNull(layer); @@ -2138,7 +2237,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloColorAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-color"); assertNotNull(layer); @@ -2157,7 +2257,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloColorAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-color"); assertNotNull(layer); @@ -2183,7 +2284,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloColorAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-color"); assertNotNull(layer); @@ -2212,7 +2314,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloColorAsIntConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-color"); assertNotNull(layer); @@ -2223,7 +2326,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloWidthTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-widthTransitionOptions"); assertNotNull(layer); @@ -2235,7 +2339,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloWidthAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-width"); assertNotNull(layer); @@ -2246,7 +2351,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloWidthAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-width"); assertNotNull(layer); @@ -2272,7 +2378,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloWidthAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-width"); assertNotNull(layer); @@ -2291,7 +2398,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloWidthAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-width"); assertNotNull(layer); @@ -2317,7 +2425,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloWidthAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-width"); assertNotNull(layer); @@ -2346,7 +2455,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloWidthAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-width"); assertNotNull(layer); @@ -2380,7 +2490,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloBlurTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-blurTransitionOptions"); assertNotNull(layer); @@ -2392,7 +2503,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloBlurAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-blur"); assertNotNull(layer); @@ -2403,7 +2515,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloBlurAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-blur"); assertNotNull(layer); @@ -2429,7 +2542,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloBlurAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-blur"); assertNotNull(layer); @@ -2448,7 +2562,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloBlurAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-blur"); assertNotNull(layer); @@ -2474,7 +2589,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloBlurAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-blur"); assertNotNull(layer); @@ -2503,7 +2619,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconHaloBlurAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-halo-blur"); assertNotNull(layer); @@ -2537,7 +2654,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTranslateTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-translateTransitionOptions"); assertNotNull(layer); @@ -2549,7 +2667,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTranslateAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-translate"); assertNotNull(layer); @@ -2560,7 +2679,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTranslateAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-translate"); assertNotNull(layer); @@ -2587,7 +2707,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTranslateAnchorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-translate-anchor"); assertNotNull(layer); @@ -2598,7 +2719,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testIconTranslateAnchorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("icon-translate-anchor"); assertNotNull(layer); @@ -2623,7 +2745,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOpacityTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-opacityTransitionOptions"); assertNotNull(layer); @@ -2635,7 +2758,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOpacityAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-opacity"); assertNotNull(layer); @@ -2646,7 +2770,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOpacityAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-opacity"); assertNotNull(layer); @@ -2672,7 +2797,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOpacityAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-opacity"); assertNotNull(layer); @@ -2691,7 +2817,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOpacityAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-opacity"); assertNotNull(layer); @@ -2717,7 +2844,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOpacityAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-opacity"); assertNotNull(layer); @@ -2746,7 +2874,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextOpacityAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-opacity"); assertNotNull(layer); @@ -2780,7 +2909,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextColorTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-colorTransitionOptions"); assertNotNull(layer); @@ -2792,7 +2922,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextColorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-color"); assertNotNull(layer); @@ -2803,7 +2934,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextColorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-color"); assertNotNull(layer); @@ -2829,7 +2961,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextColorAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-color"); assertNotNull(layer); @@ -2848,7 +2981,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextColorAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-color"); assertNotNull(layer); @@ -2874,7 +3008,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextColorAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-color"); assertNotNull(layer); @@ -2903,7 +3038,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextColorAsIntConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-color"); assertNotNull(layer); @@ -2914,7 +3050,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloColorTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-colorTransitionOptions"); assertNotNull(layer); @@ -2926,7 +3063,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloColorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-color"); assertNotNull(layer); @@ -2937,7 +3075,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloColorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-color"); assertNotNull(layer); @@ -2963,7 +3102,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloColorAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-color"); assertNotNull(layer); @@ -2982,7 +3122,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloColorAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-color"); assertNotNull(layer); @@ -3008,7 +3149,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloColorAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-color"); assertNotNull(layer); @@ -3037,7 +3179,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloColorAsIntConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-color"); assertNotNull(layer); @@ -3048,7 +3191,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloWidthTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-widthTransitionOptions"); assertNotNull(layer); @@ -3060,7 +3204,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloWidthAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-width"); assertNotNull(layer); @@ -3071,7 +3216,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloWidthAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-width"); assertNotNull(layer); @@ -3097,7 +3243,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloWidthAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-width"); assertNotNull(layer); @@ -3116,7 +3263,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloWidthAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-width"); assertNotNull(layer); @@ -3142,7 +3290,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloWidthAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-width"); assertNotNull(layer); @@ -3171,7 +3320,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloWidthAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-width"); assertNotNull(layer); @@ -3205,7 +3355,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloBlurTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-blurTransitionOptions"); assertNotNull(layer); @@ -3217,7 +3368,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloBlurAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-blur"); assertNotNull(layer); @@ -3228,7 +3380,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloBlurAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-blur"); assertNotNull(layer); @@ -3254,7 +3407,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloBlurAsIdentitySourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-blur"); assertNotNull(layer); @@ -3273,7 +3427,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloBlurAsExponentialSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-blur"); assertNotNull(layer); @@ -3299,7 +3454,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloBlurAsCategoricalSourceFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-blur"); assertNotNull(layer); @@ -3328,7 +3484,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextHaloBlurAsCompositeFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-halo-blur"); assertNotNull(layer); @@ -3362,7 +3519,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTranslateTransition() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-translateTransitionOptions"); assertNotNull(layer); @@ -3374,7 +3532,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTranslateAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-translate"); assertNotNull(layer); @@ -3385,7 +3544,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTranslateAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-translate"); assertNotNull(layer); @@ -3412,7 +3572,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTranslateAnchorAsConstant() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-translate-anchor"); assertNotNull(layer); @@ -3423,7 +3584,8 @@ public class SymbolLayerTest extends BaseStyleTest { @Test public void testTextTranslateAnchorAsCameraFunction() { - checkViewIsDisplayed(R.id.mapView); + validateTestSetup(); + setupLayer(); Timber.i("text-translate-anchor"); assertNotNull(layer); @@ -3447,8 +3609,4 @@ public class SymbolLayerTest extends BaseStyleTest { } - @After - public void unregisterIntentServiceIdlingResource() { - Espresso.unregisterIdlingResources(idlingResource); - } } |