summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorCameron <cameron@mapbox.com>2016-06-03 14:59:01 -0400
committerCameron <cameron@mapbox.com>2016-06-03 14:59:01 -0400
commit32a3d98be041f6ecd31af80570f78e802887225b (patch)
tree35079aac722091cfaa3e3d442f2bf5e840749c40 /platform
parentea67a995de93c2b6e06996d9e31d9a1db63a7109 (diff)
parentaa83245c07865bac02fa2f7722fe587b57908198 (diff)
downloadqtlocation-mapboxgl-32a3d98be041f6ecd31af80570f78e802887225b.tar.gz
Merge branch '5193-fix-style-url' of github.com:mapbox/mapbox-gl-native into 5193-fix-style-url
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerViewTest.java11
1 files changed, 0 insertions, 11 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..7d874f21fe 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,6 +1,5 @@
package com.mapbox.mapboxsdk.annotations;
-import android.graphics.Bitmap;
import android.os.Parcelable;
import com.mapbox.mapboxsdk.geometry.LatLng;
@@ -53,16 +52,6 @@ public class MarkerViewTest {
}
@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);
MarkerView marker = markerOptions.getMarker();