[android] #3776 - UiSettings uses MapView instead of MapboxMap as dependency. Cleanup obsolete methods MapboxMap/MapView, Renaming convention Google Maps SDK, Update tests, Some minor fixes in state management

1 files changed, 25 insertions, 33 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
index 1494c65b05..9c867bf776 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/UiSettingsTest.java
@@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.maps;
 
 import android.view.Gravity;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 
@@ -13,46 +12,39 @@ import static org.mockito.Mockito.mock;
 
 public class UiSettingsTest {
 
-    private MapboxMap mMapboxMap;
-
     @InjectMocks
     MapView mMapView = mock(MapView.class);
 
-    @Before
-    public void beforeTest() {
-        mMapboxMap = new MapboxMap(mMapView);
-    }
-
     @Test
     public void testSanity() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         assertNotNull("uiSettings should not be null", uiSettings);
     }
 
     @Test
     public void testCompassEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setCompassEnabled(true);
         assertEquals("Compass should be enabled", true, uiSettings.isCompassEnabled());
     }
 
     @Test
     public void testCompassDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setCompassEnabled(false);
         assertEquals("Compass should be disabled", false, uiSettings.isCompassEnabled());
     }
 
     @Test
     public void testCompassGravity() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setCompassGravity(Gravity.LEFT);
         assertEquals("Compass gravity should be same", Gravity.LEFT, uiSettings.getCompassGravity());
     }
 
     @Test
     public void testCompassMargins() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setCompassMargins(1, 2, 3, 4);
         assertTrue("Compass margin left should be same", uiSettings.getCompassMarginLeft() == 1);
         assertTrue("Compass margin top should be same", uiSettings.getCompassMarginTop() == 2);
@@ -62,28 +54,28 @@ public class UiSettingsTest {
 
     @Test
     public void testLogoEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setLogoEnabled(true);
         assertEquals("Logo should be enabled", true, uiSettings.isLogoEnabled());
     }
 
     @Test
     public void testLogoDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setLogoEnabled(false);
         assertEquals("Logo should be disabled", false, uiSettings.isLogoEnabled());
     }
 
     @Test
     public void testLogoGravity() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setLogoGravity(Gravity.RIGHT);
         assertEquals("Logo gravity should be same", Gravity.RIGHT, uiSettings.getLogoGravity());
     }
 
     @Test
     public void testLogoMargins() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setLogoMargins(1, 2, 3, 4);
         assertTrue("Compass margin left should be same", uiSettings.getLogoMarginLeft() == 1);
         assertTrue("Compass margin top should be same", uiSettings.getLogoMarginTop() == 2);
@@ -93,28 +85,28 @@ public class UiSettingsTest {
 
     @Test
     public void testAttributionEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setAttributionEnabled(true);
         assertEquals("Attribution should be enabled", true, uiSettings.isAttributionEnabled());
     }
 
     @Test
     public void testAttributionDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setAttributionEnabled(false);
         assertEquals("Attribution should be disabled", false, uiSettings.isLogoEnabled());
     }
 
     @Test
     public void testAttributionGravity() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setAttributionGravity(Gravity.RIGHT);
         assertEquals("Attribution gravity should be same", Gravity.RIGHT, uiSettings.getAttributionGravity());
     }
 
     @Test
     public void testAttributionMargins() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setAttributionMargins(1, 2, 3, 4);
         assertTrue("Attribution margin left should be same", uiSettings.getAttributionMarginLeft() == 1);
         assertTrue("Attribution margin top should be same", uiSettings.getAttributionMarginTop() == 2);
@@ -124,77 +116,77 @@ public class UiSettingsTest {
 
     @Test
     public void testRotateGesturesEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setRotateGesturesEnabled(true);
         assertEquals("Rotate gesture should be enabled", true, uiSettings.isRotateGesturesEnabled());
     }
 
     @Test
     public void testRotateGesturesDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setRotateGesturesEnabled(false);
         assertEquals("Rotate gesture should be disabled", false, uiSettings.isRotateGesturesEnabled());
     }
 
     @Test
     public void testTiltGesturesEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setTiltGesturesEnabled(true);
         assertEquals("Tilt gesture should be enabled", true, uiSettings.isTiltGesturesEnabled());
     }
 
     @Test
     public void testTiltGesturesDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setTiltGesturesEnabled(false);
         assertEquals("Tilt gesture should be disabled", false, uiSettings.isTiltGesturesEnabled());
     }
 
     @Test
     public void testZoomGesturesEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setZoomGesturesEnabled(true);
         assertEquals("Zoom gesture should be enabled", true, uiSettings.isZoomGesturesEnabled());
     }
 
     @Test
     public void testZoomGesturesDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setZoomGesturesEnabled(false);
         assertEquals("Zoom gesture should be disabled", false, uiSettings.isZoomGesturesEnabled());
     }
 
     @Test
     public void testZoomControlsEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setZoomControlsEnabled(true);
         assertEquals("Zoom controls should be enabled", true, uiSettings.isZoomControlsEnabled());
     }
 
     @Test
     public void testZoomControlsDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setZoomControlsEnabled(false);
         assertEquals("Zoom controls should be disabled", false, uiSettings.isZoomControlsEnabled());
     }
 
     @Test
     public void testScrollGesturesEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setScrollGesturesEnabled(true);
         assertEquals("Scroll gesture should be enabled", true, uiSettings.isScrollGesturesEnabled());
     }
 
     @Test
     public void testScrollGesturesDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setScrollGesturesEnabled(false);
         assertEquals("Scroll gesture should be disabled", false, uiSettings.isScrollGesturesEnabled());
     }
 
     @Test
     public void testAllGesturesEnabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setAllGesturesEnabled(true);
         assertEquals("Rotate gesture should be enabled", true, uiSettings.isRotateGesturesEnabled());
         assertEquals("Tilt gesture should be enabled", true, uiSettings.isTiltGesturesEnabled());
@@ -204,7 +196,7 @@ public class UiSettingsTest {
 
     @Test
     public void testAllGesturesDisabled() {
-        UiSettings uiSettings = new UiSettings(mMapboxMap);
+        UiSettings uiSettings = new UiSettings(mMapView);
         uiSettings.setAllGesturesEnabled(false);
         assertEquals("Rotate gesture should be enabled", false, uiSettings.isRotateGesturesEnabled());
         assertEquals("Tilt gesture should be disabled", false, uiSettings.isTiltGesturesEnabled());