Merge branch '5193-fix-style-url' of github.com:mapbox/mapbox-gl-native into 5193-fix-style-url

This commit is contained in:
Cameron
2016-06-03 14:59:01 -04:00

View File

@@ -1,6 +1,5 @@
package com.mapbox.mapboxsdk.annotations;
import android.graphics.Bitmap;
import android.os.Parcelable;
import com.mapbox.mapboxsdk.geometry.LatLng;
@@ -52,16 +51,6 @@ public class MarkerViewTest {
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);