summaryrefslogtreecommitdiff
path: root/test/style/conversion
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-11-25 16:19:07 +0100
committerKonstantin Käfer <mail@kkaefer.com>2016-11-28 18:02:00 +0100
commit4fe071b518e792fdf069eb81ac326cf0f27f5e73 (patch)
tree692a820f2f93efa60f3cec07e2c2af35845fd6bc /test/style/conversion
parent11281d15e9c36b82dda3361c518161fb11c13ef9 (diff)
downloadqtlocation-mapboxgl-4fe071b518e792fdf069eb81ac326cf0f27f5e73.tar.gz
[build] upgrade to variant 1.1.4 and dependencies
Diffstat (limited to 'test/style/conversion')
-rw-r--r--test/style/conversion/geojson_options.test.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/style/conversion/geojson_options.test.cpp b/test/style/conversion/geojson_options.test.cpp
index dc9be237a8..14a7adbba7 100644
--- a/test/style/conversion/geojson_options.test.cpp
+++ b/test/style/conversion/geojson_options.test.cpp
@@ -17,7 +17,7 @@ TEST(GeoJSONOptions, Basic) {
}
TEST(GeoJSONOptions, ErrorHandling) {
- ValueMap map {{"maxzoom", "should not be a string"}};
+ ValueMap map {{"maxzoom", std::string{"should not be a string"}}};
Value raw(map);
Result<GeoJSONOptions> converted = convert<GeoJSONOptions>(raw);
ASSERT_FALSE((bool) converted);
@@ -44,14 +44,14 @@ TEST(GeoJSONOptions, RetainsDefaults) {
TEST(GeoJSONOptions, FullConversion) {
ValueMap map {
//GeoJSON-VT
- {"maxzoom", 1},
- {"buffer", 2},
- {"tolerance", 3},
+ {"maxzoom", 1.0f},
+ {"buffer", 2.0f},
+ {"tolerance", 3.0f},
//Supercluster
{"cluster", true},
- {"clusterRadius", 4},
- {"clusterMaxZoom", 5}
+ {"clusterRadius", 4.0f},
+ {"clusterMaxZoom", 5.0f}
};
Value raw(map);
GeoJSONOptions converted = *convert<GeoJSONOptions>(raw);