From 5b65b31d4540f022a58c1788280c94fb0b23fd89 Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Mon, 1 Aug 2016 18:50:42 -0400 Subject: [PATCH] [android] #5610 - fix Color tests --- .../mapboxsdk/style/BackgroundLayerTest.java | 4 ++-- .../mapbox/mapboxsdk/style/CircleLayerTest.java | 4 ++-- .../mapbox/mapboxsdk/style/FillLayerTest.java | 8 ++++---- .../mapbox/mapboxsdk/style/LineLayerTest.java | 4 ++-- .../mapbox/mapboxsdk/style/SymbolLayerTest.java | 16 ++++++++-------- platform/android/scripts/generate-style-code.js | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/BackgroundLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/BackgroundLayerTest.java index 7bc0cf83f86..0cb8a031d8a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/BackgroundLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/BackgroundLayerTest.java @@ -76,8 +76,8 @@ public void testBackgroundColor() { assertNotNull(layer); //Set and Get - layer.set(backgroundColor("#000000")); - assertEquals((String) layer.getBackgroundColor().getValue(), (String) "#000000"); + layer.set(backgroundColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getBackgroundColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CircleLayerTest.java index 72847de66c2..b1ed93e7e1b 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CircleLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/CircleLayerTest.java @@ -110,8 +110,8 @@ public void testCircleColor() { assertNotNull(layer); //Set and Get - layer.set(circleColor("#000000")); - assertEquals((String) layer.getCircleColor().getValue(), (String) "#000000"); + layer.set(circleColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getCircleColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/FillLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/FillLayerTest.java index a729eb6d5ee..9702cb3d16e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/FillLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/FillLayerTest.java @@ -132,8 +132,8 @@ public void testFillColor() { assertNotNull(layer); //Set and Get - layer.set(fillColor("#000000")); - assertEquals((String) layer.getFillColor().getValue(), (String) "#000000"); + layer.set(fillColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getFillColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test @@ -154,8 +154,8 @@ public void testFillOutlineColor() { assertNotNull(layer); //Set and Get - layer.set(fillOutlineColor("undefined")); - assertEquals((String) layer.getFillOutlineColor().getValue(), (String) "undefined"); + layer.set(fillOutlineColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getFillOutlineColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/LineLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/LineLayerTest.java index 1abcee07721..6a8f31f0bc8 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/LineLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/LineLayerTest.java @@ -198,8 +198,8 @@ public void testLineColor() { assertNotNull(layer); //Set and Get - layer.set(lineColor("#000000")); - assertEquals((String) layer.getLineColor().getValue(), (String) "#000000"); + layer.set(lineColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getLineColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/SymbolLayerTest.java index f922ab9f200..b7ba2314ffa 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/SymbolLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/style/SymbolLayerTest.java @@ -858,8 +858,8 @@ public void testIconColor() { assertNotNull(layer); //Set and Get - layer.set(iconColor("#000000")); - assertEquals((String) layer.getIconColor().getValue(), (String) "#000000"); + layer.set(iconColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getIconColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test @@ -880,8 +880,8 @@ public void testIconHaloColor() { assertNotNull(layer); //Set and Get - layer.set(iconHaloColor("rgba(0, 0, 0, 0)")); - assertEquals((String) layer.getIconHaloColor().getValue(), (String) "rgba(0, 0, 0, 0)"); + layer.set(iconHaloColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getIconHaloColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test @@ -1012,8 +1012,8 @@ public void testTextColor() { assertNotNull(layer); //Set and Get - layer.set(textColor("#000000")); - assertEquals((String) layer.getTextColor().getValue(), (String) "#000000"); + layer.set(textColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getTextColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test @@ -1034,8 +1034,8 @@ public void testTextHaloColor() { assertNotNull(layer); //Set and Get - layer.set(textHaloColor("rgba(0, 0, 0, 0)")); - assertEquals((String) layer.getTextHaloColor().getValue(), (String) "rgba(0, 0, 0, 0)"); + layer.set(textHaloColor("rgba(0, 0, 0, 1);")); + assertEquals((String) layer.getTextHaloColor().getValue(), (String) "rgba(0, 0, 0, 1);"); } @Test diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index 03161064523..26b46465d97 100644 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -118,7 +118,7 @@ global.defaultValueJava = function(property) { case 'enum': return snakeCaseUpper(property.name) + "_" + snakeCaseUpper(property.values[0]); case 'color': - return '"' + property['default'] + '"'; + return '"rgba(0, 0, 0, 1);"'; case 'array': switch (property.value) { case 'string':