1 files changed, 160 insertions, 59 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 783601b1dd..eec00bdde9 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
@@ -1,100 +1,201 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
+import android.graphics.Color;
 import android.support.test.espresso.Espresso;
+import android.support.test.espresso.UiController;
+import android.support.test.espresso.ViewAction;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
+import com.mapbox.mapboxsdk.style.layers.CannotAddLayerException;
 import com.mapbox.mapboxsdk.style.layers.FillLayer;
 import com.mapbox.mapboxsdk.style.layers.NoSuchLayerException;
 import com.mapbox.mapboxsdk.style.layers.Property;
 import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
+import com.mapbox.mapboxsdk.style.sources.CannotAddSourceException;
 import com.mapbox.mapboxsdk.style.sources.NoSuchSourceException;
+import com.mapbox.mapboxsdk.style.sources.Source;
 import com.mapbox.mapboxsdk.style.sources.VectorSource;
 import com.mapbox.mapboxsdk.testapp.R;
 import com.mapbox.mapboxsdk.testapp.activity.style.RuntimeStyleTestActivity;
 import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
+import com.mapbox.mapboxsdk.testapp.utils.ViewUtils;
 
+import junit.framework.Assert;
+
+import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertFalse;
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static junit.framework.Assert.fail;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Basic smoke tests for Layer and Source
  */
 @RunWith(AndroidJUnit4.class)
