tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - replace Android logs with Timber (#6372) (#7149)

Browse Source
This commit is contained in:
Pablo Guardiola
2016-11-23 11:48:07 -05:00
committed by GitHub
parent 5a4b73f3be
commit ac924719e1
62 changed files with 640 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/BaseActivityTest.java
View File

@@ -4,9 +4,8 @@ import android.app.Activity;
import android.support.test.espresso.Espresso;
import android.support.test.espresso.IdlingResourceTimeoutException;
import android.support.test.rule.ActivityTestRule;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.testapp.R;
import com.mapbox.mapboxsdk.testapp.utils.OnMapReadyIdlingResource;
@@ -31,13 +30,13 @@ public abstract class BaseActivityTest {
@Before
public void beforeTest() {
try {
Log.e(MapboxConstants.TAG, "@Before test: register idle resource");
Timber.e("@Before test: register idle resource");
idlingResource = new OnMapReadyIdlingResource(rule.getActivity());
Espresso.registerIdlingResources(idlingResource);
checkViewIsDisplayed(R.id.mapView);
mapboxMap = idlingResource.getMapboxMap();
} catch (IdlingResourceTimeoutException e) {
Log.e(MapboxConstants.TAG, "Idling resource timed out. Couldn't not validate if map is ready.");
Timber.e("Idling resource timed out. Couldn't not validate if map is ready.");
throw new RuntimeException("Could not start test for " + getActivityClass().getSimpleName() + ".\n" +
"The ViewHierarchy doesn't contain a view with resource id = R.id.mapView or \n" +
"the Activity doesn't contain an instance variable with a name equal to mapboxMap.\n" +
@@ -64,7 +63,7 @@ public abstract class BaseActivityTest {
@After
public void afterTest() {
Log.e(MapboxConstants.TAG, "@After test: unregister idle resource");
Timber.e("@After test: unregister idle resource");
Espresso.unregisterIdlingResources(idlingResource);
}
}

23
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerStyleTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.BackgroundLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class BackgroundLayerStyleTest extends BaseStyleTest {
private static final String TAG = BackgroundLayerStyleTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -51,9 +50,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -70,9 +69,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "background-color");
Timber.i("background-color");
assertNotNull(layer);
//Set and Get
@@ -86,9 +85,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "background-color");
Timber.i("background-color");
assertNotNull(layer);
//Set and Get
@@ -102,9 +101,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "background-pattern");
Timber.i("background-pattern");
assertNotNull(layer);
//Set and Get
@@ -118,9 +117,9 @@ public class BackgroundLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "background-opacity");
Timber.i("background-opacity");
assertNotNull(layer);
//Set and Get

23
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.BackgroundLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class BackgroundLayerTest extends BaseStyleTest {
private static final String TAG = BackgroundLayerTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -51,9 +50,9 @@ public class BackgroundLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -70,9 +69,9 @@ public class BackgroundLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "background-color");
Timber.i("background-color");
assertNotNull(layer);
//Set and Get
@@ -86,9 +85,9 @@ public class BackgroundLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "background-color");
Timber.i("background-color");
assertNotNull(layer);
//Set and Get
@@ -102,9 +101,9 @@ public class BackgroundLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "background-pattern");
Timber.i("background-pattern");
assertNotNull(layer);
//Set and Get
@@ -118,9 +117,9 @@ public class BackgroundLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
Log.i(TAG, "background-opacity");
Timber.i("background-opacity");
assertNotNull(layer);
//Set and Get

