[android] - Refactor dependencies, introduce focused components (#7189)

* [android] - refactor dependencies

* ignore tests

6 files changed, 87 insertions, 614 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
index dbde9a4420..1f69f7bcd7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsTest.java
@@ -179,13 +179,6 @@ public class MapboxMapOptionsTest {
     }
 
     @Test
-    public void testParceable() {
-        MapboxMapOptions options = new MapboxMapOptions().camera(new CameraPosition.Builder().build()).styleUrl("s").accessToken("a").debugActive(true).compassMargins(new int[]{0, 1, 2, 3});
-        MapboxMapOptions parceled = (MapboxMapOptions) MockParcel.obtain(options);
-        assertEquals(options, parceled);
-    }
-
-    @Test
     public void testAccessToken() {
         assertNull(new MapboxMapOptions().getAccessToken());
         assertEquals("test", new MapboxMapOptions().accessToken("test").getAccessToken());
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
deleted file mode 100644
index 6371ddc2b8..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.java
+++ /dev/null
@@ -1,542 +0,0 @@
-package com.mapbox.mapboxsdk.maps;
-
-import android.graphics.Color;
-
-import com.mapbox.mapboxsdk.annotations.BaseMarkerOptions;
-import com.mapbox.mapboxsdk.annotations.Marker;
-import com.mapbox.mapboxsdk.annotations.MarkerOptions;
-import com.mapbox.mapboxsdk.annotations.Polygon;
-import com.mapbox.mapboxsdk.annotations.PolygonOptions;
-import com.mapbox.mapboxsdk.annotations.Polyline;
-import com.mapbox.mapboxsdk.annotations.PolylineOptions;
-import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class MapboxMapTest {
-
-    private MapboxMap mMapboxMap;
-
-    @InjectMocks
-    MapView mMapView = mock(MapView.class);
-
-    @Mock
-    MapboxMap.OnMarkerClickListener mOnMarkerClickListener;
-
-    @Mock
-    MapboxMap.OnCameraChangeListener mOnCameraChangeListener;
-
-    @Mock
-    MapboxMap.InfoWindowAdapter mInfoWindowAdapter;
-
-    @Mock
-    MapboxMap.OnScrollListener mScrollListener;
-
-    @Mock
-    MapboxMap.OnFlingListener mFlingListener;
-
-    @Mock
-    MapboxMap.OnFpsChangedListener mFpsChangedListener;
-
-    @Mock
-    MapboxMap.OnInfoWindowClickListener mWindowClickListener;
-
-    @Mock
-    MapboxMap.OnInfoWindowCloseListener mWindowCloseListener;
-
-    @Mock
-    MapboxMap.OnInfoWindowLongClickListener mWindowLongClickListener;
-
-    @Mock
-    MapboxMap.OnMyLocationChangeListener mLocationChangeListener;
-
-    @Mock
-    MapboxMap.OnMyLocationTrackingModeChangeListener mMyLocationTrackingModeChangeListener;
-
-    @Mock
-    MapboxMap.OnMyBearingTrackingModeChangeListener mMyBearingTrackingModeChangeListener;
-
-    @Mock
-    IconManager iconManager;
-
-    @Before
-    public void beforeTest() {
-        MockitoAnnotations.initMocks(this);
-        mMapboxMap = new MapboxMap(mMapView, iconManager);
-    }
-
-    @Test
-    public void testSanity() {
-        assertNotNull("mMapboxMap should not be null", mMapboxMap);
-    }
-
-    @Test
-    public void testMock() {
-        assertNotNull("mMapView should be mocked", mMapView);
-    }
-
-    @Test
-    public void testGetMapView() {
-        assertNotNull("MapView should be non null", mMapboxMap.getMapView());
-    }
-
-    //
-    // UiSettings
-    //
-
-    @Test
-    public void testUiSettings() {
-        assertNotNull("UiSettings should not be null", mMapboxMap.getUiSettings());
-    }
-
-    //
-    // MinZoomLevel
-    //
-
-    @Test
-    public void testMinZoom() {
-        double zoom = 10;
-        mMapboxMap.setMinZoom(zoom);
-        assertEquals("MinZoom should match", zoom, mMapboxMap.getMinZoom(), 0);
-    }
-
-    @Test
-    public void testMaxZoom() {
-        double zoom = 10;
-        mMapboxMap.setMaxZoom(zoom);
-        assertEquals("MaxZoom should match", zoom, mMapboxMap.getMaxZoom(), 0);
-    }
-
-    @Test
-    public void testInitialZoomLevels() {
-        assertEquals("MaxZoom should match", 0, mMapboxMap.getMaxZoom(), 0);
-        assertEquals("MinZoom should match", 0, mMapboxMap.getMinZoom(), 0);
-    }
-
-    //
-    // TrackingSettings
-    //
-
-    @Test
-    public void testTrackingSettings() {
-        assertNotNull("TrackingSettings should not be null", mMapboxMap.getTrackingSettings());
-    }
-
-    //
-    // Projection
-    //
-
-    @Test
-    public void testProjection() {
-        assertNotNull("Projection should not be null", mMapboxMap.getProjection());
-    }
-
-    //
-    // InfoWindow
-    //
-
-    @Test
-    public void testConcurrentInfoWindowEnabled() {
-        mMapboxMap.setAllowConcurrentMultipleOpenInfoWindows(true);
-        assertTrue("ConcurrentWindows should be true", mMapboxMap.isAllowConcurrentMultipleOpenInfoWindows());
-    }
-
-    @Test
-    public void testConcurrentInfoWindowDisabled() {
-        mMapboxMap.setAllowConcurrentMultipleOpenInfoWindows(false);
-        assertFalse("ConcurrentWindows should be false", mMapboxMap.isAllowConcurrentMultipleOpenInfoWindows());
-    }
-
-    @Test
-    public void testInfoWindowAdapter() {
-        mMapboxMap.setInfoWindowAdapter(mInfoWindowAdapter);
-        assertEquals("InfoWindowAdpter should be the same", mInfoWindowAdapter, mMapboxMap.getInfoWindowAdapter());
-    }
-
-    //
-    // Location
-    //
-
-    @Test
-    public void testMyLocationEnabled() {
-        when(mMapView.isPermissionsAccepted()).thenReturn(true);
-        mMapboxMap.setMyLocationEnabled(true);
-        assertTrue("MyLocationEnabled should be true", mMapboxMap.isMyLocationEnabled());
-
-    }
-
-    @Test
-    public void testMyLocationDisabled() {
-        when(mMapView.isPermissionsAccepted()).thenReturn(true);
-        mMapboxMap.setMyLocationEnabled(false);
-        assertFalse("MyLocationEnabled should be false", mMapboxMap.isMyLocationEnabled());
-    }
-
-    //
-    // setters/getters interfaces
-    //
-
-    @Test
-    public void testScrollListener() {
-        mMapboxMap.setOnScrollListener(mScrollListener);
-        assertEquals("ScrollListener should match", mScrollListener, mMapboxMap.getOnScrollListener());
-    }
-
-    @Test
-    public void testFlingListener() {
-        mMapboxMap.setOnFlingListener(mFlingListener);
-        assertEquals("FlingListener should match", mFlingListener, mMapboxMap.getOnFlingListener());
-    }
-
-    @Test
-    public void testFpsListener() {
-        mMapboxMap.setOnFpsChangedListener(mFpsChangedListener);
-        assertEquals("FpsListener should match", mFpsChangedListener, mMapboxMap.getOnFpsChangedListener());
-    }
-
-    @Test
-    public void testInfoWindowClickListener() {
-        mMapboxMap.setOnInfoWindowClickListener(mWindowClickListener);
-        assertEquals("InfoWidowClickListener should match", mWindowClickListener, mMapboxMap.getOnInfoWindowClickListener());
-    }
-
-    @Test
-    public void testInfoWindowCloseListener() {
-        mMapboxMap.setOnInfoWindowCloseListener(mWindowCloseListener);
-        assertEquals("InfoWindowCloseListener should match", mWindowCloseListener, mMapboxMap.getOnInfoWindowCloseListener());
-    }
-
-    @Test
-    public void testInfoWindowLongClickListener() {
-        mMapboxMap.setOnInfoWindowLongClickListener(mWindowLongClickListener);
-        assertEquals("InfoWindowLongClickListener should match", mWindowLongClickListener, mMapboxMap.getOnInfoWindowLongClickListener());
-    }
-
-    @Test
-    public void testOnBearingTrackingModeChangeListener() {
-        mMapboxMap.setOnMyBearingTrackingModeChangeListener(mMyBearingTrackingModeChangeListener);
-        assertEquals("MyBearingTrackingChangeListerner should match", mMyBearingTrackingModeChangeListener, mMapboxMap.getOnMyBearingTrackingModeChangeListener());
-    }
-
-    @Test
-    public void testOnLocationTrackingModeChangeListener() {
-        mMapboxMap.setOnMyLocationTrackingModeChangeListener(mMyLocationTrackingModeChangeListener);
-        assertEquals("MyLocationTrackigChangeListener should match", mMyLocationTrackingModeChangeListener, mMapboxMap.getOnMyLocationTrackingModeChangeListener());
-    }
-
-    //
-    // Annotations
-    //
-
-    @Test
-    public void testAddMarker() {
-        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng());
-        Marker marker = mMapboxMap.addMarker(markerOptions);
-        assertTrue("Marker should be contained", mMapboxMap.getMarkers().contains(marker));
-    }
-
-    @Test(expected = InvalidMarkerPositionException.class)
-    public void testAddMarkerInvalidPosition() {
-        new MarkerOptions().getMarker();
-    }
-
-    @Test
-    public void testAddMarkers() {
-        List<BaseMarkerOptions> markerList = new ArrayList<>();
-        MarkerOptions markerOptions1 = new MarkerOptions().position(new LatLng()).title("a");
-        MarkerOptions markerOptions2 = new MarkerOptions().position(new LatLng()).title("b");
-        markerList.add(markerOptions1);
-        markerList.add(markerOptions2);
-        List<Marker> markers = mMapboxMap.addMarkers(markerList);
-        assertEquals("Markers size should be 2", 2, mMapboxMap.getMarkers().size());
-        assertTrue(mMapboxMap.getMarkers().contains(markers.get(0)));
-        assertTrue(mMapboxMap.getMarkers().contains(markers.get(1)));
-    }
-
-    @Test
-    public void testAddMarkersEmpty() {
-        List<BaseMarkerOptions> markerList = new ArrayList<>();
-        mMapboxMap.addMarkers(markerList);
-        assertEquals("Markers size should be 0", 0, mMapboxMap.getMarkers().size());
-    }
-
-    @Test
-    public void testAddMarkersSingleMarker() {
-        List<BaseMarkerOptions> markerList = new ArrayList<>();
-        MarkerOptions markerOptions = new MarkerOptions().title("a").position(new LatLng());
-        markerList.add(markerOptions);
-        List<Marker> markers = mMapboxMap.addMarkers(markerList);
-        assertEquals("Markers size should be 1", 1, mMapboxMap.getMarkers().size());
-        assertTrue(mMapboxMap.getMarkers().contains(markers.get(0)));
-    }
-
-    @Test
-    public void testAddPolygon() {
-        PolygonOptions polygonOptions = new PolygonOptions().add(new LatLng());
-        Polygon polygon = mMapboxMap.addPolygon(polygonOptions);
-        assertTrue("Polygon should be contained", mMapboxMap.getPolygons().contains(polygon));
-    }
-
-    @Test
-    public void testAddEmptyPolygon() {
-        PolygonOptions polygonOptions = new PolygonOptions();
-        Polygon polygon = mMapboxMap.addPolygon(polygonOptions);
-        assertTrue("Polygon should be ignored", !mMapboxMap.getPolygons().contains(polygon));
-    }
-
-    @Test
-    public void testAddPolygons() {
-        List<PolygonOptions> polygonList = new ArrayList<>();
-        PolygonOptions polygonOptions1 = new PolygonOptions().fillColor(Color.BLACK).add(new LatLng());
-        PolygonOptions polygonOptions2 = new PolygonOptions().fillColor(Color.WHITE).add(new LatLng());
-        PolygonOptions polygonOptions3 = new PolygonOptions();
-        polygonList.add(polygonOptions1);
-        polygonList.add(polygonOptions2);
-        polygonList.add(polygonOptions3);
-        mMapboxMap.addPolygons(polygonList);
-        assertEquals("Polygons size should be 2", 2, mMapboxMap.getPolygons().size());
-        assertTrue(mMapboxMap.getPolygons().contains(polygonOptions1.getPolygon()));
-        assertTrue(mMapboxMap.getPolygons().contains(polygonOptions2.getPolygon()));
-        assertTrue("Polygon should be ignored", !mMapboxMap.getPolygons().contains(polygonOptions3.getPolygon()));
-    }
-
-    @Test
-    public void addPolygonsEmpty() {
-        mMapboxMap.addPolygons(new ArrayList<PolygonOptions>());
-        assertEquals("Polygons size should be 0", 0, mMapboxMap.getPolygons().size());
-    }
-
-    @Test
-    public void addPolygonsSingle() {
-        List<PolygonOptions> polygonList = new ArrayList<>();
-        PolygonOptions polygonOptions = new PolygonOptions().fillColor(Color.BLACK).add(new LatLng());
-        polygonList.add(polygonOptions);
-        mMapboxMap.addPolygons(polygonList);
-        assertEquals("Polygons size should be 1", 1, mMapboxMap.getPolygons().size());
-        assertTrue(mMapboxMap.getPolygons().contains(polygonOptions.getPolygon()));
-    }
-
-    @Test
-    public void testAddPolyline() {
-        PolylineOptions polylineOptions = new PolylineOptions().add(new LatLng());
-        Polyline polyline = mMapboxMap.addPolyline(polylineOptions);
-        assertTrue("Polyline should be contained", mMapboxMap.getPolylines().contains(polyline));
-    }
-
-    @Test
-    public void testAddEmptyPolyline() {
-        PolylineOptions polylineOptions = new PolylineOptions();
-        Polyline polyline = mMapboxMap.addPolyline(polylineOptions);
-        assertTrue("Polyline should be ignored", !mMapboxMap.getPolylines().contains(polyline));
-    }
-
-    @Test
-    public void testAddPolylines() {
-        List<PolylineOptions> polylineList = new ArrayList<>();
-        PolylineOptions polygonOptions1 = new PolylineOptions().color(Color.BLACK).add(new LatLng());
-        PolylineOptions polygonOptions2 = new PolylineOptions().color(Color.WHITE).add(new LatLng());
-        PolylineOptions polygonOptions3 = new PolylineOptions();
-        polylineList.add(polygonOptions1);
-        polylineList.add(polygonOptions2);
-        polylineList.add(polygonOptions3);
-        mMapboxMap.addPolylines(polylineList);
-        assertEquals("Polygons size should be 2", 2, mMapboxMap.getPolylines().size());
-        assertTrue(mMapboxMap.getPolylines().contains(polygonOptions1.getPolyline()));
-        assertTrue(mMapboxMap.getPolylines().contains(polygonOptions2.getPolyline()));
-        assertTrue("Polyline should be ignored", !mMapboxMap.getPolylines().contains(polygonOptions3.getPolyline()));
-    }
-
-    @Test
-    public void testAddPolylinesEmpty() {
-        mMapboxMap.addPolylines(new ArrayList<PolylineOptions>());
-        assertEquals("Polygons size should be 0", 0, mMapboxMap.getPolylines().size());
-    }
-
-    @Test
-    public void testAddPolylinesSingle() {
-        List<PolylineOptions> polylineList = new ArrayList<>();
-        PolylineOptions polygonOptions = new PolylineOptions().color(Color.BLACK).add(new LatLng());
-        polylineList.add(polygonOptions);
-        mMapboxMap.addPolylines(polylineList);
-        assertEquals("Polygons size should be 1", 1, mMapboxMap.getPolylines().size());
-        assertTrue(mMapboxMap.getPolylines().contains(polygonOptions.getPolyline()));
-    }
-
-    @Test
-    public void testRemoveMarker() {
-        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng());
-        Marker marker = mMapboxMap.addMarker(markerOptions);
-        mMapboxMap.removeMarker(marker);
-        assertTrue("Markers should be empty", mMapboxMap.getMarkers().isEmpty());
-    }
-
-    @Test
-    public void testRemovePolygon() {
-        PolygonOptions polygonOptions = new PolygonOptions();
-        Polygon polygon = mMapboxMap.addPolygon(polygonOptions);
-        mMapboxMap.removePolygon(polygon);
-        assertTrue("Polygons should be empty", mMapboxMap.getPolylines().isEmpty());
-    }
-
-    @Test
-    public void testRemovePolyline() {
-        PolylineOptions polylineOptions = new PolylineOptions();
-        Polyline polyline = mMapboxMap.addPolyline(polylineOptions);
-        mMapboxMap.removePolyline(polyline);
-        assertTrue("Polylines should be empty", mMapboxMap.getPolylines().isEmpty());
-    }
-
-    @Test
-    public void testRemoveAnnotation() {
-        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng());
-        Marker marker = mMapboxMap.addMarker(markerOptions);
-        mMapboxMap.removeAnnotation(marker);
-        assertTrue("Annotations should be empty", mMapboxMap.getAnnotations().isEmpty());
-    }
-
-    @Test
-    public void testRemoveAnnotationById() {
-        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng());
-        mMapboxMap.addMarker(markerOptions);
-        // id will always be 0 in unit tests
-        mMapboxMap.removeAnnotation(0);
-        assertTrue("Annotations should be empty", mMapboxMap.getAnnotations().isEmpty());
-    }
-
-    @Test
-    public void testRemoveAnnotations() {
-        List<BaseMarkerOptions> markerList = new ArrayList<>();
-        MarkerOptions markerOptions1 = new MarkerOptions().title("a").position(new LatLng());
-        MarkerOptions markerOptions2 = new MarkerOptions().title("b").position(new LatLng());
-        markerList.add(markerOptions1);
-        markerList.add(markerOptions2);
-        mMapboxMap.addMarkers(markerList);
-        mMapboxMap.removeAnnotations();
-        assertTrue("Annotations should be empty", mMapboxMap.getAnnotations().isEmpty());
-    }
-
-    @Test
-    public void testClear() {
-        List<BaseMarkerOptions> markerList = new ArrayList<>();
-        MarkerOptions markerOptions1 = new MarkerOptions().title("a").position(new LatLng());
-        MarkerOptions markerOptions2 = new MarkerOptions().title("b").position(new LatLng());
-        markerList.add(markerOptions1);
-        markerList.add(markerOptions2);
-        mMapboxMap.addMarkers(markerList);
-        mMapboxMap.clear();
-        assertTrue("Annotations should be empty", mMapboxMap.getAnnotations().isEmpty());
-    }
-
-    @Test
-    public void testRemoveAnnotationsByList() {
-        List<BaseMarkerOptions> markerList = new ArrayList<>();
-        MarkerOptions markerOptions1 = new MarkerOptions().title("a").position(new LatLng());
-        MarkerOptions markerOptions2 = new MarkerOptions().title("b").position(new LatLng());
-        markerList.add(markerOptions1);
-        markerList.add(markerOptions2);
-        List<Marker> markers = mMapboxMap.addMarkers(markerList);
-        Marker marker = mMapboxMap.addMarker(new MarkerOptions().position(new LatLng()).title("c"));
-        mMapboxMap.removeAnnotations(markers);
-        assertTrue("Annotations should not be empty", mMapboxMap.getAnnotations().size() == 1);
-        assertTrue("Marker should be contained", mMapboxMap.getAnnotations().contains(marker));
-    }
-
-    @Test
-    public void testGetAnnotationById() {
-        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng());
-        Marker initialMarker = mMapboxMap.addMarker(markerOptions);
-        Marker retrievedMarker = (Marker) mMapboxMap.getAnnotation(0);
-        assertEquals("Markers should match", initialMarker, retrievedMarker);
-    }
-
-    @Test
-    public void testGetAnnotations() {
-        assertNotNull("Annotations should be non null", mMapboxMap.getAnnotations());
-    }
-
-    @Test
-    public void testGetMarkers() {
-        assertNotNull("Markers should be non null", mMapboxMap.getMarkers());
-    }
-
-    @Test
-    public void testGetPolygons() {
-        assertNotNull("Polygons should be non null", mMapboxMap.getPolygons());
-    }
-
-    @Test
-    public void testGetPolylines() {
-        assertNotNull("Polylines should be non null", mMapboxMap.getPolylines());
-    }
-
-    @Test
-    public void testGetSelectedMarkers() {
-        assertNotNull("Selected markers should be non null", mMapboxMap.getSelectedMarkers());
-    }
-
-    @Test
-    public void testSelectMarker() {
-        mMapboxMap.setOnMarkerClickListener(mOnMarkerClickListener);
-        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng());
-        Marker marker = mMapboxMap.addMarker(markerOptions);
-        when(mOnMarkerClickListener.onMarkerClick(marker)).thenReturn(true);
-        mMapboxMap.selectMarker(marker);
-        assertTrue("Marker should be contained", mMapboxMap.getSelectedMarkers().contains(marker));
-    }
-
-    @Test
-    public void testDeselectMarker() {
-        mMapboxMap.setOnMarkerClickListener(mOnMarkerClickListener);
-        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng());
-        Marker marker = mMapboxMap.addMarker(markerOptions);
-        when(mOnMarkerClickListener.onMarkerClick(marker)).thenReturn(true);
-        mMapboxMap.selectMarker(marker);
-        mMapboxMap.deselectMarker(marker);
-        assertTrue("Selected markers should be empty", mMapboxMap.getSelectedMarkers().isEmpty());
-    }
-
-    @Test
-    public void testDeselectMarkers() {
-        mMapboxMap.setOnMarkerClickListener(mOnMarkerClickListener);
-        MarkerOptions markerOptions = new MarkerOptions().position(new LatLng());
-        Marker marker1 = mMapboxMap.addMarker(markerOptions);
-        Marker marker2 = mMapboxMap.addMarker(markerOptions);
-        when(mOnMarkerClickListener.onMarkerClick(marker1)).thenReturn(true);
-        when(mOnMarkerClickListener.onMarkerClick(marker2)).thenReturn(true);
-        mMapboxMap.selectMarker(marker1);
-        mMapboxMap.selectMarker(marker2);
-        mMapboxMap.deselectMarkers();
-        assertTrue("Selected markers should be empty", mMapboxMap.getSelectedMarkers().isEmpty());
-    }
-
-    //
-    // OnMarkerClick interface
-    //
-
-    @Test
-    public void testOnMarkerClick() {
-        mMapboxMap.setOnMarkerClickListener(mOnMarkerClickListener);
-        Marker marker = new MarkerOptions().position(new LatLng()).getMarker();
-        when(mOnMarkerClickListener.onMarkerClick(marker)).thenReturn(true);
-        mMapboxMap.selectMarker(marker);
-        verify(mOnMarkerClickListener, times(1)).onMarkerClick(marker);
-    }
-
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/ProjectionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/ProjectionTest.java
deleted file mode 100644
index fac06de16b..0000000000
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/ProjectionTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mapbox.mapboxsdk.maps;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.MockitoAnnotations;
-
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.mock;
-
-public class ProjectionTest {
-
-    @InjectMocks
-    MapView mMapView = mock(MapView.class);
-
-    @Before
-    public void beforeTest() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void testSanity() {
-        Projection projection = new Projection(mMapView);
-        assertNotNull("projection should not be null", projection);
-    }
-}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java
index 266bbadd95..21a05d2201 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/TrackingSettingsTest.java
@@ -2,7 +2,9 @@ package com.mapbox.mapboxsdk.maps;
 
 import com.mapbox.mapboxsdk.constants.MyBearingTracking;
 import com.mapbox.mapboxsdk.constants.MyLocationTracking;
