From 4a15a7db79b22843e2a3fce3101ca67a6fda1820 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 8 Nov 2018 16:27:28 +0100 Subject: [android] - decouple style loading from OnMapReady --- .../mapbox/mapboxsdk/style/CustomGeometryTest.kt | 80 ---------------------- 1 file changed, 80 deletions(-) delete mode 100644 platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CustomGeometryTest.kt (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CustomGeometryTest.kt') diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CustomGeometryTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CustomGeometryTest.kt deleted file mode 100644 index 174173cd0d..0000000000 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CustomGeometryTest.kt +++ /dev/null @@ -1,80 +0,0 @@ -package com.mapbox.mapboxsdk.style - -import android.support.test.espresso.UiController -import com.mapbox.geojson.Feature -import com.mapbox.geojson.FeatureCollection -import com.mapbox.geojson.Point -import com.mapbox.mapboxsdk.maps.Style -import com.mapbox.mapboxsdk.maps.MapboxMap -import com.mapbox.mapboxsdk.style.layers.PropertyFactory.iconImage -import com.mapbox.mapboxsdk.style.layers.SymbolLayer -import com.mapbox.mapboxsdk.style.sources.GeoJsonSource -import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke -import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest -import com.mapbox.mapboxsdk.testapp.activity.maplayout.SimpleMapActivity -import org.junit.Test - -class CustomGeometrySourceTest : BaseActivityTest() { - - override fun getActivityClass(): Class<*> = SimpleMapActivity::class.java - - @Test - fun sourceUpdateAfterStyleChange() { - validateTestSetup() - invoke(mapboxMap) { uiController: UiController, mapboxMap: MapboxMap -> - val style = mapboxMap.style - - val source = GeoJsonSource( - "source-id", - FeatureCollection.fromFeature( - Feature.fromGeometry( - Point.fromLngLat(0.0, 0.0) - ) - ) - ) - style.addSource(source) - - style.loadStyle(Style.DARK) - - uiController.loopMainThreadForAtLeast(300) - - source.setGeoJson( - FeatureCollection.fromFeature( - Feature.fromGeometry( - Point.fromLngLat(1.0, 1.0) - ) - ) - ) - } - } - - @Test - fun layerUpdateAfterStyleChange() { - validateTestSetup() - invoke(mapboxMap) { uiController: UiController, mapboxMap: MapboxMap -> - val style = mapboxMap.style - - val source = GeoJsonSource( - "source-id", - FeatureCollection.fromFeature( - Feature.fromGeometry( - Point.fromLngLat(0.0, 0.0) - ) - ) - ) - style.addSource(source) - - val layer = SymbolLayer("test", "source-id") - style.addLayer(layer) - - style.loadStyle(Style.DARK) - - layer.setProperties(iconImage("bus-15")) - - uiController.loopMainThreadForAtLeast(300) - - layer.setProperties(iconImage("bus-15")) - } - } - -} \ No newline at end of file -- cgit v1.2.1