1 files changed, 14 insertions, 51 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
index dc6a181633..04c3515fd1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
@@ -162,48 +162,29 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
     Timber.i("<%- property.name %>");
     invoke(mapboxMap, (uiController, mapboxMap) -> {
       assertNotNull(layer);
-      assertNull((<%- propertyType(property) %>) layer.get<%- camelize(property.name) %>().getValue());
+      assertNull(layer.get<%- camelize(property.name) %>().getValue());
 
       // Set and Get
-      layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>));
-      assertEquals((<%- propertyType(property) %>) layer.get<%- camelize(property.name) %>().getValue(), (<%- propertyType(property) %>) <%- defaultValueJava(property) %>);
+      <%- propertyType(property) %> propertyValue = <%- defaultValueJava(property) %>;
+<% if (property.type === 'formatted') { -%>
+
+      layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>("default"));
+      assertEquals(layer.get<%- camelize(property.name) %>().getValue(), propertyValue);
+<% } else {-%>
+      layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(propertyValue));
+      assertEquals(layer.get<%- camelize(property.name) %>().getValue(), propertyValue);
+<% } -%>
 <% if (property.tokens) { -%>
 
       layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>("{token}"));
 <% if (property.type === 'formatted') { -%>
-      assertEquals(layer.getTextField().getExpression(), Expression.format(Expression.formatEntry(Expression.toString(Expression.get("token")))));
+      assertEquals(layer.get<%- camelize(property.name) %>().getExpression(), <%- defaultExpressionJava(property) %>(Expression.formatEntry(Expression.toString(Expression.get("token")))));
 <% } else {-%>
       assertEquals(layer.get<%- camelize(property.name) %>().getExpression(), Expression.toString(Expression.get("token")));
 <% } -%>
 <% } -%>
     });
   }
-<% if (property.name === 'text-field' && property.type === 'formatted') { -%>
-
-  @Test
-  public void testFormatted<%- camelize(property.name) %>AsConstant() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("<%- property.name %>-formatted");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull((<%- propertyType(property) %>) layer.get<%- camelize(property.name) %>().getValue());
-
-      Formatted expected = new Formatted(new FormattedSection[] {
-        new FormattedSection("", 1.0)
-      });
-
-      // Set and Get
-      layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(<%- defaultValueJava(property) %>));
-      assertEquals(layer.getFormatted<%- camelize(property.name) %>().getValue(), expected/*(<%- propertyType(property) %>) <%- defaultValueJava(property) %>*/);
-<% if (property.tokens) { -%>
-
-      layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>("{token}"));
-      assertEquals(layer.getFormattedTextField().getExpression(), Expression.format(Expression.formatEntry(Expression.toString(Expression.get("token")))));
-<% } -%>
-    });
-  }
-<% } -%>
 <% if (property['property-type'] === 'data-driven' || property['property-type'] === 'cross-faded-data-driven') { -%>
 <% if (!(property.name.endsWith("-font")||property.name.endsWith("-offset"))) { -%>
 
@@ -217,35 +198,17 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
       assertNull(layer.get<%- camelize(property.name) %>().getExpression());
 
       // Set and Get
-      Expression expression = <%- defaultExpressionJava(property) %>(Expression.get("undefined"));
-      layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(expression));
 <% if (property.type === 'formatted') { -%>
-      assertEquals(layer.getTextField().getExpression(), Expression.format(Expression.formatEntry(expression)));
+      Expression expression = <%- defaultExpressionJava(property) %>(Expression.formatEntry(Expression.get("undefined"), FormatOption.formatFontScale(2.0), FormatOption.formatTextFont(new String[]{"Open Sans Regular", "Arial Unicode MS Regular"})));
 <% } else { -%>
-      assertEquals(layer.get<%- camelize(property.name) %>().getExpression(), expression);
-<% } -%>
-    });
-  }
-<% if (property.name === 'text-field' && property.type === 'formatted') { -%>
-
-  @Test
-  public void testFormatted<%- camelize(property.name) %>AsExpression() {
-    validateTestSetup();
-    setupLayer();
-    Timber.i("<%- property.name %>-formatted-expression");
-    invoke(mapboxMap, (uiController, mapboxMap) -> {
-      assertNotNull(layer);
-      assertNull(layer.get<%- camelize(property.name) %>().getExpression());
-
-      // Set and Get
       Expression expression = <%- defaultExpressionJava(property) %>(Expression.get("undefined"));
+<% } -%>
       layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(expression));
-      assertEquals(layer.getFormattedTextField().getExpression(), Expression.format(Expression.formatEntry(Expression.string(Expression.get("undefined")))));
+      assertEquals(layer.get<%- camelize(property.name) %>().getExpression(), expression);
     });
   }
 <% } -%>
 <% } -%>
-<% } -%>
 <% if (property.type == 'color') { -%>
 
   @Test