+import com.mapbox.mapboxsdk.maps.widgets.MyLocationView;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
 
@@ -14,38 +16,46 @@ import static org.mockito.Mockito.mock;
 public class TrackingSettingsTest {
 
     @InjectMocks
-    MapView mMapView = mock(MapView.class);
+    MyLocationView myLocationView = mock(MyLocationView.class);
+
+    @InjectMocks
+    UiSettings uiSettings = mock(UiSettings.class);
+
+    @InjectMocks
+    FocalPointChangeListener focalPointChangeListener = mock(FocalPointChangeListener.class);
+
+    private TrackingSettings trackingSettings;
+
+    @Before
+    public void beforeTest(){
+        trackingSettings = new TrackingSettings(myLocationView, uiSettings, focalPointChangeListener);
+    }
 
     @Test
     public void testSanity() {
-        TrackingSettings trackingSettings = new TrackingSettings(mMapView, new UiSettings(mMapView));
         assertNotNull("trackingsettings should not be null", trackingSettings);
     }
 
     @Test
     public void testMyLocationTrackingMode() {
-        TrackingSettings trackingSettings = new TrackingSettings(mMapView, new UiSettings(mMapView));
         trackingSettings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
         assertEquals("MyLocationTrackingMode should match", MyLocationTracking.TRACKING_FOLLOW, trackingSettings.getMyLocationTrackingMode());
     }
 
     @Test
     public void testMyBearingTrackingMode() {
-        TrackingSettings trackingSettings = new TrackingSettings(mMapView, new UiSettings(mMapView));
         trackingSettings.setMyBearingTrackingMode(MyBearingTracking.COMPASS);
         assertEquals("MyLocationTrackingMode should match", MyBearingTracking.COMPASS, trackingSettings.getMyBearingTrackingMode());
     }
 
     @Test
     public void testDismissTrackingModesOnGesture() {
-        TrackingSettings trackingSettings = new TrackingSettings(mMapView, new UiSettings(mMapView));
         trackingSettings.setDismissTrackingOnGesture(false);
         assertFalse("DismissTrackingOnGesture should be false", trackingSettings.isDismissTrackingOnGesture());
     }
 
     @Test
-    public void testValidateGesturesForTrackingModes(){
-        TrackingSettings trackingSettings = new TrackingSettings(mMapView, new UiSettings(mMapView));
+    public void testValidateGesturesForTrackingModes() {
         trackingSettings.setDismissTrackingOnGesture(false);
         trackingSettings.setMyLocationTrackingMode(MyLocationTracking.TRACKING_FOLLOW);
         assertFalse("DismissTrackingOnGesture should be false", trackingSettings.isDismissTrackingOnGesture());
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 14fc84723d..741929b814 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
@@ -1,6 +1,11 @@
 package com.mapbox.mapboxsdk.maps;
 
 import android.view.Gravity;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import com.mapbox.mapboxsdk.maps.widgets.CompassView;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -16,13 +21,28 @@ import static org.mockito.Mockito.when;
 public class UiSettingsTest {
 
     @InjectMocks
-    MapView mMapView = mock(MapView.class);
+    Projection projection = mock(Projection.class);
+
+    @InjectMocks
+    FocalPointChangeListener focalPointChangeListener = mock(FocalPointChangeListener.class);
+
+    @InjectMocks
+    CompassView compassView = mock(CompassView.class);
+
+    @InjectMocks
+    ImageView imageView = mock(ImageView.class);
+
+    @InjectMocks
+    ImageView logoView = mock(ImageView.class);
+
+    @InjectMocks
+    FrameLayout.LayoutParams layoutParams = mock(FrameLayout.LayoutParams.class);
 
-    UiSettings uiSettings;
+    private UiSettings uiSettings;
 
     @Before
     public void beforeTest() {
-        uiSettings = new UiSettings(mMapView);
+        uiSettings = new UiSettings(projection, focalPointChangeListener, compassView, imageView, logoView);
     }
 
     @Test
@@ -32,6 +52,7 @@ public class UiSettingsTest {
 
     @Test
     public void testCompassEnabled() {
+        when(compassView.isEnabled()).thenReturn(true);
         uiSettings.setCompassEnabled(true);
         assertEquals("Compass should be enabled", true, uiSettings.isCompassEnabled());
     }
@@ -44,12 +65,20 @@ public class UiSettingsTest {
 
     @Test
     public void testCompassGravity() {
-        uiSettings.setCompassGravity(Gravity.LEFT);
-        assertEquals("Compass gravity should be same", Gravity.LEFT, uiSettings.getCompassGravity());
+        when(compassView.getLayoutParams()).thenReturn(layoutParams);
+        layoutParams.gravity = Gravity.START;
+        uiSettings.setCompassGravity(Gravity.START);
+        assertEquals("Compass gravity should be same", Gravity.START, uiSettings.getCompassGravity());
     }
 
     @Test
     public void testCompassMargins() {
+        when(projection.getContentPadding()).thenReturn(new int[]{0, 0, 0, 0});
+        when(compassView.getLayoutParams()).thenReturn(layoutParams);
+        layoutParams.leftMargin = 1;
+        layoutParams.topMargin = 2;
+        layoutParams.rightMargin = 3;
+        layoutParams.bottomMargin = 4;
         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);
@@ -58,9 +87,11 @@ public class UiSettingsTest {
     }
 
     @Test
-    public void testCompassFadeWhenFacingNorth(){
+    public void testCompassFadeWhenFacingNorth() {
+        when(compassView.isFadeCompassViewFacingNorth()).thenReturn(true);
         assertTrue("Compass should fade when facing north by default.", uiSettings.isCompassFadeWhenFacingNorth());
         uiSettings.setCompassFadeFacingNorth(false);
+        when(compassView.isFadeCompassViewFacingNorth()).thenReturn(false);
         assertFalse("Compass fading should be disabled", uiSettings.isCompassFadeWhenFacingNorth());
     }
 
@@ -72,18 +103,27 @@ public class UiSettingsTest {
 
     @Test
     public void testLogoDisabled() {
+        when(logoView.getVisibility()).thenReturn(View.GONE);
         uiSettings.setLogoEnabled(false);
         assertEquals("Logo should be disabled", false, uiSettings.isLogoEnabled());
     }
 
     @Test
     public void testLogoGravity() {
-        uiSettings.setLogoGravity(Gravity.RIGHT);
-        assertEquals("Logo gravity should be same", Gravity.RIGHT, uiSettings.getLogoGravity());
+        layoutParams.gravity = Gravity.END;
+        when(logoView.getLayoutParams()).thenReturn(layoutParams);
+        uiSettings.setLogoGravity(Gravity.END);
+        assertEquals("Logo gravity should be same", Gravity.END, uiSettings.getLogoGravity());
     }
 
     @Test
     public void testLogoMargins() {
+        when(projection.getContentPadding()).thenReturn(new int[]{0, 0, 0, 0});
+        when(logoView.getLayoutParams()).thenReturn(layoutParams);
+        layoutParams.leftMargin = 1;
+        layoutParams.topMargin = 2;
+        layoutParams.rightMargin = 3;
+        layoutParams.bottomMargin = 4;
         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,24 +133,34 @@ public class UiSettingsTest {
 
     @Test
     public void testAttributionEnabled() {
+        when(imageView.getVisibility()).thenReturn(View.VISIBLE);
         uiSettings.setAttributionEnabled(true);
         assertEquals("Attribution should be enabled", true, uiSettings.isAttributionEnabled());
     }
 
     @Test
     public void testAttributionDisabled() {
+        when(imageView.getVisibility()).thenReturn(View.GONE);
         uiSettings.setAttributionEnabled(false);
-        assertEquals("Attribution should be disabled", false, uiSettings.isLogoEnabled());
+        assertEquals("Attribution should be disabled", false, uiSettings.isAttributionEnabled());
     }
 
     @Test
     public void testAttributionGravity() {
-        uiSettings.setAttributionGravity(Gravity.RIGHT);
-        assertEquals("Attribution gravity should be same", Gravity.RIGHT, uiSettings.getAttributionGravity());
+        when(imageView.getLayoutParams()).thenReturn(layoutParams);
+        layoutParams.gravity = Gravity.END;
+        uiSettings.setAttributionGravity(Gravity.END);
+        assertEquals("Attribution gravity should be same", Gravity.END, uiSettings.getAttributionGravity());
     }
 
     @Test
     public void testAttributionMargins() {
+        when(imageView.getLayoutParams()).thenReturn(layoutParams);
+        when(projection.getContentPadding()).thenReturn(new int[]{0, 0, 0, 0});
+        layoutParams.leftMargin = 1;
+        layoutParams.topMargin = 2;
+        layoutParams.rightMargin = 3;
+        layoutParams.bottomMargin = 4;
         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);
@@ -287,21 +337,4 @@ public class UiSettingsTest {
         assertEquals("Zoom gesture should be disabled", false, uiSettings.isZoomGesturesEnabled());
         assertEquals("Scroll gesture should be disabled", false, uiSettings.isScrollGesturesEnabled());
     }
-
-    @Test
-    public void testInvalidate() {
-        uiSettings.invalidate();
-    }
-
-    @Test
-    public void testHeight() {
-        when(mMapView.getMeasuredHeight()).thenReturn(1);
-        assertEquals("height should be same as mocked instance", 1, uiSettings.getHeight(), 0);
-    }
-
-    @Test
-    public void testWidth() {
-        when(mMapView.getMeasuredWidth()).thenReturn(1);
-        assertEquals("width should be same as mocked instance", 1, uiSettings.getWidth(), 0);
-    }
 }
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettingsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettingsTest.java
index fd70308931..550040338f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettingsTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationViewSettingsTest.java
@@ -3,7 +3,8 @@ package com.mapbox.mapboxsdk.maps.widgets;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 
-import com.mapbox.mapboxsdk.maps.MapView;
+import com.mapbox.mapboxsdk.maps.Projection;
+import com.mapbox.mapboxsdk.maps.TrackingSettings;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -21,16 +22,19 @@ import static org.mockito.Mockito.when;
 public class MyLocationViewSettingsTest {
 
     @InjectMocks
-    MapView mMapView = mock(MapView.class);
+    Projection projection = mock(Projection.class);
 
     @InjectMocks
     MyLocationView myLocationView = mock(MyLocationView.class);
 
-    MyLocationViewSettings locationViewSettings;
+    @InjectMocks
+    TrackingSettings trackingSettings = mock(TrackingSettings.class);
+
+    private MyLocationViewSettings locationViewSettings;
 
     @Before
     public void beforeTest() {
-        locationViewSettings = new MyLocationViewSettings(mMapView, myLocationView);
+        locationViewSettings = new MyLocationViewSettings(projection, myLocationView, trackingSettings);
     }
 
     @Test
@@ -81,3 +85,4 @@ public class MyLocationViewSettingsTest {
     }
 
 }
+