[core] Unify {Paint,Layout,Light}Properties

1 files changed, 12 insertions, 5 deletions

diff --git a/test/style/conversion/stringify.test.cpp b/test/style/conversion/stringify.test.cpp
index 1dae20b26b..0b2940a0e0 100644
--- a/test/style/conversion/stringify.test.cpp
+++ b/test/style/conversion/stringify.test.cpp
@@ -121,10 +121,17 @@ TEST(Stringify, PropertyValue) {
 }
 
 TEST(Stringify, Layout) {
-    ASSERT_EQ(stringify(SymbolLayoutProperties()), "{}");
-
-    SymbolLayoutProperties layout;
-    layout.unevaluated.get<SymbolAvoidEdges>() = true;
-    layout.unevaluated.get<IconPadding>() = 2.0;
+    auto stringify = [] (const SymbolLayoutProperties::Unevaluated& layout) {
+        rapidjson::StringBuffer s;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(s);
+        layout.stringify(writer);
+        return std::string(s.GetString());
+    };
+
+    ASSERT_EQ(stringify(SymbolLayoutProperties::Unevaluated()), "{}");
+
+    SymbolLayoutProperties::Unevaluated layout;
+    layout.get<SymbolAvoidEdges>() = true;
+    layout.get<IconPadding>() = 2.0;
     ASSERT_EQ(stringify(layout), "{\"symbol-avoid-edges\":true,\"icon-padding\":2.0}");
 }