diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox')
4 files changed, 10 insertions, 16 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt index f16de23d69..a1fe6af659 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/maps/NativeMapViewTest.kt @@ -52,8 +52,8 @@ class NativeMapViewTest { @UiThreadTest fun testSetStyleUrl() { val expected = Style.DARK - nativeMapView.styleUrl = expected - val actual = nativeMapView.styleUrl + nativeMapView.styleUri = expected + val actual = nativeMapView.styleUri assertEquals("Style URL should match", expected, actual) } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java index 97a73ba1cb..c168bf5f2e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/EspressoTest.java @@ -22,7 +22,7 @@ public class EspressoTest extends BaseTest { @UiThread @Override protected void initMap(MapboxMap mapboxMap) { - mapboxMap.setStyle(new Style.Builder().fromUrl("asset://streets.json")); + mapboxMap.setStyle(new Style.Builder().fromUri("asset://streets.json")); super.initMap(mapboxMap); } } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java index a4a34e752e..2d1fbf5fc4 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java @@ -26,8 +26,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import timber.log.Timber; -import java.net.MalformedURLException; -import java.net.URL; import java.util.List; import static android.support.test.espresso.Espresso.onView; @@ -223,7 +221,7 @@ public class RuntimeStyleTests extends EspressoTest { invoke(mapboxMap, (uiController, mapboxMap) -> { VectorSource source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"); mapboxMap.getStyle().addSource(source); - assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl()); + assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUri()); }); } @@ -233,23 +231,19 @@ public class RuntimeStyleTests extends EspressoTest { invoke(mapboxMap, (uiController, mapboxMap) -> { RasterSource source = new RasterSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"); mapboxMap.getStyle().addSource(source); - assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl()); + assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUri()); }); } @Test - public void testGeoJsonSourceUrlGetter() throws MalformedURLException { + public void testGeoJsonSourceUrlGetter() { validateTestSetup(); invoke(mapboxMap, (uiController, mapboxMap) -> { GeoJsonSource source = new GeoJsonSource("my-source"); mapboxMap.getStyle().addSource(source); - assertNull(source.getUrl()); - try { - source.setUrl(new URL("http://mapbox.com/my-file.json")); - } catch (MalformedURLException exception) { - fail(); - } - assertEquals("http://mapbox.com/my-file.json", source.getUrl()); + assertNull(source.getUri()); + source.setUri("http://mapbox.com/my-file.json"); + assertEquals("http://mapbox.com/my-file.json", source.getUri()); }); } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java index fd666d9fd3..495b209831 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/StyleLoaderTest.java @@ -49,7 +49,7 @@ public class StyleLoaderTest extends EspressoTest { mapView.onResume(); String actual = mapboxMap.getStyle().getJson(); - assertEquals("Style URL should be empty", "", mapboxMap.getStyle().getUrl()); + assertEquals("Style URL should be empty", "", mapboxMap.getStyle().getUri()); assertEquals("Style json should match", expected, actual); } catch (IOException exception) { exception.printStackTrace(); |