diff options
author | Tobrun <tobrun@mapbox.com> | 2018-03-23 09:54:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-23 09:54:22 -0400 |
commit | c44fe25200a16294e42d73acff6168c8b778eda8 (patch) | |
tree | 4fff16944cdcfdc39d0762ee129050672cb60681 /platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java | |
parent | 9499a2bda7eed68f8a11cdecce0130b1be2054a4 (diff) | |
download | qtlocation-mapboxgl-c44fe25200a16294e42d73acff6168c8b778eda8.tar.gz |
[android] - correctly convert Android int colors with to-color expression (#11506)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java index 535efe5fdd..22c25fd0df 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java @@ -2,8 +2,6 @@ package com.mapbox.mapboxsdk.style.expressions; import android.graphics.Color; -import com.mapbox.mapboxsdk.style.layers.PropertyFactory; - import org.junit.Test; import java.util.Arrays; @@ -113,7 +111,7 @@ public class ExpressionTest { @Test public void testToRgba() throws Exception { - Object[] expected = new Object[] {"to-rgba", PropertyFactory.colorToRgbaString(Color.RED)}; + Object[] expected = new Object[] {"to-rgba", new Object[] {"to-color", "rgba(255, 0, 0, 255)"}}; Object[] actual = toRgba(color(Color.RED)).toArray(); assertTrue("expression should match", Arrays.deepEquals(expected, actual)); } @@ -1087,6 +1085,14 @@ public class ExpressionTest { float[] array = new float[] {0.2f, 0.5f}; Object[] expected = new Object[] {"literal", new Object[] {0.2f, 0.5f}}; Object[] actual = literal(array).toArray(); - assertEquals("primitive array should be convered", expected, actual); + assertEquals("primitive array should be converted", expected, actual); } + + @Test + public void testColorConversion() { + Expression greenColor = color(0xFF00FF00); + Object[] expected = new Object[] {"to-color", "rgba(0, 255, 0, 255)"}; + assertTrue("expression should match", Arrays.deepEquals(expected, greenColor.toArray())); + } + }
\ No newline at end of file |