diff options
author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-13 18:29:25 +0100 |
---|---|---|
committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-12-04 17:22:38 +0100 |
commit | 794b851f02b98c5f1652edc141b1a6feb459d59b (patch) | |
tree | 66fda491ea0a100d3a45092ce2840d590fc7fefa /platform/android/MapboxGLAndroidSDKTestApp/src/androidTest | |
parent | 1e7c7e048991a33167d5fb40f6c9ea2a44885104 (diff) | |
download | qtlocation-mapboxgl-794b851f02b98c5f1652edc141b1a6feb459d59b.tar.gz |
[android] expose Formatted text-field setter
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest')
3 files changed, 32 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java index 093fbf2662..7f8691d46b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/ExpressionTest.java @@ -406,10 +406,9 @@ public class ExpressionTest extends BaseActivityTest { assertNull(layer.getTextField().getExpression()); assertEquals(new Formatted( - new FormattedSection[] { - new FormattedSection("test", 1.5, new String[] {"DIN Offc Pro Regular", "Arial Unicode MS Regular"}), - new FormattedSection("\ntest2", 2.0), - } + new FormattedSection("test", 1.5, + new String[] {"DIN Offc Pro Regular", "Arial Unicode MS Regular"}), + new FormattedSection("\ntest2", 2.0) ), layer.getTextField().getValue()); }); } @@ -493,6 +492,29 @@ public class ExpressionTest extends BaseActivityTest { }); } + @Test + public void testTextFieldFormattedArgument() { + validateTestSetup(); + invoke(mapboxMap, (uiController, mapboxMap) -> { + LatLng latLng = new LatLng(51, 17); + mapboxMap.addSource(new GeoJsonSource("source", Point.fromLngLat(latLng.getLongitude(), latLng.getLatitude()))); + SymbolLayer layer = new SymbolLayer("layer", "source"); + mapboxMap.addLayer(layer); + + Formatted formatted = new Formatted( + new FormattedSection("test", 1.5), + new FormattedSection("\ntest", 0.5, new String[] {"Arial Unicode MS Regular", "DIN Offc Pro Regular"}) + ); + layer.setProperties(textField(formatted)); + waitForLayer(uiController, mapboxMap, latLng); + assertFalse(mapboxMap.queryRenderedFeatures(mapboxMap.getProjection().toScreenLocation(latLng), "layer") + .isEmpty()); + + assertNull(layer.getTextField().getExpression()); + assertEquals(formatted, layer.getTextField().getValue()); + }); + } + private static final long WAIT_TIMEOUT = 5000; private static final long WAIT_DELAY = 150; 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 9d12ae9401..f7be4f7b10 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 @@ -521,11 +521,14 @@ public class SymbolLayerTest extends BaseActivityTest { assertNull(layer.getTextField().getValue()); // Set and Get - Formatted propertyValue = new Formatted(new FormattedSection[]{new FormattedSection("default")}); + Formatted propertyValue = new Formatted(new FormattedSection("default")); layer.setProperties(textField("default")); assertEquals(layer.getTextField().getValue(), propertyValue); + layer.setProperties(textField(propertyValue)); + assertEquals(layer.getTextField().getValue(), propertyValue); + layer.setProperties(textField("{token}")); assertEquals(layer.getTextField().getExpression(), format(Expression.formatEntry(Expression.toString(Expression.get("token"))))); }); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs index 2b3c09a34b..2471ca8a98 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs @@ -175,10 +175,10 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest { layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>("default")); assertEquals(layer.get<%- camelize(property.name) %>().getValue(), propertyValue); -<% } else {-%> + +<% } -%> layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(propertyValue)); assertEquals(layer.get<%- camelize(property.name) %>().getValue(), propertyValue); -<% } -%> <% if (property.tokens) { -%> layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>("{token}")); |