Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Bring back 16718b0 and change unit test mock setup #13758

Merged
merged 2 commits into from
Jan 21, 2019
Merged

Bring back 16718b0 and change unit test mock setup #13758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16957f0
[android] - add library loading to peer objects
tobrun Jan 17, 2019
ca88a5d
[android] - update mock definition of LocationLayerControllerTest, up…
tobrun Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...orm/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.support.annotation.Nullable;

import com.google.gson.JsonElement;
import com.mapbox.mapboxsdk.LibraryLoader;
import com.mapbox.mapboxsdk.style.expressions.Expression;
import com.mapbox.mapboxsdk.style.types.Formatted;
import com.mapbox.mapboxsdk.utils.ThreadUtils;
Expand All @@ -20,6 +21,10 @@ public abstract class Layer {
private boolean invalidated;
private boolean detached;

static {
LibraryLoader.load();
}

@Keep
protected Layer(long nativePtr) {
checkThread();
Expand Down
6 changes: 6 additions & 0 deletions ...m/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/Source.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import android.support.annotation.Keep;

import android.support.annotation.NonNull;

import com.mapbox.mapboxsdk.LibraryLoader;
import com.mapbox.mapboxsdk.utils.ThreadUtils;

/**
Expand All @@ -15,6 +17,10 @@ public abstract class Source {

protected boolean detached;

static {
LibraryLoader.load();
}

/**
* Internal use
*
Expand Down
20 changes: 15 additions & 5 deletions ...GLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationLayerControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,11 +570,21 @@ private LayerFeatureProvider buildFeatureProvider(Feature feature, @NonNull Loca

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;
}
}
2 changes: 1 addition & 1 deletion platform/android/gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down