diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java index 7026e87a47..d61397033c 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java @@ -13,8 +13,6 @@ import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest; import org.junit.Test; import org.junit.runner.RunWith; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import static com.mapbox.mapboxsdk.style.expressions.Expression.*; import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke; @@ -479,18 +477,8 @@ public class SymbolLayerTest extends BaseActivityTest { assertEquals((String) layer.getTextField().getValue(), (String) ""); layer.setProperties(textField("{token}")); - JsonArray formatExpression = new JsonArray(); - formatExpression.add("format"); - JsonArray getExpression = new JsonArray(); - getExpression.add("get"); - getExpression.add("token"); - JsonArray stringCoercion = new JsonArray(); - stringCoercion.add("to-string"); - stringCoercion.add(getExpression); - formatExpression.add(stringCoercion); - formatExpression.add(new JsonObject()); assertEquals(layer.getTextField().getExpression(), - Converter.convert(formatExpression)); + Expression.format(Expression.toString(Expression.get("token")))); }); } @@ -503,17 +491,7 @@ public class SymbolLayerTest extends BaseActivityTest { assertNotNull(layer); // Set and Get - JsonArray formatExpression = new JsonArray(); - formatExpression.add("format"); - JsonArray getExpression = new JsonArray(); - getExpression.add("get"); - getExpression.add("undefined"); - JsonArray stringAssertion = new JsonArray(); - stringAssertion.add("string"); - stringAssertion.add(getExpression); - formatExpression.add(stringAssertion); - formatExpression.add(new JsonObject()); - Expression expression = Converter.convert(formatExpression); + Expression expression = Expression.format(string(Expression.get("undefined"))); layer.setProperties(textField(expression)); assertEquals(layer.getTextField().getExpression(), expression); }); |