From 0ca8ea6f169149cd414a65f40d0f7bdd40f3cca3 Mon Sep 17 00:00:00 2001
From: Juha Alanen <juha.alanen@mapbox.com>
Date: Mon, 3 Jun 2019 15:34:13 +0300
Subject: [core] Add number-format expression

---
 .../fixtures/expression_equality/number-format-currency.a.json |  9 +++++++++
 .../fixtures/expression_equality/number-format-currency.b.json |  9 +++++++++
 test/fixtures/expression_equality/number-format-default.a.json |  5 +++++
 test/fixtures/expression_equality/number-format-default.b.json |  5 +++++
 .../expression_equality/number-format-precision.a.json         | 10 ++++++++++
 .../expression_equality/number-format-precision.b.json         | 10 ++++++++++
 test/style/expression/expression.test.cpp                      |  4 +---
 7 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 test/fixtures/expression_equality/number-format-currency.a.json
 create mode 100644 test/fixtures/expression_equality/number-format-currency.b.json
 create mode 100644 test/fixtures/expression_equality/number-format-default.a.json
 create mode 100644 test/fixtures/expression_equality/number-format-default.b.json
 create mode 100644 test/fixtures/expression_equality/number-format-precision.a.json
 create mode 100644 test/fixtures/expression_equality/number-format-precision.b.json

(limited to 'test')

diff --git a/test/fixtures/expression_equality/number-format-currency.a.json b/test/fixtures/expression_equality/number-format-currency.a.json
new file mode 100644
index 0000000000..d22fb5bc4a
--- /dev/null
+++ b/test/fixtures/expression_equality/number-format-currency.a.json
@@ -0,0 +1,9 @@
+[
+  "number-format",
+  123456.789,
+  {
+    "locale": "de-DE",
+    "currency": "EUR"
+  }
+]
+
diff --git a/test/fixtures/expression_equality/number-format-currency.b.json b/test/fixtures/expression_equality/number-format-currency.b.json
new file mode 100644
index 0000000000..c85b457142
--- /dev/null
+++ b/test/fixtures/expression_equality/number-format-currency.b.json
@@ -0,0 +1,9 @@
+[
+  "number-format",
+  123456.789,
+  {
+    "locale": "ja-JP",
+    "currency": "JPY"
+  }
+]
+
diff --git a/test/fixtures/expression_equality/number-format-default.a.json b/test/fixtures/expression_equality/number-format-default.a.json
new file mode 100644
index 0000000000..f41348d8f8
--- /dev/null
+++ b/test/fixtures/expression_equality/number-format-default.a.json
@@ -0,0 +1,5 @@
+[
+  "number-format",
+  123456.789, {}
+]
+
diff --git a/test/fixtures/expression_equality/number-format-default.b.json b/test/fixtures/expression_equality/number-format-default.b.json
new file mode 100644
index 0000000000..8bbc1bcfb5
--- /dev/null
+++ b/test/fixtures/expression_equality/number-format-default.b.json
@@ -0,0 +1,5 @@
+[
+  "number-format",
+  -123456.789, {}
+]
+
diff --git a/test/fixtures/expression_equality/number-format-precision.a.json b/test/fixtures/expression_equality/number-format-precision.a.json
new file mode 100644
index 0000000000..24d56d8d10
--- /dev/null
+++ b/test/fixtures/expression_equality/number-format-precision.a.json
@@ -0,0 +1,10 @@
+[
+  "number-format",
+  987654321.23456789,
+  {
+    "locale": "en-US",
+    "min-fraction-digits": 15,
+    "max-fraction-digits": 20
+  }
+]
+
diff --git a/test/fixtures/expression_equality/number-format-precision.b.json b/test/fixtures/expression_equality/number-format-precision.b.json
new file mode 100644
index 0000000000..d8935f9f5f
--- /dev/null
+++ b/test/fixtures/expression_equality/number-format-precision.b.json
@@ -0,0 +1,10 @@
+[
+  "number-format",
+  987654321.23456789,
+  {
+    "locale": "en-US",
+    "min-fraction-digits": 2,
+    "max-fraction-digits": 4
+  }
+]
+
diff --git a/test/style/expression/expression.test.cpp b/test/style/expression/expression.test.cpp
index 42a8fdd726..8e2acfcd32 100644
--- a/test/style/expression/expression.test.cpp
+++ b/test/style/expression/expression.test.cpp
@@ -36,10 +36,8 @@ TEST(Expression, IsExpression) {
         // TODO:   "feature-state": https://github.com/mapbox/mapbox-gl-native/issues/12613
         // TODO: "interpolate-hcl": https://github.com/mapbox/mapbox-gl-native/issues/8720
         // TODO: "interpolate-lab": https://github.com/mapbox/mapbox-gl-native/issues/8720
-        // TODO: "number-format": https://github.com/mapbox/mapbox-gl-native/issues/13632
         // TODO: "accumulated": https://github.com/mapbox/mapbox-gl-native/issues/14043
-        if (name == "feature-state" || name == "interpolate-hcl" || name == "interpolate-lab" || name == "number-format" ||
-            name == "accumulated") {
+        if (name == "feature-state" || name == "interpolate-hcl" || name == "interpolate-lab" || name == "accumulated") {
             if (expression::isExpression(conversion::Convertible(expression))) {
                 ASSERT_TRUE(false) << "Expression name" << name << "is implemented - please update Expression.IsExpression test.";
             }
-- 
cgit v1.2.1