39
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerStyleTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.CircleLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class CircleLayerStyleTest extends BaseStyleTest {
private static final String TAG = CircleLayerStyleTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +51,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +76,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-radius");
Timber.i("circle-radius");
assertNotNull(layer);
//Set and Get
@@ -99,14 +98,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-color");
Timber.i("circle-color");
assertNotNull(layer);
//Set and Get
@@ -121,14 +120,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-color");
Timber.i("circle-color");
assertNotNull(layer);
//Set and Get
@@ -143,14 +142,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-blur");
Timber.i("circle-blur");
assertNotNull(layer);
//Set and Get
@@ -165,14 +164,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-opacity");
Timber.i("circle-opacity");
assertNotNull(layer);
//Set and Get
@@ -187,14 +186,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-translate");
Timber.i("circle-translate");
assertNotNull(layer);
//Set and Get
@@ -209,14 +208,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-translate-anchor");
Timber.i("circle-translate-anchor");
assertNotNull(layer);
//Set and Get
@@ -231,14 +230,14 @@ public class CircleLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-pitch-scale");
Timber.i("circle-pitch-scale");
assertNotNull(layer);
//Set and Get

39
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.CircleLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class CircleLayerTest extends BaseStyleTest {
private static final String TAG = CircleLayerTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +51,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +76,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-radius");
Timber.i("circle-radius");
assertNotNull(layer);
//Set and Get
@@ -99,14 +98,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-color");
Timber.i("circle-color");
assertNotNull(layer);
//Set and Get
@@ -121,14 +120,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-color");
Timber.i("circle-color");
assertNotNull(layer);
//Set and Get
@@ -143,14 +142,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-blur");
Timber.i("circle-blur");
assertNotNull(layer);
//Set and Get
@@ -165,14 +164,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-opacity");
Timber.i("circle-opacity");
assertNotNull(layer);
//Set and Get
@@ -187,14 +186,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-translate");
Timber.i("circle-translate");
assertNotNull(layer);
//Set and Get
@@ -209,14 +208,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-translate-anchor");
Timber.i("circle-translate-anchor");
assertNotNull(layer);
//Set and Get
@@ -231,14 +230,14 @@ public class CircleLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new CircleLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "circle-pitch-scale");
Timber.i("circle-pitch-scale");
assertNotNull(layer);
//Set and Get

43
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerStyleTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.FillLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class FillLayerStyleTest extends BaseStyleTest {
private static final String TAG = FillLayerStyleTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +51,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +76,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-antialias");
Timber.i("fill-antialias");
assertNotNull(layer);
//Set and Get
@@ -99,14 +98,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-opacity");
Timber.i("fill-opacity");
assertNotNull(layer);
//Set and Get
@@ -121,14 +120,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-color");
Timber.i("fill-color");
assertNotNull(layer);
//Set and Get
@@ -143,14 +142,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-color");
Timber.i("fill-color");
assertNotNull(layer);
//Set and Get
@@ -165,14 +164,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-outline-color");
Timber.i("fill-outline-color");
assertNotNull(layer);
//Set and Get
@@ -187,14 +186,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-outline-color");
Timber.i("fill-outline-color");
assertNotNull(layer);
//Set and Get
@@ -209,14 +208,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-translate");
Timber.i("fill-translate");
assertNotNull(layer);
//Set and Get
@@ -231,14 +230,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-translate-anchor");
Timber.i("fill-translate-anchor");
assertNotNull(layer);
//Set and Get
@@ -253,14 +252,14 @@ public class FillLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-pattern");
Timber.i("fill-pattern");
assertNotNull(layer);
//Set and Get

43
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.FillLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class FillLayerTest extends BaseStyleTest {
private static final String TAG = FillLayerTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +51,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +76,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-antialias");
Timber.i("fill-antialias");
assertNotNull(layer);
//Set and Get
@@ -99,14 +98,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-opacity");
Timber.i("fill-opacity");
assertNotNull(layer);
//Set and Get
@@ -121,14 +120,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-color");
Timber.i("fill-color");
assertNotNull(layer);
//Set and Get
@@ -143,14 +142,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-color");
Timber.i("fill-color");
assertNotNull(layer);
//Set and Get
@@ -165,14 +164,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-outline-color");
Timber.i("fill-outline-color");
assertNotNull(layer);
//Set and Get
@@ -187,14 +186,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-outline-color");
Timber.i("fill-outline-color");
assertNotNull(layer);
//Set and Get
@@ -209,14 +208,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-translate");
Timber.i("fill-translate");
assertNotNull(layer);
//Set and Get
@@ -231,14 +230,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-translate-anchor");
Timber.i("fill-translate-anchor");
assertNotNull(layer);
//Set and Get
@@ -253,14 +252,14 @@ public class FillLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new FillLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "fill-pattern");
Timber.i("fill-pattern");
assertNotNull(layer);
//Set and Get

67
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerStyleTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.LineLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class LineLayerStyleTest extends BaseStyleTest {
private static final String TAG = LineLayerStyleTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +51,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +76,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-cap");
Timber.i("line-cap");
assertNotNull(layer);
//Set and Get
@@ -99,14 +98,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-join");
Timber.i("line-join");
assertNotNull(layer);
//Set and Get
@@ -121,14 +120,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-miter-limit");
Timber.i("line-miter-limit");
assertNotNull(layer);
//Set and Get
@@ -143,14 +142,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-round-limit");
Timber.i("line-round-limit");
assertNotNull(layer);
//Set and Get
@@ -165,14 +164,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-opacity");
Timber.i("line-opacity");
assertNotNull(layer);
//Set and Get
@@ -187,14 +186,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-color");
Timber.i("line-color");
assertNotNull(layer);
//Set and Get
@@ -209,14 +208,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-color");
Timber.i("line-color");
assertNotNull(layer);
//Set and Get
@@ -231,14 +230,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-translate");
Timber.i("line-translate");
assertNotNull(layer);
//Set and Get
@@ -253,14 +252,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-translate-anchor");
Timber.i("line-translate-anchor");
assertNotNull(layer);
//Set and Get
@@ -275,14 +274,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-width");
Timber.i("line-width");
assertNotNull(layer);
//Set and Get
@@ -297,14 +296,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-gap-width");
Timber.i("line-gap-width");
assertNotNull(layer);
//Set and Get
@@ -319,14 +318,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-offset");
Timber.i("line-offset");
assertNotNull(layer);
//Set and Get
@@ -341,14 +340,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-blur");
Timber.i("line-blur");
assertNotNull(layer);
//Set and Get
@@ -363,14 +362,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-dasharray");
Timber.i("line-dasharray");
assertNotNull(layer);
//Set and Get
@@ -385,14 +384,14 @@ public class LineLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-pattern");
Timber.i("line-pattern");
assertNotNull(layer);
//Set and Get

67
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.LineLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class LineLayerTest extends BaseStyleTest {
private static final String TAG = LineLayerTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +51,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +76,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-cap");
Timber.i("line-cap");
assertNotNull(layer);
//Set and Get
@@ -99,14 +98,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-join");
Timber.i("line-join");
assertNotNull(layer);
//Set and Get
@@ -121,14 +120,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-miter-limit");
Timber.i("line-miter-limit");
assertNotNull(layer);
//Set and Get
@@ -143,14 +142,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-round-limit");
Timber.i("line-round-limit");
assertNotNull(layer);
//Set and Get
@@ -165,14 +164,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-opacity");
Timber.i("line-opacity");
assertNotNull(layer);
//Set and Get
@@ -187,14 +186,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-color");
Timber.i("line-color");
assertNotNull(layer);
//Set and Get
@@ -209,14 +208,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-color");
Timber.i("line-color");
assertNotNull(layer);
//Set and Get
@@ -231,14 +230,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-translate");
Timber.i("line-translate");
assertNotNull(layer);
//Set and Get
@@ -253,14 +252,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-translate-anchor");
Timber.i("line-translate-anchor");
assertNotNull(layer);
//Set and Get
@@ -275,14 +274,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-width");
Timber.i("line-width");
assertNotNull(layer);
//Set and Get
@@ -297,14 +296,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-gap-width");
Timber.i("line-gap-width");
assertNotNull(layer);
//Set and Get
@@ -319,14 +318,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-offset");
Timber.i("line-offset");
assertNotNull(layer);
//Set and Get
@@ -341,14 +340,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-blur");
Timber.i("line-blur");
assertNotNull(layer);
//Set and Get
@@ -363,14 +362,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-dasharray");
Timber.i("line-dasharray");
assertNotNull(layer);
//Set and Get
@@ -385,14 +384,14 @@ public class LineLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new LineLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "line-pattern");
Timber.i("line-pattern");
assertNotNull(layer);
//Set and Get

35
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerStyleTest.java
View File

@@ -4,7 +4,7 @@ package com.mapbox.mapboxsdk.testapp.style;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.RasterLayer;
@@ -27,7 +27,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class RasterLayerStyleTest extends BaseStyleTest {
private static final String TAG = RasterLayerStyleTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -51,14 +50,14 @@ public class RasterLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -76,14 +75,14 @@ public class RasterLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-opacity");
Timber.i("raster-opacity");
assertNotNull(layer);
//Set and Get
@@ -98,14 +97,14 @@ public class RasterLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-hue-rotate");
Timber.i("raster-hue-rotate");
assertNotNull(layer);
//Set and Get
@@ -120,14 +119,14 @@ public class RasterLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-brightness-min");
Timber.i("raster-brightness-min");
assertNotNull(layer);
//Set and Get
@@ -142,14 +141,14 @@ public class RasterLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-brightness-max");
Timber.i("raster-brightness-max");
assertNotNull(layer);
//Set and Get
@@ -164,14 +163,14 @@ public class RasterLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-saturation");
Timber.i("raster-saturation");
assertNotNull(layer);
//Set and Get
@@ -186,14 +185,14 @@ public class RasterLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-contrast");
Timber.i("raster-contrast");
assertNotNull(layer);
//Set and Get
@@ -208,14 +207,14 @@ public class RasterLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-fade-duration");
Timber.i("raster-fade-duration");
assertNotNull(layer);
//Set and Get

36
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
View File

@@ -1,11 +1,10 @@
// This file is generated. Edit android/platform/scripts/generate-style-code.js, then run `make style-code-android`.
package com.mapbox.mapboxsdk.testapp.style;
import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.RasterLayer;
@@ -28,7 +27,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class RasterLayerTest extends BaseStyleTest {
private static final String TAG = RasterLayerTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +50,14 @@ public class RasterLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +75,14 @@ public class RasterLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-opacity");
Timber.i("raster-opacity");
assertNotNull(layer);
//Set and Get
@@ -99,14 +97,14 @@ public class RasterLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-hue-rotate");
Timber.i("raster-hue-rotate");
assertNotNull(layer);
//Set and Get
@@ -121,14 +119,14 @@ public class RasterLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-brightness-min");
Timber.i("raster-brightness-min");
assertNotNull(layer);
//Set and Get
@@ -143,14 +141,14 @@ public class RasterLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-brightness-max");
Timber.i("raster-brightness-max");
assertNotNull(layer);
//Set and Get
@@ -165,14 +163,14 @@ public class RasterLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-saturation");
Timber.i("raster-saturation");
assertNotNull(layer);
//Set and Get
@@ -187,14 +185,14 @@ public class RasterLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-contrast");
Timber.i("raster-contrast");
assertNotNull(layer);
//Set and Get
@@ -209,14 +207,14 @@ public class RasterLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new RasterLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "raster-fade-duration");
Timber.i("raster-fade-duration");
assertNotNull(layer);
//Set and Get

5
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RuntimeStyleBackgroundLayerTest.java
View File

@@ -3,7 +3,7 @@ package com.mapbox.mapboxsdk.testapp.style;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
@@ -23,7 +23,6 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class RuntimeStyleBackgroundLayerTest
extends ActivityInstrumentationTestCase2<RuntimeStyleTestActivity> {
private static final String TAG = RuntimeStyleBackgroundLayerTest.class.getSimpleName();
public RuntimeStyleBackgroundLayerTest() {
super(RuntimeStyleTestActivity.class);
@@ -40,7 +39,7 @@ public class RuntimeStyleBackgroundLayerTest
getActivity().mapView.getMapAsync(new OnMapReadyCallback() {
@Override
public void onMapReady(MapboxMap mapboxMap) {
Log.i(TAG, "visibility");
Timber.i("visibility");
BackgroundLayer layer = mapboxMap.getLayerAs("background");
assertNotNull(layer);

215
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerStyleTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class SymbolLayerStyleTest extends BaseStyleTest {
private static final String TAG = SymbolLayerStyleTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +51,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +76,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "symbol-placement");
Timber.i("symbol-placement");
assertNotNull(layer);
//Set and Get
@@ -99,14 +98,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "symbol-spacing");
Timber.i("symbol-spacing");
assertNotNull(layer);
//Set and Get
@@ -121,14 +120,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "symbol-avoid-edges");
Timber.i("symbol-avoid-edges");
assertNotNull(layer);
//Set and Get
@@ -143,14 +142,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-allow-overlap");
Timber.i("icon-allow-overlap");
assertNotNull(layer);
//Set and Get
@@ -165,14 +164,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-ignore-placement");
Timber.i("icon-ignore-placement");
assertNotNull(layer);
//Set and Get
@@ -187,14 +186,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-optional");
Timber.i("icon-optional");
assertNotNull(layer);
//Set and Get
@@ -209,14 +208,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-rotation-alignment");
Timber.i("icon-rotation-alignment");
assertNotNull(layer);
//Set and Get
@@ -231,14 +230,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-size");
Timber.i("icon-size");
assertNotNull(layer);
//Set and Get
@@ -253,14 +252,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-text-fit");
Timber.i("icon-text-fit");
assertNotNull(layer);
//Set and Get
@@ -275,14 +274,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-text-fit-padding");
Timber.i("icon-text-fit-padding");
assertNotNull(layer);
//Set and Get
@@ -297,14 +296,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-image");
Timber.i("icon-image");
assertNotNull(layer);
//Set and Get
@@ -319,14 +318,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-rotate");
Timber.i("icon-rotate");
assertNotNull(layer);
//Set and Get
@@ -341,14 +340,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-padding");
Timber.i("icon-padding");
assertNotNull(layer);
//Set and Get
@@ -363,14 +362,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-keep-upright");
Timber.i("icon-keep-upright");
assertNotNull(layer);
//Set and Get
@@ -385,14 +384,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-offset");
Timber.i("icon-offset");
assertNotNull(layer);
//Set and Get
@@ -407,14 +406,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-pitch-alignment");
Timber.i("text-pitch-alignment");
assertNotNull(layer);
//Set and Get
@@ -429,14 +428,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-rotation-alignment");
Timber.i("text-rotation-alignment");
assertNotNull(layer);
//Set and Get
@@ -451,14 +450,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-field");
Timber.i("text-field");
assertNotNull(layer);
//Set and Get
@@ -473,14 +472,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-font");
Timber.i("text-font");
assertNotNull(layer);
//Set and Get
@@ -495,14 +494,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-size");
Timber.i("text-size");
assertNotNull(layer);
//Set and Get
@@ -517,14 +516,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-max-width");
Timber.i("text-max-width");
assertNotNull(layer);
//Set and Get
@@ -539,14 +538,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-line-height");
Timber.i("text-line-height");
assertNotNull(layer);
//Set and Get
@@ -561,14 +560,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-letter-spacing");
Timber.i("text-letter-spacing");
assertNotNull(layer);
//Set and Get
@@ -583,14 +582,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-justify");
Timber.i("text-justify");
assertNotNull(layer);
//Set and Get
@@ -605,14 +604,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-anchor");
Timber.i("text-anchor");
assertNotNull(layer);
//Set and Get
@@ -627,14 +626,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-max-angle");
Timber.i("text-max-angle");
assertNotNull(layer);
//Set and Get
@@ -649,14 +648,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-rotate");
Timber.i("text-rotate");
assertNotNull(layer);
//Set and Get
@@ -671,14 +670,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-padding");
Timber.i("text-padding");
assertNotNull(layer);
//Set and Get
@@ -693,14 +692,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-keep-upright");
Timber.i("text-keep-upright");
assertNotNull(layer);
//Set and Get
@@ -715,14 +714,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-transform");
Timber.i("text-transform");
assertNotNull(layer);
//Set and Get
@@ -737,14 +736,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-offset");
Timber.i("text-offset");
assertNotNull(layer);
//Set and Get
@@ -759,14 +758,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-allow-overlap");
Timber.i("text-allow-overlap");
assertNotNull(layer);
//Set and Get
@@ -781,14 +780,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-ignore-placement");
Timber.i("text-ignore-placement");
assertNotNull(layer);
//Set and Get
@@ -803,14 +802,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-optional");
Timber.i("text-optional");
assertNotNull(layer);
//Set and Get
@@ -825,14 +824,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-opacity");
Timber.i("icon-opacity");
assertNotNull(layer);
//Set and Get
@@ -847,14 +846,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-color");
Timber.i("icon-color");
assertNotNull(layer);
//Set and Get
@@ -869,14 +868,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-color");
Timber.i("icon-color");
assertNotNull(layer);
//Set and Get
@@ -891,14 +890,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-halo-color");
Timber.i("icon-halo-color");
assertNotNull(layer);
//Set and Get
@@ -913,14 +912,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-halo-color");
Timber.i("icon-halo-color");
assertNotNull(layer);
//Set and Get
@@ -935,14 +934,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-halo-width");
Timber.i("icon-halo-width");
assertNotNull(layer);
//Set and Get
@@ -957,14 +956,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-halo-blur");
Timber.i("icon-halo-blur");
assertNotNull(layer);
//Set and Get
@@ -979,14 +978,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-translate");
Timber.i("icon-translate");
assertNotNull(layer);
//Set and Get
@@ -1001,14 +1000,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-translate-anchor");
Timber.i("icon-translate-anchor");
assertNotNull(layer);
//Set and Get
@@ -1023,14 +1022,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-opacity");
Timber.i("text-opacity");
assertNotNull(layer);
//Set and Get
@@ -1045,14 +1044,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-color");
Timber.i("text-color");
assertNotNull(layer);
//Set and Get
@@ -1067,14 +1066,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-color");
Timber.i("text-color");
assertNotNull(layer);
//Set and Get
@@ -1089,14 +1088,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-halo-color");
Timber.i("text-halo-color");
assertNotNull(layer);
//Set and Get
@@ -1111,14 +1110,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-halo-color");
Timber.i("text-halo-color");
assertNotNull(layer);
//Set and Get
@@ -1133,14 +1132,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-halo-width");
Timber.i("text-halo-width");
assertNotNull(layer);
//Set and Get
@@ -1155,14 +1154,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-halo-blur");
Timber.i("text-halo-blur");
assertNotNull(layer);
//Set and Get
@@ -1177,14 +1176,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-translate");
Timber.i("text-translate");
assertNotNull(layer);
//Set and Get
@@ -1199,14 +1198,14 @@ public class SymbolLayerStyleTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-translate-anchor");
Timber.i("text-translate-anchor");
assertNotNull(layer);
//Set and Get

215
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
View File

@@ -5,7 +5,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
@@ -28,7 +28,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class SymbolLayerTest extends BaseStyleTest {
private static final String TAG = SymbolLayerTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -52,14 +51,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -77,14 +76,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "symbol-placement");
Timber.i("symbol-placement");
assertNotNull(layer);
//Set and Get
@@ -99,14 +98,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "symbol-spacing");
Timber.i("symbol-spacing");
assertNotNull(layer);
//Set and Get
@@ -121,14 +120,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "symbol-avoid-edges");
Timber.i("symbol-avoid-edges");
assertNotNull(layer);
//Set and Get
@@ -143,14 +142,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-allow-overlap");
Timber.i("icon-allow-overlap");
assertNotNull(layer);
//Set and Get
@@ -165,14 +164,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-ignore-placement");
Timber.i("icon-ignore-placement");
assertNotNull(layer);
//Set and Get
@@ -187,14 +186,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-optional");
Timber.i("icon-optional");
assertNotNull(layer);
//Set and Get
@@ -209,14 +208,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-rotation-alignment");
Timber.i("icon-rotation-alignment");
assertNotNull(layer);
//Set and Get
@@ -231,14 +230,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-size");
Timber.i("icon-size");
assertNotNull(layer);
//Set and Get
@@ -253,14 +252,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-text-fit");
Timber.i("icon-text-fit");
assertNotNull(layer);
//Set and Get
@@ -275,14 +274,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-text-fit-padding");
Timber.i("icon-text-fit-padding");
assertNotNull(layer);
//Set and Get
@@ -297,14 +296,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-image");
Timber.i("icon-image");
assertNotNull(layer);
//Set and Get
@@ -319,14 +318,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-rotate");
Timber.i("icon-rotate");
assertNotNull(layer);
//Set and Get
@@ -341,14 +340,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-padding");
Timber.i("icon-padding");
assertNotNull(layer);
//Set and Get
@@ -363,14 +362,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-keep-upright");
Timber.i("icon-keep-upright");
assertNotNull(layer);
//Set and Get
@@ -385,14 +384,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-offset");
Timber.i("icon-offset");
assertNotNull(layer);
//Set and Get
@@ -407,14 +406,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-pitch-alignment");
Timber.i("text-pitch-alignment");
assertNotNull(layer);
//Set and Get
@@ -429,14 +428,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-rotation-alignment");
Timber.i("text-rotation-alignment");
assertNotNull(layer);
//Set and Get
@@ -451,14 +450,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-field");
Timber.i("text-field");
assertNotNull(layer);
//Set and Get
@@ -473,14 +472,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-font");
Timber.i("text-font");
assertNotNull(layer);
//Set and Get
@@ -495,14 +494,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-size");
Timber.i("text-size");
assertNotNull(layer);
//Set and Get
@@ -517,14 +516,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-max-width");
Timber.i("text-max-width");
assertNotNull(layer);
//Set and Get
@@ -539,14 +538,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-line-height");
Timber.i("text-line-height");
assertNotNull(layer);
//Set and Get
@@ -561,14 +560,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-letter-spacing");
Timber.i("text-letter-spacing");
assertNotNull(layer);
//Set and Get
@@ -583,14 +582,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-justify");
Timber.i("text-justify");
assertNotNull(layer);
//Set and Get
@@ -605,14 +604,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-anchor");
Timber.i("text-anchor");
assertNotNull(layer);
//Set and Get
@@ -627,14 +626,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-max-angle");
Timber.i("text-max-angle");
assertNotNull(layer);
//Set and Get
@@ -649,14 +648,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-rotate");
Timber.i("text-rotate");
assertNotNull(layer);
//Set and Get
@@ -671,14 +670,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-padding");
Timber.i("text-padding");
assertNotNull(layer);
//Set and Get
@@ -693,14 +692,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-keep-upright");
Timber.i("text-keep-upright");
assertNotNull(layer);
//Set and Get
@@ -715,14 +714,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-transform");
Timber.i("text-transform");
assertNotNull(layer);
//Set and Get
@@ -737,14 +736,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-offset");
Timber.i("text-offset");
assertNotNull(layer);
//Set and Get
@@ -759,14 +758,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-allow-overlap");
Timber.i("text-allow-overlap");
assertNotNull(layer);
//Set and Get
@@ -781,14 +780,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-ignore-placement");
Timber.i("text-ignore-placement");
assertNotNull(layer);
//Set and Get
@@ -803,14 +802,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-optional");
Timber.i("text-optional");
assertNotNull(layer);
//Set and Get
@@ -825,14 +824,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-opacity");
Timber.i("icon-opacity");
assertNotNull(layer);
//Set and Get
@@ -847,14 +846,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-color");
Timber.i("icon-color");
assertNotNull(layer);
//Set and Get
@@ -869,14 +868,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-color");
Timber.i("icon-color");
assertNotNull(layer);
//Set and Get
@@ -891,14 +890,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-halo-color");
Timber.i("icon-halo-color");
assertNotNull(layer);
//Set and Get
@@ -913,14 +912,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-halo-color");
Timber.i("icon-halo-color");
assertNotNull(layer);
//Set and Get
@@ -935,14 +934,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-halo-width");
Timber.i("icon-halo-width");
assertNotNull(layer);
//Set and Get
@@ -957,14 +956,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-halo-blur");
Timber.i("icon-halo-blur");
assertNotNull(layer);
//Set and Get
@@ -979,14 +978,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-translate");
Timber.i("icon-translate");
assertNotNull(layer);
//Set and Get
@@ -1001,14 +1000,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "icon-translate-anchor");
Timber.i("icon-translate-anchor");
assertNotNull(layer);
//Set and Get
@@ -1023,14 +1022,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-opacity");
Timber.i("text-opacity");
assertNotNull(layer);
//Set and Get
@@ -1045,14 +1044,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-color");
Timber.i("text-color");
assertNotNull(layer);
//Set and Get
@@ -1067,14 +1066,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-color");
Timber.i("text-color");
assertNotNull(layer);
//Set and Get
@@ -1089,14 +1088,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-halo-color");
Timber.i("text-halo-color");
assertNotNull(layer);
//Set and Get
@@ -1111,14 +1110,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-halo-color");
Timber.i("text-halo-color");
assertNotNull(layer);
//Set and Get
@@ -1133,14 +1132,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-halo-width");
Timber.i("text-halo-width");
assertNotNull(layer);
//Set and Get
@@ -1155,14 +1154,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-halo-blur");
Timber.i("text-halo-blur");
assertNotNull(layer);
//Set and Get
@@ -1177,14 +1176,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-translate");
Timber.i("text-translate");
assertNotNull(layer);
//Set and Get
@@ -1199,14 +1198,14 @@ public class SymbolLayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new SymbolLayer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
//Layer reference is now stale, get new reference
layer = mapboxMap.getLayerAs("my-layer");
}
Log.i(TAG, "text-translate-anchor");
Timber.i("text-translate-anchor");
assertNotNull(layer);
//Set and Get

21
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
View File

@@ -9,7 +9,7 @@ import android.graphics.Color;
import android.support.test.espresso.Espresso;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import com.mapbox.mapboxsdk.style.layers.<%- camelize(type) %>Layer;
@@ -32,7 +32,6 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
*/
@RunWith(AndroidJUnit4.class)
public class <%- camelize(type) %>LayerTest extends BaseStyleTest {
private static final String TAG = <%- camelize(type) %>LayerTest.class.getSimpleName();
@Rule
public final ActivityTestRule<RuntimeStyleTestActivity> rule = new ActivityTestRule<>(RuntimeStyleTestActivity.class);
@@ -56,11 +55,11 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
<% if (type === 'background') { -%>
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
<% } else { -%>
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new <%- camelize(type) %>Layer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
@@ -68,7 +67,7 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest {
layer = mapboxMap.getLayerAs("my-layer");
}
<% } -%>
Log.i(TAG, "visibility");
Timber.i("visibility");
assertNotNull(layer);
//Get initial
@@ -87,11 +86,11 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
<% if (type === 'background') { -%>
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
<% } else { -%>
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new <%- camelize(type) %>Layer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
@@ -99,7 +98,7 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest {
layer = mapboxMap.getLayerAs("my-layer");
}
<% } -%>
Log.i(TAG, "<%- property.name %>");
Timber.i("<%- property.name %>");
assertNotNull(layer);
//Set and Get
@@ -115,11 +114,11 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest {
mapboxMap = rule.getActivity().getMapboxMap();
<% if (type === 'background') { -%>
Log.i(TAG, "Retrieving layer");
Timber.i("Retrieving layer");
layer = mapboxMap.getLayerAs("background");
<% } else { -%>
if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
Log.i(TAG, "Adding layer");
Timber.i("Adding layer");
layer = new <%- camelize(type) %>Layer("my-layer", "composite");
layer.setSourceLayer("composite");
mapboxMap.addLayer(layer);
@@ -127,7 +126,7 @@ public class <%- camelize(type) %>LayerTest extends BaseStyleTest {
layer = mapboxMap.getLayerAs("my-layer");
}
<% } -%>
Log.i(TAG, "<%- property.name %>");
Timber.i("<%- property.name %>");
assertNotNull(layer);
//Set and Get

7
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/OnMapReadyIdlingResource.java
View File

@@ -2,9 +2,8 @@ package com.mapbox.mapboxsdk.testapp.utils;
import android.app.Activity;
import android.support.test.espresso.IdlingResource;
import android.util.Log;
import timber.log.Timber;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.maps.MapboxMap;
import java.lang.reflect.Field;
@@ -43,10 +42,10 @@ public class OnMapReadyIdlingResource implements IdlingResource {
Field field = activity.getClass().getDeclaredField("mapboxMap");
field.setAccessible(true);
mapboxMap = (MapboxMap) field.get(activity);
Log.e(MapboxConstants.TAG, "isMapboxReady called with value " + (mapboxMap != null));
Timber.e("isMapboxReady called with value " + (mapboxMap != null));
return mapboxMap != null;
} catch (Exception e) {
Log.e(MapboxConstants.TAG, "could not reflect", e);
Timber.e("could not reflect", e);
return false;
}
}

8
platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/utils/ScreenshotUtil.java
View File

@@ -4,7 +4,7 @@ import android.app.Activity;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.os.Environment;
import android.util.Log;
import timber.log.Timber;
import android.view.TextureView;
import android.view.View;
import android.view.ViewGroup;
@@ -23,8 +23,6 @@ import java.util.UUID;
*/
public class ScreenshotUtil {
private static final String LOG_TAG = ScreenshotUtil.class.getName();
// Where to store the files. This path is required by AWS Device Farm:
// http://docs.aws.amazon.com/devicefarm/latest/developerguide/test-types-android-instrumentation.html#test-types-android-instrumentation-screenshots
private static final String SCREENSHOT_FOLDER = "test-screenshots";
@@ -38,7 +36,7 @@ public class ScreenshotUtil {
// Check if storage is available
if (!isExternalStorageWritable()) {
Log.d(LOG_TAG, "External storage is not available.");
Timber.d("External storage is not available.");
return;
}
@@ -129,7 +127,7 @@ public class ScreenshotUtil {
File dir = new File(path);
dir.mkdirs();
path += File.separator + filename;
Log.d(LOG_TAG, "Screenshot path: " + path);
Timber.d("Screenshot path: " + path);
return path;
}