1 files changed, 95 insertions, 378 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
index df560e2632..0410d09369 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java
@@ -3,31 +3,18 @@
 package com.mapbox.mapboxsdk.testapp.style;
 
 import android.graphics.Color;
-import android.support.test.espresso.UiController;
 import android.support.test.runner.AndroidJUnit4;
 
 import timber.log.Timber;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.style.functions.CompositeFunction;
-import com.mapbox.mapboxsdk.style.functions.CameraFunction;
-import com.mapbox.mapboxsdk.style.functions.SourceFunction;
-import com.mapbox.mapboxsdk.style.functions.stops.CategoricalStops;
-import com.mapbox.mapboxsdk.style.functions.stops.ExponentialStops;
-import com.mapbox.mapboxsdk.style.functions.stops.IdentityStops;
-import com.mapbox.mapboxsdk.style.functions.stops.IntervalStops;
-import com.mapbox.mapboxsdk.style.functions.stops.Stop;
-import com.mapbox.mapboxsdk.style.functions.stops.Stops;
+import com.mapbox.mapboxsdk.style.expressions.Expression;
 import com.mapbox.mapboxsdk.style.layers.RasterLayer;
-import com.mapbox.mapboxsdk.testapp.action.MapboxMapAction;
 import com.mapbox.mapboxsdk.testapp.activity.BaseActivityTest;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static com.mapbox.mapboxsdk.style.functions.Function.*;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stop.stop;
-import static com.mapbox.mapboxsdk.style.functions.stops.Stops.*;
+import static com.mapbox.mapboxsdk.style.expressions.Expression.*;
 import static com.mapbox.mapboxsdk.testapp.action.MapboxMapAction.invoke;
 import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
@@ -51,17 +38,14 @@ public class RasterLayerTest extends BaseActivityTest {
 
   private void setupLayer() {
     Timber.i("Retrieving layer");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
-          Timber.i("Adding layer");
-          layer = new RasterLayer("my-layer", "composite");
-          layer.setSourceLayer("composite");
-          mapboxMap.addLayer(layer);
-          // Layer reference is now stale, get new reference
-          layer = mapboxMap.getLayerAs("my-layer");
-        }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      if ((layer = mapboxMap.getLayerAs("my-layer")) == null) {
+        Timber.i("Adding layer");
+        layer = new RasterLayer("my-layer", "composite");
+        layer.setSourceLayer("composite");
+        mapboxMap.addLayer(layer);
+        // Layer reference is now stale, get new reference
+        layer = mapboxMap.getLayerAs("my-layer");
       }
     });
   }
@@ -71,18 +55,15 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("Visibility");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-        // Get initial
-        assertEquals(layer.getVisibility().getValue(), VISIBLE);
+      // Get initial
+      assertEquals(layer.getVisibility().getValue(), VISIBLE);
 
-        // Set
-        layer.setProperties(visibility(NONE));
-        assertEquals(layer.getVisibility().getValue(), NONE);
-      }
+      // Set
+      layer.setProperties(visibility(NONE));
+      assertEquals(layer.getVisibility().getValue(), NONE);
     });
   }
 
@@ -91,16 +72,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacityTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setRasterOpacityTransition(options);
-        assertEquals(layer.getRasterOpacityTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterOpacityTransition(options);
+      assertEquals(layer.getRasterOpacityTransition(), options);
     });
   }
 
@@ -109,47 +87,12 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-opacity");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(rasterOpacity(0.3f));
-        assertEquals((Float) layer.getRasterOpacity().getValue(), (Float) 0.3f);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testRasterOpacityAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("raster-opacity");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          rasterOpacity(
-            zoom(
-              exponential(
-                stop(2, rasterOpacity(0.3f))
-              ).withBase(0.5f)
-            )
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getRasterOpacity());
-        assertNotNull(layer.getRasterOpacity().getFunction());
-        assertEquals(CameraFunction.class, layer.getRasterOpacity().getFunction().getClass());
-        assertEquals(ExponentialStops.class, layer.getRasterOpacity().getFunction().getStops().getClass());
-        assertEquals(0.5f, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).getBase(), 0.001);
-        assertEquals(1, ((ExponentialStops) layer.getRasterOpacity().getFunction().getStops()).size());
-      }
+      // Set and Get
+      layer.setProperties(rasterOpacity(0.3f));
+      assertEquals((Float) layer.getRasterOpacity().getValue(), (Float) 0.3f);
     });
   }
 
