diff options
author | Anand Thakker <github@anandthakker.net> | 2018-05-21 14:20:48 -0400 |
---|---|---|
committer | Anand Thakker <github@anandthakker.net> | 2018-05-21 14:27:30 -0400 |
commit | 4704d0389c8e41c9ef821959ad91943c153e04bc (patch) | |
tree | 8b1a7c7e6b095572ce800698ab4044a5bdb77796 /test/style/conversion/property_value.test.cpp | |
parent | ed4538bb30378de9a42647354d3d977465cdc45e (diff) | |
download | qtlocation-mapboxgl-4704d0389c8e41c9ef821959ad91943c153e04bc.tar.gz |
Accept constant expressions in non-dds propertiesupstream/backport-11960
Closes #11940
Diffstat (limited to 'test/style/conversion/property_value.test.cpp')
-rw-r--r-- | test/style/conversion/property_value.test.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/test/style/conversion/property_value.test.cpp b/test/style/conversion/property_value.test.cpp new file mode 100644 index 0000000000..dcb08bcec7 --- /dev/null +++ b/test/style/conversion/property_value.test.cpp @@ -0,0 +1,21 @@ +#include <mbgl/test/util.hpp> + +#include <mbgl/style/conversion/json.hpp> +#include <mbgl/style/conversion/property_value.hpp> +#include <mbgl/util/rapidjson.hpp> + +using namespace mbgl; +using namespace mbgl::style; +using namespace mbgl::style::conversion; + +TEST(StyleConversion, PropertyValue) { + // PropertyValue<T> accepts a constant expression: https://github.com/mapbox/mapbox-gl-native/issues/11940 + Error error; + JSDocument doc; + doc.Parse<0>(R"(["literal", [1, 2]])"); + auto expected = std::array<float, 2>{{1, 2}}; + auto result = convert<PropertyValue<std::array<float, 2>>>(doc, error); + ASSERT_TRUE(result); + ASSERT_TRUE(result->isConstant()); + ASSERT_EQ(result->asConstant(), expected); +} |