1 files changed, 19 insertions, 42 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerViewTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerViewTest.java
index ed8e4ff323..e6c30f4aac 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerViewTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerViewTest.java
@@ -1,10 +1,9 @@
 package com.mapbox.mapboxsdk.annotations;
 
-import android.graphics.Bitmap;
 import android.os.Parcelable;
 
+import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException;
 import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.utils.MockParcel;
 
 import org.junit.Test;
@@ -25,10 +24,15 @@ public class MarkerViewTest {
 
     @Test
     public void testMarker() {
-        MarkerViewOptions markerOptions = new MarkerViewOptions();
+        MarkerViewOptions markerOptions = new MarkerViewOptions().position(new LatLng());
         assertNotNull("marker should not be null", markerOptions.getMarker());
     }
 
+    @Test(expected = InvalidMarkerPositionException.class)
+    public void testInvalidMarker(){
+        new MarkerViewOptions().getMarker();
+    }
+
     @Test
     public void testPosition() {
         MarkerViewOptions markerOptions = new MarkerViewOptions().position(new LatLng(10, 12));
@@ -39,46 +43,36 @@ public class MarkerViewTest {
 
     @Test
     public void testSnippet() {
-        MarkerViewOptions markerOptions = new MarkerViewOptions().snippet("Mapbox");
+        MarkerViewOptions markerOptions = new MarkerViewOptions().snippet("Mapbox").position(new LatLng());
         MarkerView marker = markerOptions.getMarker();
         assertEquals(marker.getSnippet(), "Mapbox");
     }
 
     @Test
     public void testTitle() {
-        MarkerViewOptions markerOptions = new MarkerViewOptions().title("Mapbox");
+        MarkerViewOptions markerOptions = new MarkerViewOptions().title("Mapbox").position(new LatLng());
         MarkerView marker = markerOptions.getMarker();
         assertEquals(marker.getTitle(), "Mapbox");
         assertEquals(markerOptions.getTitle(), "Mapbox");
     }
 
     @Test
-    public void testIcon() {
-        Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_4444);
-        Icon icon = IconFactory.recreate("test", bitmap);
-        MarkerViewOptions markerOptions = new MarkerViewOptions().icon(icon);
-        MarkerView marker = markerOptions.getMarker();
-        assertEquals("Icon should match", icon, marker.getIcon());
-        assertEquals("Icon should match", icon, markerOptions.getIcon());
-    }
-
-    @Test
     public void testFlat() {
-        MarkerViewOptions markerOptions = new MarkerViewOptions().flat(true);
+        MarkerViewOptions markerOptions = new MarkerViewOptions().flat(true).position(new LatLng());
         MarkerView marker = markerOptions.getMarker();
         assertTrue("flat should be true", marker.isFlat());
     }
 
     @Test
     public void testFlatDefault() {
-        assertFalse("default value of flat should be false", new MarkerViewOptions().getMarker().isFlat());
+        assertFalse("default value of flat should be false", new MarkerViewOptions().position(new LatLng()).getMarker().isFlat());
     }
 
     @Test
     public void testAnchor() {
         float anchorU = 1;
         float anchorV = 1;
-        MarkerViewOptions markerOptions = new MarkerViewOptions().anchor(anchorU, anchorV);
+        MarkerViewOptions markerOptions = new MarkerViewOptions().anchor(anchorU, anchorV).position(new LatLng());
         MarkerView marker = markerOptions.getMarker();
         assertEquals("anchorU should match ", anchorU, marker.getAnchorU(), 0);
         assertEquals("anchorU should match ", anchorV, marker.getAnchorV(), 0);
@@ -86,7 +80,7 @@ public class MarkerViewTest {
 
     @Test
     public void testAnchorDefault() {
-        MarkerView marker = new MarkerViewOptions().getMarker();
+        MarkerView marker = new MarkerViewOptions().position(new LatLng()).getMarker();
         assertEquals("anchorU should match ", 0.5, marker.getAnchorU(), 0);
         assertEquals("anchorU should match ", 1, marker.getAnchorV(), 0);
     }
@@ -95,7 +89,7 @@ public class MarkerViewTest {
     public void testInfoWindowAnchor() {
         float anchorU = 1;
         float anchorV = 1;
-        MarkerViewOptions markerOptions = new MarkerViewOptions().infoWindowAnchor(anchorU, anchorV);
+        MarkerViewOptions markerOptions = new MarkerViewOptions().position(new LatLng()).infoWindowAnchor(anchorU, anchorV);
         MarkerView marker = markerOptions.getMarker();
         assertEquals("anchorU should match ", 1, marker.getInfoWindowAnchorU(), 0);
         assertEquals("anchorU should match ", 1, marker.getInfoWindowAnchorV(), 0);
@@ -103,31 +97,15 @@ public class MarkerViewTest {
 
     @Test
     public void testInfoWindowAnchorDefault() {
-        MarkerView marker = new MarkerViewOptions().getMarker();
+        MarkerView marker = new MarkerViewOptions().position(new LatLng()).getMarker();
         assertEquals("anchorU should match ", 0.5, marker.getInfoWindowAnchorU(), 0);
         assertEquals("anchorU should match ", 0, marker.getInfoWindowAnchorV(), 0);
     }
 
     @Test
-    public void testSelectAnimRes() {
-        int animatorRes = R.animator.rotate_360;
-        MarkerViewOptions markerOptions = new MarkerViewOptions().selectAnimatorResource(animatorRes);
-        MarkerView marker = markerOptions.getMarker();
-        assertEquals("select animator resource should match ", animatorRes, marker.getSelectAnimRes(), 0);
-    }
-
-    @Test
-    public void testDeselectAnimRes() {
-        int animatorRes = R.animator.rotate_360;
-        MarkerViewOptions markerOptions = new MarkerViewOptions().deselectAnimatorResource(animatorRes);
-        MarkerView marker = markerOptions.getMarker();
-        assertEquals("deselect animator resource should match ", animatorRes, marker.getDeselectAnimRes(), 0);
-    }
-
-    @Test
     public void testRotation() {
         int rotation = 90;
-        MarkerViewOptions markerOptions = new MarkerViewOptions().rotation(rotation);
+        MarkerViewOptions markerOptions = new MarkerViewOptions().position(new LatLng()).rotation(rotation);
         MarkerView marker = markerOptions.getMarker();
         assertEquals("rotation should match ", rotation, marker.getRotation(), 0);
     }
@@ -135,27 +113,26 @@ public class MarkerViewTest {
     @Test
     public void testVisible() {
         boolean visible = false;
-        MarkerViewOptions markerOptions = new MarkerViewOptions().visible(visible);
+        MarkerViewOptions markerOptions = new MarkerViewOptions().visible(visible).position(new LatLng());
         MarkerView marker = markerOptions.getMarker();
         assertEquals("visible should match ", visible, marker.isVisible());
     }
 
     @Test
     public void testVisibleDefault() {
-        assertTrue(new MarkerViewOptions().getMarker().isVisible());
+        assertTrue(new MarkerViewOptions().position(new LatLng()).getMarker().isVisible());
     }
 
     @Test
     public void testBuilder() {
         MarkerView marker = new MarkerViewOptions().title("title").snippet("snippet").position(new LatLng(10, 12)).getMarker();
         assertEquals(marker.getSnippet(), "snippet");
-
         assertEquals(marker.getPosition(), new LatLng(10, 12));
     }
 
     @Test
     public void testHashCode() {
-        MarkerView marker = new MarkerViewOptions().getMarker();
+        MarkerView marker = new MarkerViewOptions().position(new LatLng()).getMarker();
         assertEquals("hash code should match", marker.hashCode(), 0);
     }