1 files changed, 16 insertions, 14 deletions

diff --git a/test/style/conversion/function.test.cpp b/test/style/conversion/function.test.cpp
index 4dc6549c78..08637d40cb 100644
--- a/test/style/conversion/function.test.cpp
+++ b/test/style/conversion/function.test.cpp
@@ -10,45 +10,47 @@ using namespace mbgl;
 using namespace mbgl::style;
 using namespace mbgl::style::conversion;
 
-auto parseFunction(const std::string& src) {
-    JSDocument doc;
-    doc.Parse<0>(src);
-    return convert<CameraFunction<float>, JSValue>(doc);
-}
-
 TEST(StyleConversion, Function) {
+    Error error;
+
+    auto parseFunction = [&](const std::string& src) {
+        JSDocument doc;
+        doc.Parse<0>(src);
+        return convert<CameraFunction<float>, JSValue>(doc, error);
+    };
+
     auto fn1 = parseFunction("{\"stops\":[]}");
     ASSERT_FALSE(fn1);
-    ASSERT_EQ("function must have at least one stop", fn1.error().message);
+    ASSERT_EQ("function must have at least one stop", error.message);
 
     auto fn2 = parseFunction("{\"stops\":[1]}");
     ASSERT_FALSE(fn2);
-    ASSERT_EQ("function stop must be an array", fn2.error().message);
+    ASSERT_EQ("function stop must be an array", error.message);
 
     auto fn3 = parseFunction("{\"stops\":[[]]}");
     ASSERT_FALSE(fn3);
-    ASSERT_EQ("function stop must have two elements", fn3.error().message);
+    ASSERT_EQ("function stop must have two elements", error.message);
 
     auto fn4 = parseFunction("{\"stops\":[[-1,-1]]}");
     ASSERT_TRUE(bool(fn4));
 
     auto fn5 = parseFunction("{\"stops\":[[0,1,2]]}");
     ASSERT_FALSE(fn5);
-    ASSERT_EQ("function stop must have two elements", fn5.error().message);
+    ASSERT_EQ("function stop must have two elements", error.message);
 
     auto fn6 = parseFunction("{\"stops\":[[0,\"x\"]]}");
     ASSERT_FALSE(fn6);
-    ASSERT_EQ("value must be a number", fn6.error().message);
+    ASSERT_EQ("value must be a number", error.message);
 
     auto fn7 = parseFunction("{}");
     ASSERT_FALSE(fn7);
-    ASSERT_EQ("function value must specify stops", fn7.error().message);
+    ASSERT_EQ("function value must specify stops", error.message);
 
     auto fn8 = parseFunction("[]");
     ASSERT_FALSE(fn8);
-    ASSERT_EQ("function must be an object", fn8.error().message);
+    ASSERT_EQ("function must be an object", error.message);
 
     auto fn9 = parseFunction("{\"stops\":[[0,0]],\"base\":false}");
     ASSERT_FALSE(fn9);
-    ASSERT_EQ("function base must be a number", fn9.error().message);
+    ASSERT_EQ("function base must be a number", error.message);
 }