From 939526bac4aff734be4e6382b64c43214eb0bc9b Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun@mapbox.com>
Date: Fri, 31 Mar 2017 17:51:26 +0200
Subject: [android] - transition options for layer properties (#8509)

[android] fixup highlevel bindings for transition options

finish integration
---
 .../mapboxsdk/testapp/style/FillLayerTest.java     | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)

(limited to 'platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java')

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 a1d362f0f9..63dac76edd 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
@@ -36,6 +36,8 @@ import static org.junit.Assert.*;
 import static com.mapbox.mapboxsdk.style.layers.Property.*;
 import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*;
 
+import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
+
 /**
  * Basic smoke tests for FillLayer
  */
@@ -81,6 +83,7 @@ public class FillLayerTest extends BaseStyleTest {
     assertEquals(layer.getVisibility().getValue(), NONE);
   }
 
+
   @Test
   public void testFillAntialiasAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
@@ -117,6 +120,18 @@ public class FillLayerTest extends BaseStyleTest {
     assertEquals(1, ((IntervalStops) layer.getFillAntialias().getFunction().getStops()).size());
   }
 
+  @Test
+  public void testFillOpacityTransition() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("fill-opacityTransitionOptions");
+    assertNotNull(layer);
+
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setFillOpacityTransition(options);
+    assertEquals(layer.getFillOpacityTransition(), options);
+  }
+
   @Test
   public void testFillOpacityAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
@@ -262,6 +277,18 @@ public class FillLayerTest extends BaseStyleTest {
     assertEquals(0.9f, stop.out, 0.001f);
   }
 
+  @Test
+  public void testFillColorTransition() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("fill-colorTransitionOptions");
+    assertNotNull(layer);
+
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setFillColorTransition(options);
+    assertEquals(layer.getFillColorTransition(), options);
+  }
+
   @Test
   public void testFillColorAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
@@ -384,6 +411,18 @@ public class FillLayerTest extends BaseStyleTest {
     assertEquals(layer.getFillColorAsInt(), Color.RED);
   }
 
+  @Test
+  public void testFillOutlineColorTransition() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("fill-outline-colorTransitionOptions");
+    assertNotNull(layer);
+
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setFillOutlineColorTransition(options);
+    assertEquals(layer.getFillOutlineColorTransition(), options);
+  }
+
   @Test
   public void testFillOutlineColorAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
@@ -506,6 +545,18 @@ public class FillLayerTest extends BaseStyleTest {
     assertEquals(layer.getFillOutlineColorAsInt(), Color.RED);
   }
 
+  @Test
+  public void testFillTranslateTransition() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("fill-translateTransitionOptions");
+    assertNotNull(layer);
+
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setFillTranslateTransition(options);
+    assertEquals(layer.getFillTranslateTransition(), options);
+  }
+
   @Test
   public void testFillTranslateAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
@@ -543,6 +594,7 @@ public class FillLayerTest extends BaseStyleTest {
     assertEquals(1, ((ExponentialStops) layer.getFillTranslate().getFunction().getStops()).size());
   }
 
+
   @Test
   public void testFillTranslateAnchorAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
@@ -579,6 +631,18 @@ public class FillLayerTest extends BaseStyleTest {
     assertEquals(1, ((IntervalStops) layer.getFillTranslateAnchor().getFunction().getStops()).size());
   }
 
+  @Test
+  public void testFillPatternTransition() {
+    checkViewIsDisplayed(R.id.mapView);
+    Timber.i("fill-patternTransitionOptions");
+    assertNotNull(layer);
+
+    // Set and Get
+    TransitionOptions options = new TransitionOptions(300, 100);
+    layer.setFillPatternTransition(options);
+    assertEquals(layer.getFillPatternTransition(), options);
+  }
+
   @Test
   public void testFillPatternAsConstant() {
     checkViewIsDisplayed(R.id.mapView);
-- 
cgit v1.2.1