1 files changed, 28 insertions, 21 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
index 2b50279c89..aa444d0ab6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java
@@ -124,11 +124,12 @@ public class FillLayerTest extends BaseActivityTest {
     Timber.i("fill-antialias");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Boolean) layer.getFillAntialias().getValue());
+      assertNull(layer.getFillAntialias().getValue());
 
       // Set and Get
-      layer.setProperties(fillAntialias(true));
-      assertEquals((Boolean) layer.getFillAntialias().getValue(), (Boolean) true);
+      Boolean propertyValue = true;
+      layer.setProperties(fillAntialias(propertyValue));
+      assertEquals(layer.getFillAntialias().getValue(), propertyValue);
     });
   }
 
@@ -154,11 +155,12 @@ public class FillLayerTest extends BaseActivityTest {
     Timber.i("fill-opacity");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Float) layer.getFillOpacity().getValue());
+      assertNull(layer.getFillOpacity().getValue());
 
       // Set and Get
-      layer.setProperties(fillOpacity(0.3f));
-      assertEquals((Float) layer.getFillOpacity().getValue(), (Float) 0.3f);
+      Float propertyValue = 0.3f;
+      layer.setProperties(fillOpacity(propertyValue));
+      assertEquals(layer.getFillOpacity().getValue(), propertyValue);
     });
   }
 
@@ -200,11 +202,12 @@ public class FillLayerTest extends BaseActivityTest {
     Timber.i("fill-color");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getFillColor().getValue());
+      assertNull(layer.getFillColor().getValue());
 
       // Set and Get
-      layer.setProperties(fillColor("rgba(0, 0, 0, 1)"));
-      assertEquals((String) layer.getFillColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      String propertyValue = "rgba(0, 0, 0, 1)";
+      layer.setProperties(fillColor(propertyValue));
+      assertEquals(layer.getFillColor().getValue(), propertyValue);
     });
   }
 
@@ -260,11 +263,12 @@ public class FillLayerTest extends BaseActivityTest {
     Timber.i("fill-outline-color");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getFillOutlineColor().getValue());
+      assertNull(layer.getFillOutlineColor().getValue());
 
       // Set and Get
-      layer.setProperties(fillOutlineColor("rgba(0, 0, 0, 1)"));
-      assertEquals((String) layer.getFillOutlineColor().getValue(), (String) "rgba(0, 0, 0, 1)");
+      String propertyValue = "rgba(0, 0, 0, 1)";
+      layer.setProperties(fillOutlineColor(propertyValue));
+      assertEquals(layer.getFillOutlineColor().getValue(), propertyValue);
     });
   }
 
@@ -320,11 +324,12 @@ public class FillLayerTest extends BaseActivityTest {
     Timber.i("fill-translate");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((Float[]) layer.getFillTranslate().getValue());
+      assertNull(layer.getFillTranslate().getValue());
 
       // Set and Get
-      layer.setProperties(fillTranslate(new Float[] {0f, 0f}));
-      assertEquals((Float[]) layer.getFillTranslate().getValue(), (Float[]) new Float[] {0f, 0f});
+      Float[] propertyValue = new Float[] {0f, 0f};
+      layer.setProperties(fillTranslate(propertyValue));
+      assertEquals(layer.getFillTranslate().getValue(), propertyValue);
     });
   }
 
@@ -335,11 +340,12 @@ public class FillLayerTest extends BaseActivityTest {
     Timber.i("fill-translate-anchor");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getFillTranslateAnchor().getValue());
+      assertNull(layer.getFillTranslateAnchor().getValue());
 
       // Set and Get
-      layer.setProperties(fillTranslateAnchor(FILL_TRANSLATE_ANCHOR_MAP));
-      assertEquals((String) layer.getFillTranslateAnchor().getValue(), (String) FILL_TRANSLATE_ANCHOR_MAP);
+      String propertyValue = FILL_TRANSLATE_ANCHOR_MAP;
+      layer.setProperties(fillTranslateAnchor(propertyValue));
+      assertEquals(layer.getFillTranslateAnchor().getValue(), propertyValue);
     });
   }
 
@@ -365,11 +371,12 @@ public class FillLayerTest extends BaseActivityTest {
     Timber.i("fill-pattern");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((String) layer.getFillPattern().getValue());
+      assertNull(layer.getFillPattern().getValue());
 
       // Set and Get
-      layer.setProperties(fillPattern("pedestrian-polygon"));
-      assertEquals((String) layer.getFillPattern().getValue(), (String) "pedestrian-polygon");
+      String propertyValue = "pedestrian-polygon";
+      layer.setProperties(fillPattern(propertyValue));
+      assertEquals(layer.getFillPattern().getValue(), propertyValue);
     });
   }