[android] test refactoring

mapbox · Aug 2, 2019 · ca202fc · ca202fc
1 parent 7a92fe2
commit ca202fc
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 10 deletions.
diff --git a/...boxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java b/...boxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java
@@ -1298,7 +1298,7 @@ public LocationComponentOptions build() {
 
       if (locationComponentOptions.layerAbove() != null && locationComponentOptions.layerBelow() != null) {
         throw new IllegalArgumentException("You cannot set both layerAbove and layerBelow options."
-          + "Choose one or the other.");
+          + " Choose one or the other.");
       }
 
       if (locationComponentOptions.pulseEnabled() == null) {

diff --git a/...AndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt b/...AndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationAnimatorCoordinatorTest.kt
@@ -40,7 +40,6 @@ class LocationAnimatorCoordinatorTest {
     val context: Context = mockk(relaxed = true)
 
     locationComponentOptions = LocationComponentOptions.builder(context)
-      .pulsingCircleEnabled(true)
       .build()
 
     locationAnimatorCoordinator = LocationAnimatorCoordinator(projection,
@@ -58,8 +57,7 @@ class LocationAnimatorCoordinatorTest {
       ANIMATOR_CAMERA_COMPASS_BEARING,
       ANIMATOR_LAYER_ACCURACY,
       ANIMATOR_ZOOM,
-      ANIMATOR_TILT,
-      ANIMATOR_PULSING_CIRCLE
+      ANIMATOR_TILT
     ))
   }
 
@@ -357,12 +355,6 @@ class LocationAnimatorCoordinatorTest {
     assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_TILT] != null)
   }
 
-  @Test
-  fun startPulsingCircle_animatorCreated() {
-    locationAnimatorCoordinator.startLocationComponentCirclePulsing(locationComponentOptions)
-    assertTrue(locationAnimatorCoordinator.animatorArray[ANIMATOR_PULSING_CIRCLE] != null)
-  }
-
   @Test
   fun feedNewTiltLevel_animatorValue() {
     val tilt = 30.0f

diff --git a/...K/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java b/...K/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java
@@ -3,9 +3,11 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.support.annotation.NonNull;
 
 import com.mapbox.mapboxsdk.R;
+import com.mapbox.mapboxsdk.location.modes.PulseMode;
 import com.mapbox.mapboxsdk.maps.Style;
 
 import org.junit.Before;
@@ -66,6 +68,44 @@ public void sanity() throws Exception {
     assertNotNull(locationComponentActivationOptions);
   }
 
+  @Test
+  public void sanityWithDefaultPulsingCircle() throws Exception {
+    when(style.isFullyLoaded()).thenReturn(true);
+
+    LocationComponentOptions locationComponentOptions = LocationComponentOptions.builder(context)
+        .accuracyAlpha(0.5f)
+        .pulsingCircleEnabled(true)
+        .build();
+    assertNotNull(locationComponentOptions);
+
+    LocationComponentActivationOptions locationComponentActivationOptions =
+        LocationComponentActivationOptions.builder(context, style)
+            .locationComponentOptions(locationComponentOptions)
+            .useDefaultLocationEngine(true)
+            .build();
+    assertNotNull(locationComponentActivationOptions);
+  }
+
+  @Test
+  public void sanityWithCustomizedPulsingCircle() throws Exception {
+    when(style.isFullyLoaded()).thenReturn(true);
+
+    LocationComponentOptions locationComponentOptions = LocationComponentOptions.builder(context)
+        .accuracyAlpha(0.5f)
+        .pulsingCircleEnabled(true)
+        .pulsingCircleColor(Color.RED)
+        .pulsingCircleInterpolator(PulseMode.LINEAR)
+        .build();
+    assertNotNull(locationComponentOptions);
+
+    LocationComponentActivationOptions locationComponentActivationOptions =
+        LocationComponentActivationOptions.builder(context, style)
+            .locationComponentOptions(locationComponentOptions)
+            .useDefaultLocationEngine(true)
+            .build();
+    assertNotNull(locationComponentActivationOptions);
+  }
+
   @Test
   public void includingBothStyleResAndComponentOptions_causesExceptionToBeThrown() throws Exception {