summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauren Budorick <lauren@mapbox.com>2018-05-04 16:46:24 -0700
committerLauren Budorick <lauren@mapbox.com>2018-05-04 17:04:33 -0700
commitca478bc6322199f261dcf48368674493b2eb81f1 (patch)
treeb2ac2227b90ca4498438e653fdc783f9df5cee0e
parent7e2697677314deb648f48be1d091a61bc11e731d (diff)
downloadqtlocation-mapboxgl-ca478bc6322199f261dcf48368674493b2eb81f1.tar.gz
Update to ignore feature-state expression in tests
-rw-r--r--platform/node/test/ignores.json5
-rw-r--r--test/style/expression/expression.test.cpp6
2 files changed, 7 insertions, 4 deletions
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
index a1d4d68511..1b87e6e389 100644
--- a/platform/node/test/ignores.json
+++ b/platform/node/test/ignores.json
@@ -106,5 +106,8 @@
"render-tests/combinations/fill-translucent--fill-extrusion-translucent": "needs investigation",
"render-tests/combinations/line-translucent--fill-extrusion-translucent": "needs investigation",
"render-tests/combinations/raster-translucent--fill-extrusion-translucent": "needs investigation",
- "render-tests/combinations/symbol-translucent--fill-extrusion-translucent": "needs investigation"
+ "render-tests/combinations/symbol-translucent--fill-extrusion-translucent": "needs investigation",
+ "render-tests/feature-state/composite-expression": "needs issue",
+ "render-tests/feature-state/data-expression": "needs issue",
+ "render-tests/feature-state/vector-source": "needs issue"
}
diff --git a/test/style/expression/expression.test.cpp b/test/style/expression/expression.test.cpp
index 9d5e172888..709624a50f 100644
--- a/test/style/expression/expression.test.cpp
+++ b/test/style/expression/expression.test.cpp
@@ -24,12 +24,12 @@ TEST(Expression, IsExpression) {
spec["expression_name"].IsObject() &&
spec["expression_name"].HasMember("values") &&
spec["expression_name"]["values"].IsObject());
-
+
const auto& allExpressions = spec["expression_name"]["values"];
-
+
for(auto& entry : allExpressions.GetObject()) {
const std::string name { entry.name.GetString(), entry.name.GetStringLength() };
- if (name == "collator" || name == "line-progress" || name == "resolved-locale") {
+ if (name == "collator" || name == "line-progress" || name == "resolved-locale" || name == "feature-state") {
// Not yet implemented
continue;
}