1 files changed, 44 insertions, 33 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
index 4101c0ffa1..36f3dd8da9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java
@@ -139,11 +139,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-radius");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Float) layer.getCircleRadius().getValue());
+      assertNull(layer.getCircleRadius().getValue());
 
       // Set and Get
-      layer.setProperties(circleRadius(0.3f));
-      assertEquals((Float) layer.getCircleRadius().getValue(), (Float) 0.3f);
+      Float propertyValue = 0.3f;
+      layer.setProperties(circleRadius(propertyValue));
+      assertEquals(layer.getCircleRadius().getValue(), propertyValue);
     });
   }
 
@@ -185,11 +186,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-color");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getCircleColor().getValue());
+      assertNull(layer.getCircleColor().getValue());
 
       // Set and Get
-      layer.setProperties(circleColor("rgba(0, 0, 0, 1)"));
-      assertEquals((String) layer.getCircleColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      String propertyValue = "rgba(0, 0, 0, 1)";
+      layer.setProperties(circleColor(propertyValue));
+      assertEquals(layer.getCircleColor().getValue(), propertyValue);
     });
   }
 
@@ -245,11 +247,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-blur");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Float) layer.getCircleBlur().getValue());
+      assertNull(layer.getCircleBlur().getValue());
 
       // Set and Get
-      layer.setProperties(circleBlur(0.3f));
-      assertEquals((Float) layer.getCircleBlur().getValue(), (Float) 0.3f);
+      Float propertyValue = 0.3f;
+      layer.setProperties(circleBlur(propertyValue));
+      assertEquals(layer.getCircleBlur().getValue(), propertyValue);
     });
   }
 
@@ -291,11 +294,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-opacity");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Float) layer.getCircleOpacity().getValue());
+      assertNull(layer.getCircleOpacity().getValue());
 
       // Set and Get
-      layer.setProperties(circleOpacity(0.3f));
-      assertEquals((Float) layer.getCircleOpacity().getValue(), (Float) 0.3f);
+      Float propertyValue = 0.3f;
+      layer.setProperties(circleOpacity(propertyValue));
+      assertEquals(layer.getCircleOpacity().getValue(), propertyValue);
     });
   }
 
@@ -337,11 +341,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-translate");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Float[]) layer.getCircleTranslate().getValue());
+      assertNull(layer.getCircleTranslate().getValue());
 
       // Set and Get
-      layer.setProperties(circleTranslate(new Float[] {0f, 0f}));
-      assertEquals((Float[]) layer.getCircleTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      Float[] propertyValue = new Float[] {0f, 0f};
+      layer.setProperties(circleTranslate(propertyValue));
+      assertEquals(layer.getCircleTranslate().getValue(), propertyValue);
     });
   }
 
@@ -352,11 +357,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-translate-anchor");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getCircleTranslateAnchor().getValue());
+      assertNull(layer.getCircleTranslateAnchor().getValue());
 
       // Set and Get
-      layer.setProperties(circleTranslateAnchor(CIRCLE_TRANSLATE_ANCHOR_MAP));
-      assertEquals((String) layer.getCircleTranslateAnchor().getValue(), (String) CIRCLE_TRANSLATE_ANCHOR_MAP);
+      String propertyValue = CIRCLE_TRANSLATE_ANCHOR_MAP;
+      layer.setProperties(circleTranslateAnchor(propertyValue));
+      assertEquals(layer.getCircleTranslateAnchor().getValue(), propertyValue);
     });
   }
 
@@ -367,11 +373,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-pitch-scale");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getCirclePitchScale().getValue());
+      assertNull(layer.getCirclePitchScale().getValue());
 
       // Set and Get
-      layer.setProperties(circlePitchScale(CIRCLE_PITCH_SCALE_MAP));
-      assertEquals((String) layer.getCirclePitchScale().getValue(), (String) CIRCLE_PITCH_SCALE_MAP);
+      String propertyValue = CIRCLE_PITCH_SCALE_MAP;
+      layer.setProperties(circlePitchScale(propertyValue));
+      assertEquals(layer.getCirclePitchScale().getValue(), propertyValue);
     });
   }
 
@@ -382,11 +389,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-pitch-alignment");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getCirclePitchAlignment().getValue());
+      assertNull(layer.getCirclePitchAlignment().getValue());
 
       // Set and Get
-      layer.setProperties(circlePitchAlignment(CIRCLE_PITCH_ALIGNMENT_MAP));
-      assertEquals((String) layer.getCirclePitchAlignment().getValue(), (String) CIRCLE_PITCH_ALIGNMENT_MAP);
+      String propertyValue = CIRCLE_PITCH_ALIGNMENT_MAP;
+      layer.setProperties(circlePitchAlignment(propertyValue));
+      assertEquals(layer.getCirclePitchAlignment().getValue(), propertyValue);
     });
   }
 
@@ -412,11 +420,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-stroke-width");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Float) layer.getCircleStrokeWidth().getValue());
+      assertNull(layer.getCircleStrokeWidth().getValue());
 
       // Set and Get
-      layer.setProperties(circleStrokeWidth(0.3f));
-      assertEquals((Float) layer.getCircleStrokeWidth().getValue(), (Float) 0.3f);
+      Float propertyValue = 0.3f;
+      layer.setProperties(circleStrokeWidth(propertyValue));
+      assertEquals(layer.getCircleStrokeWidth().getValue(), propertyValue);
     });
   }
 
@@ -458,11 +467,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-stroke-color");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getCircleStrokeColor().getValue());
+      assertNull(layer.getCircleStrokeColor().getValue());
 
       // Set and Get
-      layer.setProperties(circleStrokeColor("rgba(0, 0, 0, 1)"));
-      assertEquals((String) layer.getCircleStrokeColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      String propertyValue = "rgba(0, 0, 0, 1)";
+      layer.setProperties(circleStrokeColor(propertyValue));
+      assertEquals(layer.getCircleStrokeColor().getValue(), propertyValue);
     });
   }
 
@@ -518,11 +528,12 @@ public class CircleLayerTest extends BaseActivityTest {
     Timber.i("circle-stroke-opacity");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Float) layer.getCircleStrokeOpacity().getValue());
+      assertNull(layer.getCircleStrokeOpacity().getValue());
 
       // Set and Get
-      layer.setProperties(circleStrokeOpacity(0.3f));
-      assertEquals((Float) layer.getCircleStrokeOpacity().getValue(), (Float) 0.3f);
+      Float propertyValue = 0.3f;
+      layer.setProperties(circleStrokeOpacity(propertyValue));
+      assertEquals(layer.getCircleStrokeOpacity().getValue(), propertyValue);
     });
   }