@@ -158,16 +101,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotateTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setRasterHueRotateTransition(options);
-        assertEquals(layer.getRasterHueRotateTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterHueRotateTransition(options);
+      assertEquals(layer.getRasterHueRotateTransition(), options);
     });
   }
 
@@ -176,47 +116,12 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-hue-rotate");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(rasterHueRotate(0.3f));
-        assertEquals((Float) layer.getRasterHueRotate().getValue(), (Float) 0.3f);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testRasterHueRotateAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("raster-hue-rotate");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          rasterHueRotate(
-            zoom(
-              exponential(
-                stop(2, rasterHueRotate(0.3f))
-              ).withBase(0.5f)
-            )
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getRasterHueRotate());
-        assertNotNull(layer.getRasterHueRotate().getFunction());
-        assertEquals(CameraFunction.class, layer.getRasterHueRotate().getFunction().getClass());
-        assertEquals(ExponentialStops.class, layer.getRasterHueRotate().getFunction().getStops().getClass());
-        assertEquals(0.5f, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).getBase(), 0.001);
-        assertEquals(1, ((ExponentialStops) layer.getRasterHueRotate().getFunction().getStops()).size());
-      }
+      // Set and Get
+      layer.setProperties(rasterHueRotate(0.3f));
+      assertEquals((Float) layer.getRasterHueRotate().getValue(), (Float) 0.3f);
     });
   }
 
@@ -225,16 +130,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-minTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setRasterBrightnessMinTransition(options);
-        assertEquals(layer.getRasterBrightnessMinTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterBrightnessMinTransition(options);
+      assertEquals(layer.getRasterBrightnessMinTransition(), options);
     });
   }
 
@@ -243,47 +145,12 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-min");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(rasterBrightnessMin(0.3f));
-        assertEquals((Float) layer.getRasterBrightnessMin().getValue(), (Float) 0.3f);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testRasterBrightnessMinAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("raster-brightness-min");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          rasterBrightnessMin(
-            zoom(
-              exponential(
-                stop(2, rasterBrightnessMin(0.3f))
-              ).withBase(0.5f)
-            )
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getRasterBrightnessMin());
-        assertNotNull(layer.getRasterBrightnessMin().getFunction());
-        assertEquals(CameraFunction.class, layer.getRasterBrightnessMin().getFunction().getClass());
-        assertEquals(ExponentialStops.class, layer.getRasterBrightnessMin().getFunction().getStops().getClass());
-        assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).getBase(), 0.001);
-        assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMin().getFunction().getStops()).size());
-      }
+      // Set and Get
+      layer.setProperties(rasterBrightnessMin(0.3f));
+      assertEquals((Float) layer.getRasterBrightnessMin().getValue(), (Float) 0.3f);
     });
   }
 
@@ -292,16 +159,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-maxTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setRasterBrightnessMaxTransition(options);
-        assertEquals(layer.getRasterBrightnessMaxTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterBrightnessMaxTransition(options);
+      assertEquals(layer.getRasterBrightnessMaxTransition(), options);
     });
   }
 
@@ -310,47 +174,12 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-brightness-max");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(rasterBrightnessMax(0.3f));
-        assertEquals((Float) layer.getRasterBrightnessMax().getValue(), (Float) 0.3f);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testRasterBrightnessMaxAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("raster-brightness-max");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          rasterBrightnessMax(
-            zoom(
-              exponential(
-                stop(2, rasterBrightnessMax(0.3f))
-              ).withBase(0.5f)
-            )
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getRasterBrightnessMax());
-        assertNotNull(layer.getRasterBrightnessMax().getFunction());
-        assertEquals(CameraFunction.class, layer.getRasterBrightnessMax().getFunction().getClass());
-        assertEquals(ExponentialStops.class, layer.getRasterBrightnessMax().getFunction().getStops().getClass());
-        assertEquals(0.5f, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).getBase(), 0.001);
-        assertEquals(1, ((ExponentialStops) layer.getRasterBrightnessMax().getFunction().getStops()).size());
-      }
+      // Set and Get
+      layer.setProperties(rasterBrightnessMax(0.3f));
+      assertEquals((Float) layer.getRasterBrightnessMax().getValue(), (Float) 0.3f);
     });
   }
 
@@ -359,16 +188,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturationTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setRasterSaturationTransition(options);
-        assertEquals(layer.getRasterSaturationTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterSaturationTransition(options);
+      assertEquals(layer.getRasterSaturationTransition(), options);
     });
   }
 
