summaryrefslogtreecommitdiff
path: root/test/style/style_layer.test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/style/style_layer.test.cpp')
-rw-r--r--test/style/style_layer.test.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/test/style/style_layer.test.cpp b/test/style/style_layer.test.cpp
index 33573636d7..84bad2830b 100644
--- a/test/style/style_layer.test.cpp
+++ b/test/style/style_layer.test.cpp
@@ -1,5 +1,7 @@
#include <mbgl/gl/custom_layer.hpp>
#include <mbgl/gl/custom_layer_impl.hpp>
+#include <mbgl/style/conversion/filter.hpp>
+#include <mbgl/style/conversion/json.hpp>
#include <mbgl/style/expression/dsl.hpp>
#include <mbgl/style/expression/format_expression.hpp>
#include <mbgl/style/expression/image.hpp>
@@ -28,6 +30,7 @@
using namespace mbgl;
using namespace mbgl::style;
+using namespace mbgl::style::conversion;
using namespace expression;
using namespace expression::dsl;
using namespace std::literals::string_literals;
@@ -60,6 +63,11 @@ class MockLayoutProperties : public Properties<TextField> {};
class MockPaintProperties : public Properties<TextColor> {};
using MockOverrides = FormatSectionOverrides<MockPaintProperties::OverridableProperties>;
+mbgl::style::Filter parseFilter(const std::string& expression) {
+ Error error;
+ return *convertJSON<mbgl::style::Filter>(expression, error);
+}
+
} // namespace
TEST(Layer, BackgroundProperties) {
@@ -221,7 +229,7 @@ TEST(Layer, Observer) {
EXPECT_EQ(layer.get(), &layer_);
filterChanged = true;
};
- layer->setFilter(Filter());
+ layer->setFilter(parseFilter(R"(["==", "foo", "bar"])"));
EXPECT_TRUE(filterChanged);
// Notifies observer on visibility change.