diff options
author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-09-28 09:05:41 +0200 |
---|---|---|
committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-10-24 13:35:36 +0200 |
commit | 12b496945498358b7afb4af1efe4ae0c52b9c7d3 (patch) | |
tree | c4d4c31cbccfb39bcc8a4fd6a2a09f627173a56b /platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java | |
parent | 78a1c30e80c70f36ffec8193753919277418a3ca (diff) | |
download | qtlocation-mapboxgl-12b496945498358b7afb4af1efe4ae0c52b9c7d3.tar.gz |
[android] "format" expression support
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 | 65 |
1 files changed, 40 insertions, 25 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 d61397033c..bdc09801b2 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 @@ -9,6 +9,8 @@ import timber.log.Timber; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.style.layers.SymbolLayer; +import com.mapbox.mapboxsdk.style.types.Formatted; +import com.mapbox.mapboxsdk.style.types.FormattedSection; import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest; import org.junit.Test; @@ -258,7 +260,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconTextFitAsConstant() { validateTestSetup(); @@ -319,7 +320,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconRotateAsConstant() { validateTestSetup(); @@ -349,7 +349,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconPaddingAsConstant() { validateTestSetup(); @@ -421,7 +420,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconPitchAlignmentAsConstant() { validateTestSetup(); @@ -477,8 +475,28 @@ public class SymbolLayerTest extends BaseActivityTest { assertEquals((String) layer.getTextField().getValue(), (String) ""); layer.setProperties(textField("{token}")); - assertEquals(layer.getTextField().getExpression(), - Expression.format(Expression.toString(Expression.get("token")))); + assertEquals(layer.getTextField().getExpression(), Expression.format(Expression.formatEntry(Expression.toString(Expression.get("token"))))); + }); + } + + @Test + public void testFormattedTextFieldAsConstant() { + validateTestSetup(); + setupLayer(); + Timber.i("text-field-formatted"); + invoke(mapboxMap, (uiController, mapboxMap) -> { + assertNotNull(layer); + + Formatted expected = new Formatted(new FormattedSection[] { + new FormattedSection("", 1.0) + }); + + // Set and Get + layer.setProperties(textField("")); + assertEquals(layer.getFormattedTextField().getValue(), expected/*(String) ""*/); + + layer.setProperties(textField("{token}")); + assertEquals(layer.getFormattedTextField().getExpression(), Expression.format(Expression.formatEntry(Expression.toString(Expression.get("token"))))); }); } @@ -491,12 +509,26 @@ public class SymbolLayerTest extends BaseActivityTest { assertNotNull(layer); // Set and Get - Expression expression = Expression.format(string(Expression.get("undefined"))); + Expression expression = string(Expression.get("undefined")); layer.setProperties(textField(expression)); - assertEquals(layer.getTextField().getExpression(), expression); + assertEquals(layer.getTextField().getExpression(), Expression.format(Expression.formatEntry(expression))); }); } + @Test + public void testFormattedTextFieldAsExpression() { + validateTestSetup(); + setupLayer(); + Timber.i("text-field-formatted-expression"); + invoke(mapboxMap, (uiController, mapboxMap) -> { + assertNotNull(layer); + + // Set and Get + Expression expression = string(Expression.get("undefined")); + layer.setProperties(textField(expression)); + assertEquals(layer.getFormattedTextField().getExpression(), Expression.format(Expression.formatEntry(Expression.string(Expression.get("undefined"))))); + }); + } @Test public void testTextFontAsConstant() { @@ -541,7 +573,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextMaxWidthAsConstant() { validateTestSetup(); @@ -571,7 +602,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextLineHeightAsConstant() { validateTestSetup(); @@ -615,7 +645,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextJustifyAsConstant() { validateTestSetup(); @@ -645,7 +674,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextAnchorAsConstant() { validateTestSetup(); @@ -675,7 +703,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextMaxAngleAsConstant() { validateTestSetup(); @@ -719,7 +746,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextPaddingAsConstant() { validateTestSetup(); @@ -777,7 +803,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextOffsetAsConstant() { validateTestSetup(); @@ -878,7 +903,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconColorTransition() { validateTestSetup(); @@ -923,7 +947,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconColorAsIntConstant() { validateTestSetup(); @@ -982,7 +1005,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconHaloColorAsIntConstant() { validateTestSetup(); @@ -1041,7 +1063,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconHaloBlurTransition() { validateTestSetup(); @@ -1086,7 +1107,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testIconTranslateTransition() { validateTestSetup(); @@ -1174,7 +1194,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextColorTransition() { validateTestSetup(); @@ -1219,7 +1238,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextColorAsIntConstant() { validateTestSetup(); @@ -1278,7 +1296,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextHaloColorAsIntConstant() { validateTestSetup(); @@ -1337,7 +1354,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextHaloBlurTransition() { validateTestSetup(); @@ -1382,7 +1398,6 @@ public class SymbolLayerTest extends BaseActivityTest { }); } - @Test public void testTextTranslateTransition() { validateTestSetup(); |