diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleTests.java | 108 |
1 files changed, 54 insertions, 54 deletions
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 a1b1317a01..8937456b09 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 @@ -66,7 +66,7 @@ public class RuntimeStyleTests extends BaseActivityTest { @Override public void perform(UiController uiController, View view) { - List<Layer> layers = mapboxMap.getLayers(); + List<Layer> layers = mapboxMap.getStyle().getLayers(); assertNotNull(layers); assertTrue(layers.size() > 0); for (Layer layer : layers) { @@ -89,12 +89,12 @@ public class RuntimeStyleTests extends BaseActivityTest { onView(withId(R.id.mapView)).perform(new BaseViewAction() { @Override public void perform(UiController uiController, View view) { - List<Layer> layers = mapboxMap.getLayers(); - Source source = mapboxMap.getSources().get(0); + List<Layer> layers = mapboxMap.getStyle().getLayers(); + Source source = mapboxMap.getStyle().getSources().get(0); // Test inserting with invalid above-id try { - mapboxMap.addLayerAbove(new CircleLayer("invalid-id-layer-test", source.getId()), "no-such-layer-here-man"); + mapboxMap.getStyle().addLayerAbove(new CircleLayer("invalid-id-layer-test", source.getId()), "no-such-layer-here-man"); fail("Should have thrown exception"); } catch (CannotAddLayerException ex) { // Yeah @@ -103,14 +103,14 @@ public class RuntimeStyleTests extends BaseActivityTest { // Insert as last CircleLayer last = new CircleLayer("this is the last one", source.getId()); - mapboxMap.addLayerAbove(last, layers.get(layers.size() - 1).getId()); - layers = mapboxMap.getLayers(); + mapboxMap.getStyle().addLayerAbove(last, layers.get(layers.size() - 1).getId()); + layers = mapboxMap.getStyle().getLayers(); assertEquals(last.getId(), layers.get(layers.size() - 1).getId()); // Insert CircleLayer second = new CircleLayer("this is the second one", source.getId()); - mapboxMap.addLayerAbove(second, layers.get(0).getId()); - layers = mapboxMap.getLayers(); + mapboxMap.getStyle().addLayerAbove(second, layers.get(0).getId()); + layers = mapboxMap.getStyle().getLayers(); assertEquals(second.getId(), layers.get(1).getId()); } }); @@ -124,14 +124,14 @@ public class RuntimeStyleTests extends BaseActivityTest { @Override public void perform(UiController uiController, View view) { // Remove by index - Layer firstLayer = mapboxMap.getLayers().get(0); - boolean removed = mapboxMap.removeLayerAt(0); + Layer firstLayer = mapboxMap.getStyle().getLayers().get(0); + boolean removed = mapboxMap.getStyle().removeLayerAt(0); assertTrue(removed); assertNotNull(firstLayer); // Test remove by index bounds checks Timber.i("Remove layer at index > size"); - assertFalse(mapboxMap.removeLayerAt(Integer.MAX_VALUE)); + assertNull(mapboxMap.getStyle().removeLayerAt(Integer.MAX_VALUE)); } }); } @@ -141,12 +141,12 @@ public class RuntimeStyleTests extends BaseActivityTest { onView(withId(R.id.mapView)).perform(new BaseViewAction() { @Override public void perform(UiController uiController, View view) { - List<Layer> layers = mapboxMap.getLayers(); - Source source = mapboxMap.getSources().get(0); + List<Layer> layers = mapboxMap.getStyle().getLayers(); + Source source = mapboxMap.getStyle().getSources().get(0); // Test inserting out of range try { - mapboxMap.addLayerAt(new CircleLayer("invalid-id-layer-test", source.getId()), layers.size()); + mapboxMap.getStyle().addLayerAt(new CircleLayer("invalid-id-layer-test", source.getId()), layers.size()); fail("Should have thrown exception"); } catch (CannotAddLayerException ex) { // Yeah @@ -155,14 +155,14 @@ public class RuntimeStyleTests extends BaseActivityTest { // Insert at current last position CircleLayer last = new CircleLayer("this is the last one", source.getId()); - mapboxMap.addLayerAt(last, layers.size() - 1); - layers = mapboxMap.getLayers(); + mapboxMap.getStyle().addLayerAt(last, layers.size() - 1); + layers = mapboxMap.getStyle().getLayers(); assertEquals(last.getId(), layers.get(layers.size() - 2).getId()); // Insert at start CircleLayer second = new CircleLayer("this is the first one", source.getId()); - mapboxMap.addLayerAt(second, 0); - layers = mapboxMap.getLayers(); + mapboxMap.getStyle().addLayerAt(second, 0); + layers = mapboxMap.getStyle().getLayers(); assertEquals(second.getId(), layers.get(0).getId()); } }); @@ -176,7 +176,7 @@ public class RuntimeStyleTests extends BaseActivityTest { @Override public void perform(UiController uiController, View view) { - List<Source> sources = mapboxMap.getSources(); + List<Source> sources = mapboxMap.getStyle().getSources(); assertNotNull(sources); assertTrue(sources.size() > 0); for (Source source : sources) { @@ -191,34 +191,34 @@ public class RuntimeStyleTests extends BaseActivityTest { public void testAddRemoveSource() { validateTestSetup(); invoke(mapboxMap, (uiController, mapboxMap) -> { - mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2")); - mapboxMap.removeSource("my-source"); + mapboxMap.getStyle().addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2")); + mapboxMap.getStyle().removeSource("my-source"); // Add initial source - mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2")); + mapboxMap.getStyle().addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2")); // Remove - boolean removeOk = mapboxMap.removeSource("my-source"); + boolean removeOk = mapboxMap.getStyle().removeSource("my-source"); assertTrue(removeOk); - assertNull(mapboxMap.getLayer("my-source")); + assertNull(mapboxMap.getStyle().getLayer("my-source")); // Add Source source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"); - mapboxMap.addSource(source); + mapboxMap.getStyle().addSource(source); // Remove, preserving the reference - mapboxMap.removeSource(source); + mapboxMap.getStyle().removeSource(source); // Re-add the reference... - mapboxMap.addSource(source); + mapboxMap.getStyle().addSource(source); // Ensure it's there - Assert.assertNotNull(mapboxMap.getSource(source.getId())); + Assert.assertNotNull(mapboxMap.getStyle().getSource(source.getId())); // Test adding a duplicate source try { Source source2 = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"); - mapboxMap.addSource(source2); + mapboxMap.getStyle().addSource(source2); fail("Should not have been allowed to add a source with a duplicate id"); } catch (CannotAddSourceException cannotAddSourceException) { // OK @@ -232,7 +232,7 @@ public class RuntimeStyleTests extends BaseActivityTest { validateTestSetup(); invoke(mapboxMap, (uiController, mapboxMap) -> { VectorSource source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"); - mapboxMap.addSource(source); + mapboxMap.getStyle().addSource(source); assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl()); }); } @@ -242,7 +242,7 @@ public class RuntimeStyleTests extends BaseActivityTest { validateTestSetup(); invoke(mapboxMap, (uiController, mapboxMap) -> { RasterSource source = new RasterSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"); - mapboxMap.addSource(source); + mapboxMap.getStyle().addSource(source); assertEquals("mapbox://mapbox.mapbox-terrain-v2", source.getUrl()); }); } @@ -252,7 +252,7 @@ public class RuntimeStyleTests extends BaseActivityTest { validateTestSetup(); invoke(mapboxMap, (uiController, mapboxMap) -> { GeoJsonSource source = new GeoJsonSource("my-source"); - mapboxMap.addSource(source); + mapboxMap.getStyle().addSource(source); assertNull(source.getUrl()); try { source.setUrl(new URL("http://mapbox.com/my-file.json")); @@ -271,10 +271,10 @@ public class RuntimeStyleTests extends BaseActivityTest { @Override public void perform(UiController uiController, View view) { - mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2")); - mapboxMap.addLayer(new LineLayer("my-layer", "my-source")); - mapboxMap.removeSource("my-source"); - assertNotNull(mapboxMap.getSource("my-source")); + mapboxMap.getStyle().addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2")); + mapboxMap.getStyle().addLayer(new LineLayer("my-layer", "my-source")); + mapboxMap.getStyle().removeSource("my-source"); + assertNotNull(mapboxMap.getStyle().getSource("my-source")); } }); @@ -282,28 +282,28 @@ public class RuntimeStyleTests extends BaseActivityTest { @Test public void testRemoveNonExistingSource() { - invoke(mapboxMap, (uiController, mapboxMap) -> mapboxMap.removeSource("source")); + invoke(mapboxMap, (uiController, mapboxMap) -> mapboxMap.getStyle().removeSource("source")); } @Test public void testRemoveNonExistingLayer() { invoke(mapboxMap, (uiController, mapboxMap) -> { - assertFalse(mapboxMap.removeLayer("layer")); - assertFalse(mapboxMap.removeLayerAt(mapboxMap.getLayers().size() + 1)); - assertFalse(mapboxMap.removeLayerAt(-1)); + assertFalse(mapboxMap.getStyle().removeLayer("layer")); + assertFalse(mapboxMap.getStyle().removeLayerAt(mapboxMap.getStyle().getLayers().size() + 1)); + assertFalse(mapboxMap.getStyle().removeLayerAt(-1)); }); } @Test public void testRemoveExistingLayer() { invoke(mapboxMap, (uiController, mapboxMap) -> { - Layer firstLayer = mapboxMap.getLayers().get(0); - assertTrue(mapboxMap.removeLayer(firstLayer)); + Layer firstLayer = mapboxMap.getStyle().getLayers().get(0); + assertTrue(mapboxMap.getStyle().removeLayer(firstLayer)); - firstLayer = mapboxMap.getLayers().get(0); - assertTrue(mapboxMap.removeLayer(firstLayer.getId())); + firstLayer = mapboxMap.getStyle().getLayers().get(0); + assertTrue(mapboxMap.getStyle().removeLayer(firstLayer.getId())); - assertTrue(mapboxMap.removeLayerAt(0)); + assertTrue(mapboxMap.getStyle().removeLayerAt(0)); }); } @@ -332,37 +332,37 @@ public class RuntimeStyleTests extends BaseActivityTest { @Override public void perform(UiController uiController, View view) { // Get initial - assertNotNull(mapboxMap.getLayer("building")); + assertNotNull(mapboxMap.getStyle().getLayer("building")); // Remove - boolean removed = mapboxMap.removeLayer("building"); + boolean removed = mapboxMap.getStyle().removeLayer("building"); assertTrue(removed); - assertNull(mapboxMap.getLayer("building")); + assertNull(mapboxMap.getStyle().getLayer("building")); // Add FillLayer layer = new FillLayer("building", "composite"); layer.setSourceLayer("building"); - mapboxMap.addLayer(layer); - assertNotNull(mapboxMap.getLayer("building")); + mapboxMap.getStyle().addLayer(layer); + assertNotNull(mapboxMap.getStyle().getLayer("building")); // Assure the reference still works layer.setProperties(PropertyFactory.visibility(Property.VISIBLE)); // Remove, preserving the reference - mapboxMap.removeLayer(layer); + mapboxMap.getStyle().removeLayer(layer); // Property setters should still work layer.setProperties(PropertyFactory.fillColor(Color.RED)); // Re-add the reference... - mapboxMap.addLayer(layer); + mapboxMap.getStyle().addLayer(layer); // Ensure it's there - Assert.assertNotNull(mapboxMap.getLayer(layer.getId())); + Assert.assertNotNull(mapboxMap.getStyle().getLayer(layer.getId())); // Test adding a duplicate layer try { - mapboxMap.addLayer(new FillLayer("building", "composite")); + mapboxMap.getStyle().addLayer(new FillLayer("building", "composite")); fail("Should not have been allowed to add a layer with a duplicate id"); } catch (CannotAddLayerException cannotAddLayerException) { // OK |