tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #3963 - move and relax if permission check

Browse Source 
[android] #3963 - update unit tests, moved permission check to MapView to be mocked during tests
This commit is contained in:
Tobrun
2016-02-16 10:16:00 +01:00
parent 4baee63d8e
commit 373cd33df0
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
View File

@@ -1,7 +1,10 @@
package com.mapbox.mapboxsdk.maps;
import android.Manifest;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.graphics.Point;
import android.support.v4.content.ContextCompat;
import com.mapbox.mapboxsdk.annotations.Marker;
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
@@ -61,7 +64,7 @@ public class MapboxMapTest {
}
@Test
public void testGetMapView(){
public void testGetMapView() {
assertNotNull("MapView should be non null", mMapboxMap.getMapView());
}
@@ -106,22 +109,17 @@ public class MapboxMapTest {
@Test
public void testMyLocationEnabled() {
try {
mMapboxMap.setMyLocationEnabled(true);
assertTrue("MyLocationEnabled should be true", mMapboxMap.isMyLocationEnabled());
} catch (SecurityException e) {
assertTrue(false);
}
when(mMapView.isPermissionsAccepted()).thenReturn(true);
mMapboxMap.setMyLocationEnabled(true);
assertTrue("MyLocationEnabled should be true", mMapboxMap.isMyLocationEnabled());
}
@Test
public void testMyLocationDisabled() {
try {
mMapboxMap.setMyLocationEnabled(false);
assertFalse("MyLocationEnabled should be false", mMapboxMap.isMyLocationEnabled());
} catch (SecurityException e) {
assertTrue(false);
}
when(mMapView.isPermissionsAccepted()).thenReturn(true);
mMapboxMap.setMyLocationEnabled(false);
assertFalse("MyLocationEnabled should be false", mMapboxMap.isMyLocationEnabled());
}
//