From 7c30e2bdd8911c10cf5f1c90854ed4aa5e79e912 Mon Sep 17 00:00:00 2001 From: langsmith Date: Mon, 30 Sep 2019 18:59:23 -0700 Subject: [android] initial fixes to latest failing tests for pulsing location component circle --- .../src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java | 1 + .../java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java index 58662112d9..1beba14e0b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java @@ -1239,6 +1239,7 @@ public final class LocationComponent { if (compassEngine != null) { updateCompassListenerState(false); } + cancelPulsingLocationCircle(); locationAnimatorCoordinator.cancelAllAnimations(); if (locationEngine != null) { locationEngine.removeLocationUpdates(currentLocationEngineListener); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt index f6ba03641b..1ca7b1788f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.kt @@ -290,7 +290,7 @@ class LocationLayerControllerTest : EspressoTest() { assertThat(mapboxMap.isLayerVisible(SHADOW_LAYER), `is`(true)) assertThat(mapboxMap.isLayerVisible(ACCURACY_LAYER), `is`(true)) assertThat(mapboxMap.isLayerVisible(BEARING_LAYER), `is`(false)) - assertThat(mapboxMap.isLayerVisible(PULSING_CIRCLE_LAYER), `is`(false)) + assertThat(mapboxMap.isLayerVisible(PULSING_CIRCLE_LAYER), `is`(true)) } } executeComponentTest(componentAction) -- cgit v1.2.1