diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com')
11 files changed, 204 insertions, 145 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java index 11ab8173fd..1398f40009 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/InfoWindowTest.java @@ -32,7 +32,7 @@ public class InfoWindowTest { @Test public void testBoundMarker() { MarkerOptions markerOptions = new MarkerOptions(); - Marker marker = markerOptions.getMarker(); + Marker marker = markerOptions.position(new LatLng()).getMarker(); InfoWindow infoWindow = new InfoWindow(mMapView, mMapboxMap).setBoundMarker(marker); assertEquals("marker should match", marker, infoWindow.getBoundMarker()); } @@ -53,7 +53,7 @@ public class InfoWindowTest { when(projection.toScreenLocation(latLng)).thenReturn(new PointF(0, 0)); InfoWindow infoWindow = new InfoWindow(mMapView, mMapboxMap); - infoWindow.open(mMapView, new MarkerOptions().getMarker(), latLng, 0, 0); + infoWindow.open(mMapView, new MarkerOptions().position(new LatLng()).getMarker(), latLng, 0, 0); assertEquals("infowindow should not be visible", true, infoWindow.isVisible()); } @@ -65,7 +65,7 @@ public class InfoWindowTest { when(projection.toScreenLocation(latLng)).thenReturn(new PointF(0, 0)); InfoWindow infoWindow = new InfoWindow(mMapView, mMapboxMap); - infoWindow.open(mMapView, new MarkerOptions().getMarker(), latLng, 0, 0); + infoWindow.open(mMapView, new MarkerOptions().position(new LatLng()).getMarker(), latLng, 0, 0); infoWindow.close(); assertEquals("infowindow should not be visible", false, infoWindow.isVisible()); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java index a55672e86b..c4c294fb98 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/annotations/MarkerTest.java @@ -3,6 +3,7 @@ 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.utils.MockParcel; @@ -23,10 +24,15 @@ public class MarkerTest { @Test public void testMarker() { - MarkerOptions markerOptions = new MarkerOptions(); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()); assertNotNull("marker should not be null", markerOptions.getMarker()); } + @Test(expected = InvalidMarkerPositionException.class) + public void testInvalidMarker(){ + new MarkerOptions().getMarker(); + } + @Test public void testPosition() { MarkerOptions markerOptions = new MarkerOptions().position(new LatLng(10, 12)); @@ -37,7 +43,7 @@ public class MarkerTest { @Test public void testTitle() { - MarkerOptions markerOptions = new MarkerOptions().title("Mapbox"); + MarkerOptions markerOptions = new MarkerOptions().title("Mapbox").position(new LatLng()); Marker marker = markerOptions.getMarker(); assertEquals(marker.getTitle(), "Mapbox"); assertEquals(markerOptions.getTitle(), "Mapbox"); @@ -45,7 +51,7 @@ public class MarkerTest { @Test public void testSnippet() { - MarkerOptions markerOptions = new MarkerOptions().snippet("Mapbox"); + MarkerOptions markerOptions = new MarkerOptions().snippet("Mapbox").position(new LatLng()); Marker marker = markerOptions.getMarker(); assertEquals(marker.getSnippet(), "Mapbox"); } @@ -62,7 +68,7 @@ public class MarkerTest { public void testIcon() { Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_4444); Icon icon = IconFactory.recreate("test", bitmap); - MarkerOptions markerOptions = new MarkerOptions().icon(icon); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()).icon(icon); Marker marker = markerOptions.getMarker(); assertEquals("Icon should match", icon, marker.getIcon()); assertEquals("Icon should match", icon, markerOptions.getIcon()); @@ -70,7 +76,7 @@ public class MarkerTest { @Test public void testHashCode() { - Marker marker = new MarkerOptions().getMarker(); + Marker marker = new MarkerOptions().position(new LatLng()).getMarker(); assertEquals("hash code should match", marker.hashCode(), 0); } 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); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java index a8cca4c3c8..4775bb39a4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java @@ -3,10 +3,10 @@ package com.mapbox.mapboxsdk.camera; import android.content.res.TypedArray; import android.os.Parcelable; +import com.mapbox.mapboxsdk.R; import com.mapbox.mapboxsdk.constants.MapboxConstants; import com.mapbox.mapboxsdk.constants.MathConstants; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.testapp.R; import com.mapbox.mapboxsdk.utils.MathUtils; import com.mapbox.mapboxsdk.utils.MockParcel; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/constants/StyleVersionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/constants/StyleVersionTest.java index 078b4184ca..3d9b2a9364 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/constants/StyleVersionTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/constants/StyleVersionTest.java @@ -1,5 +1,6 @@ package com.mapbox.mapboxsdk.constants; + import com.mapbox.mapboxsdk.testapp.model.constants.AppConstant; import org.junit.Test; diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java index b667940a6f..b2cc1e9046 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java @@ -8,6 +8,9 @@ import com.mapbox.mapboxsdk.utils.MockParcel; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -106,6 +109,24 @@ public class LatLngBoundsTest { } @Test + public void testIncludes() { + List<LatLng> points = new ArrayList<>(); + points.add(LAT_LNG_NULL_ISLAND); + points.add(LAT_LNG_NOT_NULL_ISLAND); + + LatLngBounds latLngBounds1 = new LatLngBounds.Builder() + .includes(points) + .build(); + + LatLngBounds latLngBounds2 = new LatLngBounds.Builder() + .include(LAT_LNG_NULL_ISLAND) + .include(LAT_LNG_NOT_NULL_ISLAND) + .build(); + + assertEquals("LatLngBounds should match", latLngBounds1, latLngBounds2); + } + + @Test public void testNoIncluding() { assertFalse("LatLng should not be included", mLatLngBounds.contains(new LatLng(3, 1))); } 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 index b69ba4e3f8..33fd77521d 100644 --- 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 @@ -13,6 +13,7 @@ import com.mapbox.mapboxsdk.annotations.Polyline; import com.mapbox.mapboxsdk.annotations.PolylineOptions; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; +import com.mapbox.mapboxsdk.exceptions.InvalidMarkerPositionException; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.geometry.LatLngBounds; @@ -572,16 +573,21 @@ public class MapboxMapTest { @Test public void testAddMarker() { - MarkerOptions markerOptions = new MarkerOptions(); + 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().title("a"); - MarkerOptions markerOptions2 = new MarkerOptions().title("b"); + MarkerOptions markerOptions1 = new MarkerOptions().position(new LatLng()).title("a"); + MarkerOptions markerOptions2 = new MarkerOptions().position(new LatLng()).title("b"); markerList.add(markerOptions1); markerList.add(markerOptions2); mMapboxMap.addMarkers(markerList); @@ -600,7 +606,7 @@ public class MapboxMapTest { @Test public void testAddMarkersSingleMarker() { List<BaseMarkerOptions> markerList = new ArrayList<>(); - MarkerOptions markerOptions = new MarkerOptions().title("a"); + MarkerOptions markerOptions = new MarkerOptions().title("a").position(new LatLng()); markerList.add(markerOptions); mMapboxMap.addMarkers(markerList); assertEquals("Markers size should be 1", 1, mMapboxMap.getMarkers().size()); @@ -701,7 +707,7 @@ public class MapboxMapTest { @Test public void testRemoveMarker() { - MarkerOptions markerOptions = new MarkerOptions(); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()); Marker marker = mMapboxMap.addMarker(markerOptions); mMapboxMap.removeMarker(marker); assertTrue("Markers should be empty", mMapboxMap.getMarkers().isEmpty()); @@ -725,7 +731,7 @@ public class MapboxMapTest { @Test public void testRemoveAnnotation() { - MarkerOptions markerOptions = new MarkerOptions(); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()); Marker marker = mMapboxMap.addMarker(markerOptions); mMapboxMap.removeAnnotation(marker); assertTrue("Annotations should be empty", mMapboxMap.getAnnotations().isEmpty()); @@ -733,7 +739,7 @@ public class MapboxMapTest { @Test public void testRemoveAnnotationById() { - MarkerOptions markerOptions = new MarkerOptions(); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()); mMapboxMap.addMarker(markerOptions); // id will always be 0 in unit tests mMapboxMap.removeAnnotation(0); @@ -743,8 +749,8 @@ public class MapboxMapTest { @Test public void testRemoveAnnotations() { List<BaseMarkerOptions> markerList = new ArrayList<>(); - MarkerOptions markerOptions1 = new MarkerOptions().title("a"); - MarkerOptions markerOptions2 = new MarkerOptions().title("b"); + 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); @@ -755,8 +761,8 @@ public class MapboxMapTest { @Test public void testClear() { List<BaseMarkerOptions> markerList = new ArrayList<>(); - MarkerOptions markerOptions1 = new MarkerOptions().title("a"); - MarkerOptions markerOptions2 = new MarkerOptions().title("b"); + 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); @@ -767,12 +773,12 @@ public class MapboxMapTest { @Test public void testRemoveAnnotationsByList() { List<BaseMarkerOptions> markerList = new ArrayList<>(); - MarkerOptions markerOptions1 = new MarkerOptions().title("a"); - MarkerOptions markerOptions2 = new MarkerOptions().title("b"); + 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().title("c")); + 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)); @@ -780,7 +786,7 @@ public class MapboxMapTest { @Test public void testGetAnnotationById() { - MarkerOptions markerOptions = new MarkerOptions(); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()); Marker initialMarker = mMapboxMap.addMarker(markerOptions); Marker retrievedMarker = (Marker) mMapboxMap.getAnnotation(0); assertEquals("Markers should match", initialMarker, retrievedMarker); @@ -814,7 +820,7 @@ public class MapboxMapTest { @Test public void testSelectMarker() { mMapboxMap.setOnMarkerClickListener(mOnMarkerClickListener); - MarkerOptions markerOptions = new MarkerOptions(); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()); Marker marker = mMapboxMap.addMarker(markerOptions); when(mOnMarkerClickListener.onMarkerClick(marker)).thenReturn(true); mMapboxMap.selectMarker(marker); @@ -824,7 +830,7 @@ public class MapboxMapTest { @Test public void testDeselectMarker() { mMapboxMap.setOnMarkerClickListener(mOnMarkerClickListener); - MarkerOptions markerOptions = new MarkerOptions(); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()); Marker marker = mMapboxMap.addMarker(markerOptions); when(mOnMarkerClickListener.onMarkerClick(marker)).thenReturn(true); mMapboxMap.selectMarker(marker); @@ -835,7 +841,7 @@ public class MapboxMapTest { @Test public void testDeselectMarkers() { mMapboxMap.setOnMarkerClickListener(mOnMarkerClickListener); - MarkerOptions markerOptions = new MarkerOptions(); + MarkerOptions markerOptions = new MarkerOptions().position(new LatLng()); Marker marker1 = mMapboxMap.addMarker(markerOptions); Marker marker2 = mMapboxMap.addMarker(markerOptions); when(mOnMarkerClickListener.onMarkerClick(marker1)).thenReturn(true); @@ -853,7 +859,7 @@ public class MapboxMapTest { @Test public void testOnMarkerClick() { mMapboxMap.setOnMarkerClickListener(mOnMarkerClickListener); - Marker marker = new MarkerOptions().getMarker(); + 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/StyleInitializerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/StyleInitializerTest.java deleted file mode 100644 index 71d61a3d4b..0000000000 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/maps/StyleInitializerTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.mapbox.mapboxsdk.maps; - -import android.content.Context; -import android.content.res.Resources; - -import com.mapbox.mapboxsdk.testapp.R; -import com.mapbox.mapboxsdk.testapp.model.constants.AppConstant; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.InjectMocks; -import org.mockito.MockitoAnnotations; - -import java.util.Locale; - -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.when; - -public class StyleInitializerTest { - - @InjectMocks - Context context = mock(Context.class); - - @InjectMocks - Resources resources = mock(Resources.class); - - MapView.StyleInitializer initializer; - - @Before - public void beforeTest() { - MockitoAnnotations.initMocks(this); - when(context.getResources()).thenReturn(resources); - when(resources.getInteger(R.integer.style_version)).thenReturn(AppConstant.STYLE_VERSION); - initializer = new MapView.StyleInitializer(context); - } - - @Test - public void testSanity() { - assertNotNull("initializer should not be null", initializer); - } - - @Test - public void testDefaultStyle() { - assertTrue(initializer.isDefaultStyle()); - assertEquals(String.format(Locale.US, "mapbox://styles/mapbox/streets-v%d", AppConstant.STYLE_VERSION), "mapbox://styles/mapbox/streets-v9"); - } - - @Test - public void testUpdateStyle() { - String customStyle = "test"; - initializer.setStyle(customStyle); - assertFalse(initializer.isDefaultStyle()); - assertEquals(customStyle, initializer.getStyle()); - } - - @Test - public void testUpdateStyleNull() { - String customStyle = null; - initializer.setStyle(customStyle); - assertTrue(initializer.isDefaultStyle()); - assertEquals(String.format(Locale.US, "mapbox://styles/mapbox/streets-v%d", AppConstant.STYLE_VERSION), "mapbox://styles/mapbox/streets-v9"); - } - - @Test - public void testOverrideDefaultStyle() { - String customStyle = "test"; - initializer.setStyle(customStyle, true); - assertTrue(initializer.isDefaultStyle()); - assertEquals(customStyle, initializer.getStyle()); - } -} 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 a03eb6acae..fd70308931 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 @@ -16,6 +16,7 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class MyLocationViewSettingsTest { @@ -41,6 +42,9 @@ public class MyLocationViewSettingsTest { public void testForegroundDrawables() { Drawable foregroundDrawable = mock(Drawable.class); Drawable foregroundBearingDrawable = mock(Drawable.class); + Drawable.ConstantState constantState = mock(Drawable.ConstantState.class); + when(foregroundDrawable.getConstantState()).thenReturn(constantState); + when(constantState.newDrawable()).thenReturn(foregroundDrawable); locationViewSettings.setForegroundDrawable(foregroundDrawable, foregroundBearingDrawable); assertEquals("foreground should match", foregroundDrawable, locationViewSettings.getForegroundDrawable()); assertEquals("foreground bearing should match", foregroundBearingDrawable, locationViewSettings.getForegroundBearingDrawable()); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/style/layers/FilterTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/style/layers/FilterTest.java new file mode 100644 index 0000000000..3e312d3b0a --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/style/layers/FilterTest.java @@ -0,0 +1,90 @@ +package com.mapbox.mapboxsdk.style.layers; + +import org.junit.Test; + +import static org.junit.Assert.*; +import static com.mapbox.mapboxsdk.style.layers.Filter.*; + +/** + * Tests for Filter + */ +public class FilterTest { + + @Test + public void testAll() { + assertArrayEquals(all().toArray(), new Object[]{"all"}); + assertArrayEquals( + all(eq("key", 2), neq("key", 3)).toArray(), + new Object[]{"all", new Object[]{"==", "key", 2}, new Object[]{"!=", "key", 3}} + ); + } + + @Test + public void testAny() { + assertArrayEquals(any().toArray(), new Object[]{"any"}); + assertArrayEquals( + any(eq("key", 2), neq("key", 3)).toArray(), + new Object[]{"any", new Object[]{"==", "key", 2}, new Object[]{"!=", "key", 3}} + ); + } + + @Test + public void testNone() { + assertArrayEquals(none().toArray(), new Object[]{"none"}); + assertArrayEquals( + none(eq("key", 2), neq("key", 3)).toArray(), + new Object[]{"none", new Object[]{"==", "key", 2}, new Object[]{"!=", "key", 3}} + ); + } + + @Test + public void testHas() { + assertArrayEquals(has("key").toArray(), new Object[]{"has", "key"}); + } + + @Test + public void testHasNot() { + assertArrayEquals(notHas("key").toArray(), new Object[]{"!has", "key"}); + } + + @Test + public void testEq() { + assertArrayEquals(eq("key", 1).toArray(), new Object[]{"==", "key", 1}); + + } + + @Test + public void testNeq() { + assertArrayEquals(neq("key", 1).toArray(), new Object[]{"!=", "key", 1}); + } + + @Test + public void testGt() { + assertArrayEquals(gt("key", 1).toArray(), new Object[]{">", "key", 1}); + } + + @Test + public void testGte() { + assertArrayEquals(gte("key", 1).toArray(), new Object[]{">=", "key", 1}); + } + + @Test + public void testLt() { + assertArrayEquals(lt("key", 1).toArray(), new Object[]{"<", "key", 1}); + } + + @Test + public void testLte() { + assertArrayEquals(lte("key", 1).toArray(), new Object[]{"<=", "key", 1}); + } + + @Test + public void testIn() { + assertArrayEquals(in("key", 1, 2, "Aap").toArray(), new Object[]{"in", "key", 1, 2, "Aap"}); + } + + @Test + public void testNotIn() { + assertArrayEquals(notIn("key", 1, 2, "Noot").toArray(), new Object[]{"!in", "key", 1, 2, "Noot"}); + } +} diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/style/layers/FunctionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/style/layers/FunctionTest.java new file mode 100644 index 0000000000..1106009ea8 --- /dev/null +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/test/java/com/mapbox/mapboxsdk/style/layers/FunctionTest.java @@ -0,0 +1,29 @@ +package com.mapbox.mapboxsdk.style.layers; + +import org.junit.Test; + +import static com.mapbox.mapboxsdk.style.layers.Function.*; +import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; + +import static org.junit.Assert.*; + +/** + * Tests Function + */ +public class FunctionTest { + + @Test + public void testZoomFunction() { + Function zoomF = zoom( + stop(1f, lineBlur(1f)), + stop(10f, lineBlur(20f)) + ); + + assertNotNull(zoomF.toValueObject()); + assertArrayEquals( + new Object[]{new Object[]{1f, 1f}, new Object[]{10f, 20f}}, + (Object[]) zoomF.toValueObject().get("stops") + ); + } + +} |