1 files changed, 105 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
index 68e31275f1..e105909c8c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
@@ -14,7 +14,9 @@ import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
+import static com.mapbox.mapboxsdk.location.LocationComponentConstants.ACCURACY_LAYER;
 import static com.mapbox.mapboxsdk.location.LocationComponentConstants.BACKGROUND_ICON;
 import static com.mapbox.mapboxsdk.location.LocationComponentConstants.BACKGROUND_LAYER;
 import static com.mapbox.mapboxsdk.location.LocationComponentConstants.BACKGROUND_STALE_ICON;
@@ -273,6 +275,109 @@ public class LocationLayerControllerTest {
   }
 
   @Test
+  public void applyStyle_layerBelowChanged() {
+    LayerSourceProvider sourceProvider = buildLayerProvider();
+    when(sourceProvider.generateSource(any(Feature.class))).thenReturn(mock(GeoJsonSource.class));
+
+    Layer bearingLayer = mock(Layer.class);
+    when(bearingLayer.getId()).thenReturn(BEARING_LAYER);
+    when(sourceProvider.generateLayer(BEARING_LAYER)).thenReturn(bearingLayer);
+    Layer foregroundLayer = mock(Layer.class);
+    when(foregroundLayer.getId()).thenReturn(FOREGROUND_LAYER);
+    when(sourceProvider.generateLayer(FOREGROUND_LAYER)).thenReturn(foregroundLayer);
+    Layer backgroundLayer = mock(Layer.class);
+    when(backgroundLayer.getId()).thenReturn(BACKGROUND_LAYER);
+    when(sourceProvider.generateLayer(BACKGROUND_LAYER)).thenReturn(backgroundLayer);
+    Layer shadowLayer = mock(Layer.class);
+    when(shadowLayer.getId()).thenReturn(SHADOW_LAYER);
+    when(sourceProvider.generateLayer(SHADOW_LAYER)).thenReturn(shadowLayer);
+    Layer accuracyLayer = mock(Layer.class);
+    when(accuracyLayer.getId()).thenReturn(ACCURACY_LAYER);
+    when(sourceProvider.generateAccuracyLayer()).thenReturn(accuracyLayer);
+
+    LocationComponentOptions options = mock(LocationComponentOptions.class);
+    LayerBitmapProvider bitmapProvider = mock(LayerBitmapProvider.class);
+    Bitmap bitmap = mock(Bitmap.class);
+    when(bitmapProvider.generateShadowBitmap(any(LocationComponentOptions.class))).thenReturn(bitmap);
+
+    LocationLayerController layerController =
+      new LocationLayerController(mapboxMap, mapboxMap.getStyle(), sourceProvider, buildFeatureProvider(options),
+        bitmapProvider, options);
+
+    Layer bearingLayer2 = mock(Layer.class);
+    when(sourceProvider.generateLayer(BEARING_LAYER)).thenReturn(bearingLayer2);
+    Layer foregroundLayer2 = mock(Layer.class);
+    when(sourceProvider.generateLayer(FOREGROUND_LAYER)).thenReturn(foregroundLayer2);
+    Layer backgroundLayer2 = mock(Layer.class);
+    when(sourceProvider.generateLayer(BACKGROUND_LAYER)).thenReturn(backgroundLayer2);
+    Layer shadowLayer2 = mock(Layer.class);
+    when(sourceProvider.generateLayer(SHADOW_LAYER)).thenReturn(shadowLayer2);
+    Layer accuracyLayer2 = mock(Layer.class);
+    when(sourceProvider.generateAccuracyLayer()).thenReturn(accuracyLayer2);
+    String layerBelow = "layer-below";
+    when(options.layerBelow()).thenReturn(layerBelow);
+
+    layerController.applyStyle(options);
+
+    verify(style).removeLayer(BEARING_LAYER);
+    verify(style).removeLayer(FOREGROUND_LAYER);
+    verify(style).removeLayer(BACKGROUND_LAYER);
+    verify(style).removeLayer(SHADOW_LAYER);
+    verify(style).removeLayer(ACCURACY_LAYER);
+
+    verify(style).addLayerBelow(bearingLayer2, layerBelow);
+    verify(style).addLayerBelow(foregroundLayer2, BEARING_LAYER);
+    verify(style).addLayerBelow(backgroundLayer2, FOREGROUND_LAYER);
+    verify(style).addLayerBelow(shadowLayer2, BACKGROUND_LAYER);
+    verify(style).addLayerBelow(accuracyLayer2, BACKGROUND_LAYER);
+  }
+
+  @Test
+  public void applyStyle_layerBelowNotChanged() {
+    LayerSourceProvider sourceProvider = buildLayerProvider();
+    when(sourceProvider.generateSource(any(Feature.class))).thenReturn(mock(GeoJsonSource.class));
+    LocationComponentOptions options = mock(LocationComponentOptions.class);
+    LayerBitmapProvider bitmapProvider = mock(LayerBitmapProvider.class);
+    Bitmap bitmap = mock(Bitmap.class);
+    when(bitmapProvider.generateShadowBitmap(any(LocationComponentOptions.class))).thenReturn(bitmap);
+
+    String layerBelow = "layer-below";
+    when(options.layerBelow()).thenReturn(layerBelow);
+
+    LocationLayerController layerController =
+      new LocationLayerController(mapboxMap, mapboxMap.getStyle(), sourceProvider, buildFeatureProvider(options),
+        bitmapProvider, options);
+
+    options = mock(LocationComponentOptions.class);
+    layerBelow = "layer-below";
+    when(options.layerBelow()).thenReturn(layerBelow);
+    layerController.applyStyle(options);
+
+    verify(style, times(0)).removeLayer(any(String.class));
+    verify(style, times(5)).addLayerBelow(any(Layer.class), any(String.class));
+  }
+
+  @Test
+  public void applyStyle_layerBelowNotChangedNull() {
+    LayerSourceProvider sourceProvider = buildLayerProvider();
+    when(sourceProvider.generateSource(any(Feature.class))).thenReturn(mock(GeoJsonSource.class));
+    LocationComponentOptions options = mock(LocationComponentOptions.class);
+    LayerBitmapProvider bitmapProvider = mock(LayerBitmapProvider.class);
+    Bitmap bitmap = mock(Bitmap.class);
+    when(bitmapProvider.generateShadowBitmap(any(LocationComponentOptions.class))).thenReturn(bitmap);
+
+    LocationLayerController layerController =
+      new LocationLayerController(mapboxMap, mapboxMap.getStyle(), sourceProvider, buildFeatureProvider(options),
+        bitmapProvider, options);
+
+    options = mock(LocationComponentOptions.class);
+    layerController.applyStyle(options);
+
+    verify(style, times(0)).removeLayer(any(String.class));
+    verify(style, times(5)).addLayerBelow(any(Layer.class), Mockito.<String>any());
+  }
+
+  @Test
   public void updateForegroundOffset_foregroundIconPropertyIsUpdated() {
     LayerSourceProvider sourceProvider = buildLayerProvider();
     GeoJsonSource locationSource = mock(GeoJsonSource.class);