-public class RuntimeStyleTests extends BaseStyleTest {
+public class RuntimeStyleTests {
+
+  @Rule
+  public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
+
+  private OnMapReadyIdlingResource idlingResource;
+
+  @Before
+  public void registerIdlingResource() {
+    idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
+    Espresso.registerIdlingResources(idlingResource);
+  }
+
+  @Test
+  public void testGetAddRemoveLayer() {
+    ViewUtils.checkViewIsDisplayed(R.id.mapView);
+    onView(withId(R.id.mapView)).perform(new AddRemoveLayerAction());
+  }
+
+  @Test
+  public void testAddRemoveSource() {
+    ViewUtils.checkViewIsDisplayed(R.id.mapView);
+
+    MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
+    mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
+    try {
+      mapboxMap.removeSource("my-source");
+    } catch (NoSuchSourceException noSuchSourceException) {
+      // it's ok..
+    }
+
+    onView(withId(R.id.mapView)).perform(new AddRemoveSourceAction());
+  }
+
+  private class AddRemoveLayerAction implements ViewAction {
 
-    @Rule
-    public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
+    @Override
+    public Matcher<View> getConstraints() {
+      return isDisplayed();
+    }
 
-    private OnMapReadyIdlingResource idlingResource;
+    @Override
+    public String getDescription() {
+      return getClass().getSimpleName();
+    }
 
-    @Before
-    public void registerIdlingResource() {
-        idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
-        Espresso.registerIdlingResources(idlingResource);
+    @Override
+    public void perform(UiController uiController, View view) {
+      MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
+
+      //Get initial
+      assertNotNull(mapboxMap.getLayer("building"));
+
+      //Remove
+      try {
+        mapboxMap.removeLayer("building");
+      } catch (NoSuchLayerException noSuchSourceException) {
+        fail("Definitively exists: " + noSuchSourceException.getMessage());
+      }
+      assertNull(mapboxMap.getLayer("building"));
+
+      //Add
+      FillLayer layer = new FillLayer("building", "composite");
+      layer.setSourceLayer("building");
+      mapboxMap.addLayer(layer);
+      assertNotNull(mapboxMap.getLayer("building"));
+
+      //Assure the reference still works
+      layer.setProperties(PropertyFactory.visibility(Property.VISIBLE));
+
+      //Remove, preserving the reference
+      try {
+        mapboxMap.removeLayer(layer);
+      } catch (NoSuchLayerException noSuchSourceException) {
+        fail("Definitively exists: " + noSuchSourceException.getMessage());
+      }
+
+      //Property setters should still work
+      layer.setProperties(PropertyFactory.fillColor(Color.RED));
+
+      //Re-add the reference...
+      mapboxMap.addLayer(layer);
+
+      //Ensure it's there
+      Assert.assertNotNull(mapboxMap.getLayer(layer.getId()));
+
+      //Test adding a duplicate layer
+      try {
+        mapboxMap.addLayer(new FillLayer("building", "composite"));
+        fail("Should not have been allowed to add a layer with a duplicate id");
+      } catch (CannotAddLayerException cannotAddLayerException) {
+        //OK
+      }
     }
+  }
 
-    /**
-     * TODO fix failing test
-     */
-    @Test
-    @Ignore
-    public void testGetAddRemoveLayer() {
-        checkViewIsDisplayed(R.id.mapView);
-
-        MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
-
-        //Get initial
-        assertNotNull(mapboxMap.getLayer("building"));
-
-        //Remove
-        try {
-            mapboxMap.removeLayer("building");
-        } catch (NoSuchLayerException e) {
-            assertFalse(true);
-        }
-        assertNull(mapboxMap.getLayer("building"));
-
-        //Add
-        FillLayer layer = new FillLayer("building", "composite");
-        layer.setSourceLayer("building");
-        mapboxMap.addLayer(layer);
-
-        assertNotNull(mapboxMap.getLayer("building"));
-
-        try {
-            layer.setProperties(PropertyFactory.visibility(Property.VISIBLE));
-            assertTrue("Never reached as the reference is invalid after adding", false);
-        } catch (Exception e) {
-            //Expected, reference is no longer valid
-        }
+  private class AddRemoveSourceAction implements ViewAction {
+
+    @Override
+    public Matcher<View> getConstraints() {
+      return isDisplayed();
     }
 
-    @Test
-    public void testAddRemoveSource() {
-        checkViewIsDisplayed(R.id.mapView);
-
-        MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
-        mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
-        try {
-            mapboxMap.removeSource("my-source");
-        } catch (NoSuchSourceException e) {
-            // it's ok..
-        }
+    @Override
+    public String getDescription() {
+      return getClass().getSimpleName();
     }
 
-    @After
-    public void unregisterIntentServiceIdlingResource() {
-        Espresso.unregisterIdlingResources(idlingResource);
+    @Override
+    public void perform(UiController uiController, View view) {
+      MapboxMap mapboxMap = rule.getActivity().getMapboxMap();
+
+      //Add initial source
+      mapboxMap.addSource(new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2"));
+
+      //Remove
+      try {
+        mapboxMap.removeSource("my-source");
+      } catch (NoSuchSourceException noSuchSourceException) {
+        fail("Definitively exists: " + noSuchSourceException.getMessage());
+      }
+      assertNull(mapboxMap.getLayer("my-source"));
+
+      //Add
+      Source source = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+      mapboxMap.addSource(source);
+
+      //Remove, preserving the reference
+      try {
+        mapboxMap.removeSource(source);
+      } catch (NoSuchSourceException noSuchSourceException) {
+        fail("Definitively exists: " + noSuchSourceException.getMessage());
+      }
+
+      //Re-add the reference...
+      mapboxMap.addSource(source);
+
+      //Ensure it's there
+      Assert.assertNotNull(mapboxMap.getSource(source.getId()));
+
+      //Test adding a duplicate source
+      try {
+        Source source2 = new VectorSource("my-source", "mapbox://mapbox.mapbox-terrain-v2");
+        mapboxMap.addSource(source2);
+        fail("Should not have been allowed to add a source with a duplicate id");
+      } catch (CannotAddSourceException cannotAddSourceException) {
+        //OK
+      }
     }
+  }
+
+  @After
+  public void unregisterIntentServiceIdlingResource() {
+    Espresso.unregisterIdlingResources(idlingResource);
+  }
 }