summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java52
1 files changed, 14 insertions, 38 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 f72dcc2ff5..475fb81684 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
@@ -1,8 +1,8 @@
package com.mapbox.mapboxsdk.location;
import android.graphics.Bitmap;
-
import android.support.annotation.NonNull;
+
import com.google.gson.JsonElement;
import com.mapbox.geojson.Feature;
import com.mapbox.mapboxsdk.geometry.LatLng;
@@ -56,8 +56,7 @@ public class LocationLayerControllerTest {
LayerBitmapProvider bitmapProvider = mock(LayerBitmapProvider.class);
LocationComponentOptions options = mock(LocationComponentOptions.class);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addSource(locationSource);
}
@@ -72,8 +71,7 @@ public class LocationLayerControllerTest {
LayerBitmapProvider bitmapProvider = mock(LayerBitmapProvider.class);
LocationComponentOptions options = mock(LocationComponentOptions.class);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addLayerBelow(shadowLayer, BACKGROUND_LAYER);
}
@@ -88,8 +86,7 @@ public class LocationLayerControllerTest {
LayerBitmapProvider bitmapProvider = mock(LayerBitmapProvider.class);
LocationComponentOptions options = mock(LocationComponentOptions.class);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addLayerBelow(backgroundLayer, FOREGROUND_LAYER);
}
@@ -104,8 +101,7 @@ public class LocationLayerControllerTest {
LayerBitmapProvider bitmapProvider = mock(LayerBitmapProvider.class);
LocationComponentOptions options = mock(LocationComponentOptions.class);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addLayerBelow(foregroundLayer, BEARING_LAYER);
}
@@ -122,8 +118,7 @@ public class LocationLayerControllerTest {
String layerBelow = "layer-below";
when(options.layerBelow()).thenReturn(layerBelow);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addLayerBelow(bearingLayer, layerBelow);
}
@@ -138,8 +133,7 @@ public class LocationLayerControllerTest {
LayerBitmapProvider bitmapProvider = mock(LayerBitmapProvider.class);
LocationComponentOptions options = mock(LocationComponentOptions.class);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addLayerBelow(accuracyLayer, BACKGROUND_LAYER);
}
@@ -155,8 +149,7 @@ public class LocationLayerControllerTest {
when(options.elevation()).thenReturn(2f);
// Style is applied on initialization
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addImage(SHADOW_ICON, bitmap);
}
@@ -171,8 +164,7 @@ public class LocationLayerControllerTest {
LocationComponentOptions options = mock(LocationComponentOptions.class);
when(options.elevation()).thenReturn(0f);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style, times(0)).addImage(SHADOW_ICON, bitmap);
}
@@ -190,8 +182,7 @@ public class LocationLayerControllerTest {
Bitmap bitmap = mock(Bitmap.class);
when(bitmapProvider.generateBitmap(drawableResId, tintColor)).thenReturn(bitmap);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addImage(FOREGROUND_ICON, bitmap);
}
@@ -209,8 +200,7 @@ public class LocationLayerControllerTest {
Bitmap bitmap = mock(Bitmap.class);
when(bitmapProvider.generateBitmap(drawableResId, tintColor)).thenReturn(bitmap);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addImage(FOREGROUND_STALE_ICON, bitmap);
}
@@ -228,8 +218,7 @@ public class LocationLayerControllerTest {
Bitmap bitmap = mock(Bitmap.class);
when(bitmapProvider.generateBitmap(drawableResId, tintColor)).thenReturn(bitmap);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addImage(BACKGROUND_ICON, bitmap);
}
@@ -247,8 +236,7 @@ public class LocationLayerControllerTest {
Bitmap bitmap = mock(Bitmap.class);
when(bitmapProvider.generateBitmap(drawableResId, tintColor)).thenReturn(bitmap);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addImage(BACKGROUND_STALE_ICON, bitmap);
}
@@ -266,8 +254,7 @@ public class LocationLayerControllerTest {
Bitmap bitmap = mock(Bitmap.class);
when(bitmapProvider.generateBitmap(drawableResId, tintColor)).thenReturn(bitmap);
- new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options)
- .initializeComponents(options);
+ new LocationLayerController(mapboxMap, sourceProvider, buildFeatureProvider(options), bitmapProvider, options);
verify(style).addImage(BEARING_ICON, bitmap);
}
@@ -283,7 +270,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
layer.updateForegroundOffset(2d);
@@ -301,8 +287,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
-
layer.updateForegroundOffset(2d);
verify(locationFeature).addProperty(eq(PROPERTY_SHADOW_ICON_OFFSET), any(JsonElement.class));
@@ -320,8 +304,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
-
layer.onNewLatLngValue(new LatLng());
// wanted twice (once for initialization)
@@ -340,7 +322,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
layer.setRenderMode(RenderMode.GPS);
float gpsBearing = 2f;
@@ -361,7 +342,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
layer.setRenderMode(RenderMode.COMPASS);
float gpsBearing = 2f;
@@ -382,7 +362,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
layer.setRenderMode(RenderMode.COMPASS);
float compassBearing = 2f;
@@ -403,7 +382,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
layer.setRenderMode(RenderMode.GPS);
float compassBearing = 2f;
@@ -424,7 +402,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
float accuracyRadiusValue = 2f;
layer.onNewAccuracyRadiusValue(accuracyRadiusValue);
@@ -444,7 +421,6 @@ public class LocationLayerControllerTest {
LocationLayerController layer = new LocationLayerController(
mapboxMap, sourceProvider, buildFeatureProvider(locationFeature, options), bitmapProvider, options
);
- layer.initializeComponents(options);
layer.setRenderMode(RenderMode.GPS);
float accuracyRadiusValue = 2f;
View Lorry Controller Status