[android] Generate style code for symbol-sort-key

1 files changed, 27 insertions, 1 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
index ae2c6d98f6..4674c9ffb1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
@@ -142,13 +142,39 @@ public class SymbolLayerTest extends BaseLayerTest {
 
   @Test
   @UiThreadTest
+  public void testSymbolSortKeyAsConstant() {
+    Timber.i("symbol-sort-key");
+    assertNotNull(layer);
+    assertNull(layer.getSymbolSortKey().getValue());
+
+    // Set and Get
+    Float propertyValue = 0.3f;
+    layer.setProperties(symbolSortKey(propertyValue));
+    assertEquals(layer.getSymbolSortKey().getValue(), propertyValue);
+  }
+
+  @Test
+  @UiThreadTest
+  public void testSymbolSortKeyAsExpression() {
+    Timber.i("symbol-sort-key-expression");
+    assertNotNull(layer);
+    assertNull(layer.getSymbolSortKey().getExpression());
+
+    // Set and Get
+    Expression expression = number(Expression.get("undefined"));
+    layer.setProperties(symbolSortKey(expression));
+    assertEquals(layer.getSymbolSortKey().getExpression(), expression);
+  }
+
+  @Test
+  @UiThreadTest
   public void testSymbolZOrderAsConstant() {
     Timber.i("symbol-z-order");
     assertNotNull(layer);
     assertNull(layer.getSymbolZOrder().getValue());
 
     // Set and Get
-    String propertyValue = SYMBOL_Z_ORDER_VIEWPORT_Y;
+    String propertyValue = SYMBOL_Z_ORDER_AUTO;
     layer.setProperties(symbolZOrder(propertyValue));
     assertEquals(layer.getSymbolZOrder().getValue(), propertyValue);
   }