@@ -377,47 +203,12 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-saturation");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(rasterSaturation(0.3f));
-        assertEquals((Float) layer.getRasterSaturation().getValue(), (Float) 0.3f);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testRasterSaturationAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("raster-saturation");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          rasterSaturation(
-            zoom(
-              exponential(
-                stop(2, rasterSaturation(0.3f))
-              ).withBase(0.5f)
-            )
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getRasterSaturation());
-        assertNotNull(layer.getRasterSaturation().getFunction());
-        assertEquals(CameraFunction.class, layer.getRasterSaturation().getFunction().getClass());
-        assertEquals(ExponentialStops.class, layer.getRasterSaturation().getFunction().getStops().getClass());
-        assertEquals(0.5f, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).getBase(), 0.001);
-        assertEquals(1, ((ExponentialStops) layer.getRasterSaturation().getFunction().getStops()).size());
-      }
+      // Set and Get
+      layer.setProperties(rasterSaturation(0.3f));
+      assertEquals((Float) layer.getRasterSaturation().getValue(), (Float) 0.3f);
     });
   }
 
@@ -426,16 +217,13 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrastTransitionOptions");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        TransitionOptions options = new TransitionOptions(300, 100);
-        layer.setRasterContrastTransition(options);
-        assertEquals(layer.getRasterContrastTransition(), options);
-      }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
+
+      // Set and Get
+      TransitionOptions options = new TransitionOptions(300, 100);
+      layer.setRasterContrastTransition(options);
+      assertEquals(layer.getRasterContrastTransition(), options);
     });
   }
 
@@ -444,47 +232,12 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-contrast");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(rasterContrast(0.3f));
-        assertEquals((Float) layer.getRasterContrast().getValue(), (Float) 0.3f);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testRasterContrastAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("raster-contrast");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          rasterContrast(
-            zoom(
-              exponential(
-                stop(2, rasterContrast(0.3f))
-              ).withBase(0.5f)
-            )
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getRasterContrast());
-        assertNotNull(layer.getRasterContrast().getFunction());
-        assertEquals(CameraFunction.class, layer.getRasterContrast().getFunction().getClass());
-        assertEquals(ExponentialStops.class, layer.getRasterContrast().getFunction().getStops().getClass());
-        assertEquals(0.5f, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).getBase(), 0.001);
-        assertEquals(1, ((ExponentialStops) layer.getRasterContrast().getFunction().getStops()).size());
-      }
+      // Set and Get
+      layer.setProperties(rasterContrast(0.3f));
+      assertEquals((Float) layer.getRasterContrast().getValue(), (Float) 0.3f);
     });
   }
 
@@ -493,48 +246,12 @@ public class RasterLayerTest extends BaseActivityTest {
     validateTestSetup();
     setupLayer();
     Timber.i("raster-fade-duration");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set and Get
-        layer.setProperties(rasterFadeDuration(0.3f));
-        assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
-      }
-    });
-  }
+    invoke(mapboxMap, (uiController, mapboxMap) -> {
+      assertNotNull(layer);
 
-  @Test
-  public void testRasterFadeDurationAsCameraFunction() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("raster-fade-duration");
-    invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() {
-      @Override
-      public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) {
-        assertNotNull(layer);
-
-        // Set
-        layer.setProperties(
-          rasterFadeDuration(
-            zoom(
-              exponential(
-                stop(2, rasterFadeDuration(0.3f))
-              ).withBase(0.5f)
-            )
-          )
-        );
-
-        // Verify
-        assertNotNull(layer.getRasterFadeDuration());
-        assertNotNull(layer.getRasterFadeDuration().getFunction());
-        assertEquals(CameraFunction.class, layer.getRasterFadeDuration().getFunction().getClass());
-        assertEquals(ExponentialStops.class, layer.getRasterFadeDuration().getFunction().getStops().getClass());
-        assertEquals(0.5f, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).getBase(), 0.001);
-        assertEquals(1, ((ExponentialStops) layer.getRasterFadeDuration().getFunction().getStops()).size());
-      }
+      // Set and Get
+      layer.setProperties(rasterFadeDuration(0.3f));
+      assertEquals((Float) layer.getRasterFadeDuration().getValue(), (Float) 0.3f);
     });
   }
-
-}
+}
\ No newline at end of file