diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2019-01-18 13:59:41 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2019-01-21 10:06:58 +0100 |
| commit | c3566753498198eb05269e9bfa3c47bb67ccd685 (patch) | |
| tree | 76f437b0d3d62fb0636f1fe96ad62f20673ff41f | |
| parent | 3691a2b25e79c0ffc81d60907709339c4c8e2703 (diff) | |
| download | qtlocation-mapboxgl-c3566753498198eb05269e9bfa3c47bb67ccd685.tar.gz | |
[android] - update mock definition of LocationLayerControllerTest, update mockito
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java | 20 | ||||
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 2 |
2 files changed, 16 insertions, 6 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 e105909c8c..48577629b5 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 @@ -570,11 +570,21 @@ public class LocationLayerControllerTest { private LayerSourceProvider buildLayerProvider() { LayerSourceProvider layerSourceProvider = mock(LayerSourceProvider.class); - when(layerSourceProvider.generateLayer(SHADOW_LAYER)).thenReturn(mock(Layer.class)); - when(layerSourceProvider.generateLayer(BACKGROUND_LAYER)).thenReturn(mock(Layer.class)); - when(layerSourceProvider.generateLayer(FOREGROUND_LAYER)).thenReturn(mock(Layer.class)); - when(layerSourceProvider.generateLayer(BEARING_LAYER)).thenReturn(mock(Layer.class)); - when(layerSourceProvider.generateAccuracyLayer()).thenReturn(mock(Layer.class)); + + Layer shadowLayer = mock(Layer.class); + when(layerSourceProvider.generateLayer(SHADOW_LAYER)).thenReturn(shadowLayer); + + Layer backgroundLayer = mock(Layer.class); + when(layerSourceProvider.generateLayer(BACKGROUND_LAYER)).thenReturn(backgroundLayer); + + Layer foregroundLayer = mock(Layer.class); + when(layerSourceProvider.generateLayer(FOREGROUND_LAYER)).thenReturn(foregroundLayer); + + Layer bearingLayer = mock(Layer.class); + when(layerSourceProvider.generateLayer(BEARING_LAYER)).thenReturn(bearingLayer); + + Layer accuracyLayer = mock(Layer.class); + when(layerSourceProvider.generateAccuracyLayer()).thenReturn(accuracyLayer); return layerSourceProvider; } }
\ No newline at end of file diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index c044f4172b..5c0442c3a9 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -14,7 +14,7 @@ ext { testRunner : '1.0.2', leakCanary : '1.6.1', junit : '4.12', - mockito : '2.18.3', + mockito : '2.23.4', mockk : '1.8.13.kotlin13', robolectric : '3.8', timber : '4.7.1', |