From a4e2c1af1fd83b22ef4ee57ab19a15616224f8b8 Mon Sep 17 00:00:00 2001
From: Lucas Wojciechowski <hello@lucaswoj.com>
Date: Thu, 10 May 2018 12:37:14 -0700
Subject: [core] Convert "legacy" filters directly into expressions  (#11610)

Ports the specialized filter-* expressions from GL JS, adding them to src/mbgl/style/expression/compound_expression.cpp
---
 test/style/conversion/stringify.test.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'test/style/conversion/stringify.test.cpp')

diff --git a/test/style/conversion/stringify.test.cpp b/test/style/conversion/stringify.test.cpp
index 136f276aaf..c3faf1f838 100644
--- a/test/style/conversion/stringify.test.cpp
+++ b/test/style/conversion/stringify.test.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/test/util.hpp>
 
+#include <mbgl/style/expression/literal.hpp>
 #include <mbgl/style/conversion/stringify.hpp>
 #include <mbgl/style/types.hpp>
 #include <mbgl/style/layers/symbol_layer_properties.hpp>
@@ -75,8 +76,12 @@ TEST(Stringify, Value) {
 }
 
 TEST(Stringify, Filter) {
-    ASSERT_EQ(stringify(NullFilter()), "null");
-    ASSERT_EQ(stringify(EqualsFilter { "a", 1.0 }), "[\"==\",\"a\",1.0]");
+    using namespace mbgl::style::expression;
+    
+    ASSERT_EQ(stringify(Filter()), "null");
+    
+    ParsingContext context;
+    ASSERT_EQ(stringify(Filter(createCompoundExpression("filter-==", createLiteral("a"), createLiteral(1.0), context))), "[\"filter-==\",\"a\",1.0]");
 }
 
 TEST(Stringify, CameraFunction) {
-- 
cgit v1.2.1