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 | 400 |
1 files changed, 207 insertions, 193 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 5b985bdba0..9d12ae9401 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 @@ -131,11 +131,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("symbol-placement"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getSymbolPlacement().getValue()); + assertNull(layer.getSymbolPlacement().getValue()); // Set and Get - layer.setProperties(symbolPlacement(SYMBOL_PLACEMENT_POINT)); - assertEquals((String) layer.getSymbolPlacement().getValue(), (String) SYMBOL_PLACEMENT_POINT); + String propertyValue = SYMBOL_PLACEMENT_POINT; + layer.setProperties(symbolPlacement(propertyValue)); + assertEquals(layer.getSymbolPlacement().getValue(), propertyValue); }); } @@ -146,11 +147,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("symbol-spacing"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getSymbolSpacing().getValue()); + assertNull(layer.getSymbolSpacing().getValue()); // Set and Get - layer.setProperties(symbolSpacing(0.3f)); - assertEquals((Float) layer.getSymbolSpacing().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(symbolSpacing(propertyValue)); + assertEquals(layer.getSymbolSpacing().getValue(), propertyValue); }); } @@ -161,11 +163,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("symbol-avoid-edges"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getSymbolAvoidEdges().getValue()); + assertNull(layer.getSymbolAvoidEdges().getValue()); // Set and Get - layer.setProperties(symbolAvoidEdges(true)); - assertEquals((Boolean) layer.getSymbolAvoidEdges().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(symbolAvoidEdges(propertyValue)); + assertEquals(layer.getSymbolAvoidEdges().getValue(), propertyValue); }); } @@ -176,11 +179,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("symbol-z-order"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getSymbolZOrder().getValue()); + assertNull(layer.getSymbolZOrder().getValue()); // Set and Get - layer.setProperties(symbolZOrder(SYMBOL_Z_ORDER_VIEWPORT_Y)); - assertEquals((String) layer.getSymbolZOrder().getValue(), (String) SYMBOL_Z_ORDER_VIEWPORT_Y); + String propertyValue = SYMBOL_Z_ORDER_VIEWPORT_Y; + layer.setProperties(symbolZOrder(propertyValue)); + assertEquals(layer.getSymbolZOrder().getValue(), propertyValue); }); } @@ -191,11 +195,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-allow-overlap"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getIconAllowOverlap().getValue()); + assertNull(layer.getIconAllowOverlap().getValue()); // Set and Get - layer.setProperties(iconAllowOverlap(true)); - assertEquals((Boolean) layer.getIconAllowOverlap().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(iconAllowOverlap(propertyValue)); + assertEquals(layer.getIconAllowOverlap().getValue(), propertyValue); }); } @@ -206,11 +211,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-ignore-placement"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getIconIgnorePlacement().getValue()); + assertNull(layer.getIconIgnorePlacement().getValue()); // Set and Get - layer.setProperties(iconIgnorePlacement(true)); - assertEquals((Boolean) layer.getIconIgnorePlacement().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(iconIgnorePlacement(propertyValue)); + assertEquals(layer.getIconIgnorePlacement().getValue(), propertyValue); }); } @@ -221,11 +227,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-optional"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getIconOptional().getValue()); + assertNull(layer.getIconOptional().getValue()); // Set and Get - layer.setProperties(iconOptional(true)); - assertEquals((Boolean) layer.getIconOptional().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(iconOptional(propertyValue)); + assertEquals(layer.getIconOptional().getValue(), propertyValue); }); } @@ -236,11 +243,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-rotation-alignment"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getIconRotationAlignment().getValue()); + assertNull(layer.getIconRotationAlignment().getValue()); // Set and Get - layer.setProperties(iconRotationAlignment(ICON_ROTATION_ALIGNMENT_MAP)); - assertEquals((String) layer.getIconRotationAlignment().getValue(), (String) ICON_ROTATION_ALIGNMENT_MAP); + String propertyValue = ICON_ROTATION_ALIGNMENT_MAP; + layer.setProperties(iconRotationAlignment(propertyValue)); + assertEquals(layer.getIconRotationAlignment().getValue(), propertyValue); }); } @@ -251,11 +259,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-size"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getIconSize().getValue()); + assertNull(layer.getIconSize().getValue()); // Set and Get - layer.setProperties(iconSize(0.3f)); - assertEquals((Float) layer.getIconSize().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(iconSize(propertyValue)); + assertEquals(layer.getIconSize().getValue(), propertyValue); }); } @@ -282,11 +291,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-text-fit"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getIconTextFit().getValue()); + assertNull(layer.getIconTextFit().getValue()); // Set and Get - layer.setProperties(iconTextFit(ICON_TEXT_FIT_NONE)); - assertEquals((String) layer.getIconTextFit().getValue(), (String) ICON_TEXT_FIT_NONE); + String propertyValue = ICON_TEXT_FIT_NONE; + layer.setProperties(iconTextFit(propertyValue)); + assertEquals(layer.getIconTextFit().getValue(), propertyValue); }); } @@ -297,11 +307,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-text-fit-padding"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float[]) layer.getIconTextFitPadding().getValue()); + assertNull(layer.getIconTextFitPadding().getValue()); // Set and Get - layer.setProperties(iconTextFitPadding(new Float[] {0f, 0f, 0f, 0f})); - assertEquals((Float[]) layer.getIconTextFitPadding().getValue(), (Float[]) new Float[] {0f, 0f, 0f, 0f}); + Float[] propertyValue = new Float[] {0f, 0f, 0f, 0f}; + layer.setProperties(iconTextFitPadding(propertyValue)); + assertEquals(layer.getIconTextFitPadding().getValue(), propertyValue); }); } @@ -312,11 +323,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-image"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getIconImage().getValue()); + assertNull(layer.getIconImage().getValue()); // Set and Get - layer.setProperties(iconImage("undefined")); - assertEquals((String) layer.getIconImage().getValue(), (String) "undefined"); + String propertyValue = "undefined"; + layer.setProperties(iconImage(propertyValue)); + assertEquals(layer.getIconImage().getValue(), propertyValue); layer.setProperties(iconImage("{token}")); assertEquals(layer.getIconImage().getExpression(), Expression.toString(Expression.get("token"))); @@ -346,11 +358,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-rotate"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getIconRotate().getValue()); + assertNull(layer.getIconRotate().getValue()); // Set and Get - layer.setProperties(iconRotate(0.3f)); - assertEquals((Float) layer.getIconRotate().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(iconRotate(propertyValue)); + assertEquals(layer.getIconRotate().getValue(), propertyValue); }); } @@ -377,11 +390,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-padding"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getIconPadding().getValue()); + assertNull(layer.getIconPadding().getValue()); // Set and Get - layer.setProperties(iconPadding(0.3f)); - assertEquals((Float) layer.getIconPadding().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(iconPadding(propertyValue)); + assertEquals(layer.getIconPadding().getValue(), propertyValue); }); } @@ -392,11 +406,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-keep-upright"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getIconKeepUpright().getValue()); + assertNull(layer.getIconKeepUpright().getValue()); // Set and Get - layer.setProperties(iconKeepUpright(true)); - assertEquals((Boolean) layer.getIconKeepUpright().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(iconKeepUpright(propertyValue)); + assertEquals(layer.getIconKeepUpright().getValue(), propertyValue); }); } @@ -407,11 +422,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-offset"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float[]) layer.getIconOffset().getValue()); + assertNull(layer.getIconOffset().getValue()); // Set and Get - layer.setProperties(iconOffset(new Float[] {0f, 0f})); - assertEquals((Float[]) layer.getIconOffset().getValue(), (Float[]) new Float[] {0f, 0f}); + Float[] propertyValue = new Float[] {0f, 0f}; + layer.setProperties(iconOffset(propertyValue)); + assertEquals(layer.getIconOffset().getValue(), propertyValue); }); } @@ -422,11 +438,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-anchor"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getIconAnchor().getValue()); + assertNull(layer.getIconAnchor().getValue()); // Set and Get - layer.setProperties(iconAnchor(ICON_ANCHOR_CENTER)); - assertEquals((String) layer.getIconAnchor().getValue(), (String) ICON_ANCHOR_CENTER); + String propertyValue = ICON_ANCHOR_CENTER; + layer.setProperties(iconAnchor(propertyValue)); + assertEquals(layer.getIconAnchor().getValue(), propertyValue); }); } @@ -453,11 +470,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-pitch-alignment"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getIconPitchAlignment().getValue()); + assertNull(layer.getIconPitchAlignment().getValue()); // Set and Get - layer.setProperties(iconPitchAlignment(ICON_PITCH_ALIGNMENT_MAP)); - assertEquals((String) layer.getIconPitchAlignment().getValue(), (String) ICON_PITCH_ALIGNMENT_MAP); + String propertyValue = ICON_PITCH_ALIGNMENT_MAP; + layer.setProperties(iconPitchAlignment(propertyValue)); + assertEquals(layer.getIconPitchAlignment().getValue(), propertyValue); }); } @@ -468,11 +486,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-pitch-alignment"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextPitchAlignment().getValue()); + assertNull(layer.getTextPitchAlignment().getValue()); // Set and Get - layer.setProperties(textPitchAlignment(TEXT_PITCH_ALIGNMENT_MAP)); - assertEquals((String) layer.getTextPitchAlignment().getValue(), (String) TEXT_PITCH_ALIGNMENT_MAP); + String propertyValue = TEXT_PITCH_ALIGNMENT_MAP; + layer.setProperties(textPitchAlignment(propertyValue)); + assertEquals(layer.getTextPitchAlignment().getValue(), propertyValue); }); } @@ -483,11 +502,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-rotation-alignment"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextRotationAlignment().getValue()); + assertNull(layer.getTextRotationAlignment().getValue()); // Set and Get - layer.setProperties(textRotationAlignment(TEXT_ROTATION_ALIGNMENT_MAP)); - assertEquals((String) layer.getTextRotationAlignment().getValue(), (String) TEXT_ROTATION_ALIGNMENT_MAP); + String propertyValue = TEXT_ROTATION_ALIGNMENT_MAP; + layer.setProperties(textRotationAlignment(propertyValue)); + assertEquals(layer.getTextRotationAlignment().getValue(), propertyValue); }); } @@ -498,36 +518,16 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-field"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextField().getValue()); + assertNull(layer.getTextField().getValue()); // Set and Get - layer.setProperties(textField("")); - assertEquals((String) layer.getTextField().getValue(), (String) ""); + Formatted propertyValue = new Formatted(new FormattedSection[]{new FormattedSection("default")}); - layer.setProperties(textField("{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); - assertNull((String) layer.getTextField().getValue()); - - 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("default")); + assertEquals(layer.getTextField().getValue(), propertyValue); layer.setProperties(textField("{token}")); - assertEquals(layer.getFormattedTextField().getExpression(), Expression.format(Expression.formatEntry(Expression.toString(Expression.get("token"))))); + assertEquals(layer.getTextField().getExpression(), format(Expression.formatEntry(Expression.toString(Expression.get("token"))))); }); } @@ -541,25 +541,9 @@ public class SymbolLayerTest extends BaseActivityTest { assertNull(layer.getTextField().getExpression()); // Set and Get - Expression expression = string(Expression.get("undefined")); - layer.setProperties(textField(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); - assertNull(layer.getTextField().getExpression()); - - // Set and Get - Expression expression = string(Expression.get("undefined")); + Expression expression = format(Expression.formatEntry(Expression.get("undefined"), FormatOption.formatFontScale(2.0), FormatOption.formatTextFont(new String[]{"Open Sans Regular", "Arial Unicode MS Regular"}))); layer.setProperties(textField(expression)); - assertEquals(layer.getFormattedTextField().getExpression(), Expression.format(Expression.formatEntry(Expression.string(Expression.get("undefined"))))); + assertEquals(layer.getTextField().getExpression(), expression); }); } @@ -570,11 +554,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-font"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String[]) layer.getTextFont().getValue()); + assertNull(layer.getTextFont().getValue()); // Set and Get - layer.setProperties(textFont(new String[]{"Open Sans Regular", "Arial Unicode MS Regular"})); - assertEquals((String[]) layer.getTextFont().getValue(), (String[]) new String[]{"Open Sans Regular", "Arial Unicode MS Regular"}); + String[] propertyValue = new String[]{"Open Sans Regular", "Arial Unicode MS Regular"}; + layer.setProperties(textFont(propertyValue)); + assertEquals(layer.getTextFont().getValue(), propertyValue); }); } @@ -585,11 +570,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-size"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextSize().getValue()); + assertNull(layer.getTextSize().getValue()); // Set and Get - layer.setProperties(textSize(0.3f)); - assertEquals((Float) layer.getTextSize().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textSize(propertyValue)); + assertEquals(layer.getTextSize().getValue(), propertyValue); }); } @@ -616,11 +602,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-max-width"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextMaxWidth().getValue()); + assertNull(layer.getTextMaxWidth().getValue()); // Set and Get - layer.setProperties(textMaxWidth(0.3f)); - assertEquals((Float) layer.getTextMaxWidth().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textMaxWidth(propertyValue)); + assertEquals(layer.getTextMaxWidth().getValue(), propertyValue); }); } @@ -647,11 +634,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-line-height"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextLineHeight().getValue()); + assertNull(layer.getTextLineHeight().getValue()); // Set and Get - layer.setProperties(textLineHeight(0.3f)); - assertEquals((Float) layer.getTextLineHeight().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textLineHeight(propertyValue)); + assertEquals(layer.getTextLineHeight().getValue(), propertyValue); }); } @@ -662,11 +650,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-letter-spacing"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextLetterSpacing().getValue()); + assertNull(layer.getTextLetterSpacing().getValue()); // Set and Get - layer.setProperties(textLetterSpacing(0.3f)); - assertEquals((Float) layer.getTextLetterSpacing().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textLetterSpacing(propertyValue)); + assertEquals(layer.getTextLetterSpacing().getValue(), propertyValue); }); } @@ -693,11 +682,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-justify"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextJustify().getValue()); + assertNull(layer.getTextJustify().getValue()); // Set and Get - layer.setProperties(textJustify(TEXT_JUSTIFY_LEFT)); - assertEquals((String) layer.getTextJustify().getValue(), (String) TEXT_JUSTIFY_LEFT); + String propertyValue = TEXT_JUSTIFY_LEFT; + layer.setProperties(textJustify(propertyValue)); + assertEquals(layer.getTextJustify().getValue(), propertyValue); }); } @@ -724,11 +714,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-anchor"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextAnchor().getValue()); + assertNull(layer.getTextAnchor().getValue()); // Set and Get - layer.setProperties(textAnchor(TEXT_ANCHOR_CENTER)); - assertEquals((String) layer.getTextAnchor().getValue(), (String) TEXT_ANCHOR_CENTER); + String propertyValue = TEXT_ANCHOR_CENTER; + layer.setProperties(textAnchor(propertyValue)); + assertEquals(layer.getTextAnchor().getValue(), propertyValue); }); } @@ -755,11 +746,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-max-angle"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextMaxAngle().getValue()); + assertNull(layer.getTextMaxAngle().getValue()); // Set and Get - layer.setProperties(textMaxAngle(0.3f)); - assertEquals((Float) layer.getTextMaxAngle().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textMaxAngle(propertyValue)); + assertEquals(layer.getTextMaxAngle().getValue(), propertyValue); }); } @@ -770,11 +762,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-rotate"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextRotate().getValue()); + assertNull(layer.getTextRotate().getValue()); // Set and Get - layer.setProperties(textRotate(0.3f)); - assertEquals((Float) layer.getTextRotate().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textRotate(propertyValue)); + assertEquals(layer.getTextRotate().getValue(), propertyValue); }); } @@ -801,11 +794,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-padding"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextPadding().getValue()); + assertNull(layer.getTextPadding().getValue()); // Set and Get - layer.setProperties(textPadding(0.3f)); - assertEquals((Float) layer.getTextPadding().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textPadding(propertyValue)); + assertEquals(layer.getTextPadding().getValue(), propertyValue); }); } @@ -816,11 +810,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-keep-upright"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getTextKeepUpright().getValue()); + assertNull(layer.getTextKeepUpright().getValue()); // Set and Get - layer.setProperties(textKeepUpright(true)); - assertEquals((Boolean) layer.getTextKeepUpright().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(textKeepUpright(propertyValue)); + assertEquals(layer.getTextKeepUpright().getValue(), propertyValue); }); } @@ -831,11 +826,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-transform"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextTransform().getValue()); + assertNull(layer.getTextTransform().getValue()); // Set and Get - layer.setProperties(textTransform(TEXT_TRANSFORM_NONE)); - assertEquals((String) layer.getTextTransform().getValue(), (String) TEXT_TRANSFORM_NONE); + String propertyValue = TEXT_TRANSFORM_NONE; + layer.setProperties(textTransform(propertyValue)); + assertEquals(layer.getTextTransform().getValue(), propertyValue); }); } @@ -862,11 +858,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-offset"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float[]) layer.getTextOffset().getValue()); + assertNull(layer.getTextOffset().getValue()); // Set and Get - layer.setProperties(textOffset(new Float[] {0f, 0f})); - assertEquals((Float[]) layer.getTextOffset().getValue(), (Float[]) new Float[] {0f, 0f}); + Float[] propertyValue = new Float[] {0f, 0f}; + layer.setProperties(textOffset(propertyValue)); + assertEquals(layer.getTextOffset().getValue(), propertyValue); }); } @@ -877,11 +874,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-allow-overlap"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getTextAllowOverlap().getValue()); + assertNull(layer.getTextAllowOverlap().getValue()); // Set and Get - layer.setProperties(textAllowOverlap(true)); - assertEquals((Boolean) layer.getTextAllowOverlap().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(textAllowOverlap(propertyValue)); + assertEquals(layer.getTextAllowOverlap().getValue(), propertyValue); }); } @@ -892,11 +890,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-ignore-placement"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getTextIgnorePlacement().getValue()); + assertNull(layer.getTextIgnorePlacement().getValue()); // Set and Get - layer.setProperties(textIgnorePlacement(true)); - assertEquals((Boolean) layer.getTextIgnorePlacement().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(textIgnorePlacement(propertyValue)); + assertEquals(layer.getTextIgnorePlacement().getValue(), propertyValue); }); } @@ -907,11 +906,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-optional"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Boolean) layer.getTextOptional().getValue()); + assertNull(layer.getTextOptional().getValue()); // Set and Get - layer.setProperties(textOptional(true)); - assertEquals((Boolean) layer.getTextOptional().getValue(), (Boolean) true); + Boolean propertyValue = true; + layer.setProperties(textOptional(propertyValue)); + assertEquals(layer.getTextOptional().getValue(), propertyValue); }); } @@ -937,11 +937,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-opacity"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getIconOpacity().getValue()); + assertNull(layer.getIconOpacity().getValue()); // Set and Get - layer.setProperties(iconOpacity(0.3f)); - assertEquals((Float) layer.getIconOpacity().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(iconOpacity(propertyValue)); + assertEquals(layer.getIconOpacity().getValue(), propertyValue); }); } @@ -983,11 +984,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-color"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getIconColor().getValue()); + assertNull(layer.getIconColor().getValue()); // Set and Get - layer.setProperties(iconColor("rgba(0, 0, 0, 1)")); - assertEquals((String) layer.getIconColor().getValue(), (String) "rgba(0, 0, 0, 1)"); + String propertyValue = "rgba(0, 0, 0, 1)"; + layer.setProperties(iconColor(propertyValue)); + assertEquals(layer.getIconColor().getValue(), propertyValue); }); } @@ -1043,11 +1045,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-halo-color"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getIconHaloColor().getValue()); + assertNull(layer.getIconHaloColor().getValue()); // Set and Get - layer.setProperties(iconHaloColor("rgba(0, 0, 0, 1)")); - assertEquals((String) layer.getIconHaloColor().getValue(), (String) "rgba(0, 0, 0, 1)"); + String propertyValue = "rgba(0, 0, 0, 1)"; + layer.setProperties(iconHaloColor(propertyValue)); + assertEquals(layer.getIconHaloColor().getValue(), propertyValue); }); } @@ -1103,11 +1106,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-halo-width"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getIconHaloWidth().getValue()); + assertNull(layer.getIconHaloWidth().getValue()); // Set and Get - layer.setProperties(iconHaloWidth(0.3f)); - assertEquals((Float) layer.getIconHaloWidth().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(iconHaloWidth(propertyValue)); + assertEquals(layer.getIconHaloWidth().getValue(), propertyValue); }); } @@ -1149,11 +1153,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-halo-blur"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getIconHaloBlur().getValue()); + assertNull(layer.getIconHaloBlur().getValue()); // Set and Get - layer.setProperties(iconHaloBlur(0.3f)); - assertEquals((Float) layer.getIconHaloBlur().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(iconHaloBlur(propertyValue)); + assertEquals(layer.getIconHaloBlur().getValue(), propertyValue); }); } @@ -1195,11 +1200,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-translate"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float[]) layer.getIconTranslate().getValue()); + assertNull(layer.getIconTranslate().getValue()); // Set and Get - layer.setProperties(iconTranslate(new Float[] {0f, 0f})); - assertEquals((Float[]) layer.getIconTranslate().getValue(), (Float[]) new Float[] {0f, 0f}); + Float[] propertyValue = new Float[] {0f, 0f}; + layer.setProperties(iconTranslate(propertyValue)); + assertEquals(layer.getIconTranslate().getValue(), propertyValue); }); } @@ -1210,11 +1216,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("icon-translate-anchor"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getIconTranslateAnchor().getValue()); + assertNull(layer.getIconTranslateAnchor().getValue()); // Set and Get - layer.setProperties(iconTranslateAnchor(ICON_TRANSLATE_ANCHOR_MAP)); - assertEquals((String) layer.getIconTranslateAnchor().getValue(), (String) ICON_TRANSLATE_ANCHOR_MAP); + String propertyValue = ICON_TRANSLATE_ANCHOR_MAP; + layer.setProperties(iconTranslateAnchor(propertyValue)); + assertEquals(layer.getIconTranslateAnchor().getValue(), propertyValue); }); } @@ -1240,11 +1247,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-opacity"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextOpacity().getValue()); + assertNull(layer.getTextOpacity().getValue()); // Set and Get - layer.setProperties(textOpacity(0.3f)); - assertEquals((Float) layer.getTextOpacity().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textOpacity(propertyValue)); + assertEquals(layer.getTextOpacity().getValue(), propertyValue); }); } @@ -1286,11 +1294,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-color"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextColor().getValue()); + assertNull(layer.getTextColor().getValue()); // Set and Get - layer.setProperties(textColor("rgba(0, 0, 0, 1)")); - assertEquals((String) layer.getTextColor().getValue(), (String) "rgba(0, 0, 0, 1)"); + String propertyValue = "rgba(0, 0, 0, 1)"; + layer.setProperties(textColor(propertyValue)); + assertEquals(layer.getTextColor().getValue(), propertyValue); }); } @@ -1346,11 +1355,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-halo-color"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextHaloColor().getValue()); + assertNull(layer.getTextHaloColor().getValue()); // Set and Get - layer.setProperties(textHaloColor("rgba(0, 0, 0, 1)")); - assertEquals((String) layer.getTextHaloColor().getValue(), (String) "rgba(0, 0, 0, 1)"); + String propertyValue = "rgba(0, 0, 0, 1)"; + layer.setProperties(textHaloColor(propertyValue)); + assertEquals(layer.getTextHaloColor().getValue(), propertyValue); }); } @@ -1406,11 +1416,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-halo-width"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextHaloWidth().getValue()); + assertNull(layer.getTextHaloWidth().getValue()); // Set and Get - layer.setProperties(textHaloWidth(0.3f)); - assertEquals((Float) layer.getTextHaloWidth().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textHaloWidth(propertyValue)); + assertEquals(layer.getTextHaloWidth().getValue(), propertyValue); }); } @@ -1452,11 +1463,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-halo-blur"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float) layer.getTextHaloBlur().getValue()); + assertNull(layer.getTextHaloBlur().getValue()); // Set and Get - layer.setProperties(textHaloBlur(0.3f)); - assertEquals((Float) layer.getTextHaloBlur().getValue(), (Float) 0.3f); + Float propertyValue = 0.3f; + layer.setProperties(textHaloBlur(propertyValue)); + assertEquals(layer.getTextHaloBlur().getValue(), propertyValue); }); } @@ -1498,11 +1510,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-translate"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((Float[]) layer.getTextTranslate().getValue()); + assertNull(layer.getTextTranslate().getValue()); // Set and Get - layer.setProperties(textTranslate(new Float[] {0f, 0f})); - assertEquals((Float[]) layer.getTextTranslate().getValue(), (Float[]) new Float[] {0f, 0f}); + Float[] propertyValue = new Float[] {0f, 0f}; + layer.setProperties(textTranslate(propertyValue)); + assertEquals(layer.getTextTranslate().getValue(), propertyValue); }); } @@ -1513,11 +1526,12 @@ public class SymbolLayerTest extends BaseActivityTest { Timber.i("text-translate-anchor"); invoke(mapboxMap, (uiController, mapboxMap) -> { assertNotNull(layer); - assertNull((String) layer.getTextTranslateAnchor().getValue()); + assertNull(layer.getTextTranslateAnchor().getValue()); // Set and Get - layer.setProperties(textTranslateAnchor(TEXT_TRANSLATE_ANCHOR_MAP)); - assertEquals((String) layer.getTextTranslateAnchor().getValue(), (String) TEXT_TRANSLATE_ANCHOR_MAP); + String propertyValue = TEXT_TRANSLATE_ANCHOR_MAP; + layer.setProperties(textTranslateAnchor(propertyValue)); + assertEquals(layer.getTextTranslateAnchor().getValue(), propertyValue); }); } } |