diff options
| author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-22 16:56:32 +0200 |
|---|---|---|
| committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-22 16:56:32 +0200 |
| commit | 797f622a26b34db5a30e7f1728d87c6700a2ec1e (patch) | |
| tree | 75ea93979db2baf3eb2234c6fbb3d1a9c5b70329 /test/style/expression/expression.test.cpp | |
| parent | 86fc3f525e42d042f239876b93525ff411ad7182 (diff) | |
| parent | 520df7f02049cdbbb9e68041e755d6c3a8d5b21f (diff) | |
| download | qtlocation-mapboxgl-797f622a26b34db5a30e7f1728d87c6700a2ec1e.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into bwg-vs2017
Diffstat (limited to 'test/style/expression/expression.test.cpp')
| -rw-r--r-- | test/style/expression/expression.test.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/style/expression/expression.test.cpp b/test/style/expression/expression.test.cpp index 0b46facf42..4c2ec5cf92 100644 --- a/test/style/expression/expression.test.cpp +++ b/test/style/expression/expression.test.cpp @@ -1,6 +1,6 @@ #include <mbgl/test/util.hpp> #include <mbgl/util/io.hpp> -#include <mbgl/style/conversion.hpp> +#include <mbgl/style/conversion_impl.hpp> #include <mbgl/util/rapidjson.hpp> #include <mbgl/style/rapidjson_conversion.hpp> #include <mbgl/style/expression/is_expression.hpp> @@ -29,7 +29,11 @@ TEST(Expression, IsExpression) { for(auto& entry : allExpressions.GetObject()) { const std::string name { entry.name.GetString(), entry.name.GetStringLength() }; - if (name == "line-progress" || name == "feature-state") { + if (name == "line-progress" || + name == "feature-state" || + name == "interpolate-hcl" || + name == "interpolate-lab" || + name == "format") { // Not yet implemented continue; } |