summaryrefslogtreecommitdiff
path: root/test/style/conversion/geojson_options.test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/style/conversion/geojson_options.test.cpp')
-rw-r--r--test/style/conversion/geojson_options.test.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/test/style/conversion/geojson_options.test.cpp b/test/style/conversion/geojson_options.test.cpp
index ddf261ea52..e6bd984f36 100644
--- a/test/style/conversion/geojson_options.test.cpp
+++ b/test/style/conversion/geojson_options.test.cpp
@@ -12,21 +12,24 @@ using namespace mbgl::style::conversion;
TEST(GeoJSONOptions, Basic) {
ValueMap map;
Value raw(map);
- Result<GeoJSONOptions> converted = convert<GeoJSONOptions>(raw);
+ Error error;
+ mbgl::optional<GeoJSONOptions> converted = convert<GeoJSONOptions>(raw, error);
ASSERT_TRUE((bool) converted);
}
TEST(GeoJSONOptions, ErrorHandling) {
ValueMap map {{"maxzoom", std::string{"should not be a string"}}};
Value raw(map);
- Result<GeoJSONOptions> converted = convert<GeoJSONOptions>(raw);
+ Error error;
+ mbgl::optional<GeoJSONOptions> converted = convert<GeoJSONOptions>(raw, error);
ASSERT_FALSE((bool) converted);
}
TEST(GeoJSONOptions, RetainsDefaults) {
ValueMap map;
Value raw(map);
- GeoJSONOptions converted = *convert<GeoJSONOptions>(raw);
+ Error error;
+ GeoJSONOptions converted = *convert<GeoJSONOptions>(raw, error);
GeoJSONOptions defaults;
// GeoJSON-VT
@@ -54,7 +57,8 @@ TEST(GeoJSONOptions, FullConversion) {
{"clusterMaxZoom", 5.0f}
};
Value raw(map);
- GeoJSONOptions converted = *convert<GeoJSONOptions>(raw);
+ Error error;
+ GeoJSONOptions converted = *convert<GeoJSONOptions>(raw, error);
// GeoJSON-VT
ASSERT_EQ(converted.maxzoom, 1);