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

3 files changed, 35 insertions, 27 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}");
 }
diff --git a/test/style/paint_property.test.cpp b/test/style/properties.test.cpp
index fcca05f3bd..279fadb8c2 100644
--- a/test/style/paint_property.test.cpp
+++ b/test/style/properties.test.cpp
@@ -1,13 +1,14 @@
 #include <mbgl/test/util.hpp>
 
-#include <mbgl/style/paint_property.hpp>
-#include <mbgl/renderer/transitioning_property.hpp>
+#include <mbgl/style/properties.hpp>
+#include <mbgl/renderer/property_evaluator.hpp>
+#include <mbgl/renderer/data_driven_property_evaluator.hpp>
 
 using namespace mbgl;
 using namespace mbgl::style;
 using namespace std::literals::chrono_literals;
 
-float evaluate(TransitioningProperty<PropertyValue<float>>& property, Duration delta = Duration::zero()) {
+float evaluate(Transitioning<PropertyValue<float>>& property, Duration delta = Duration::zero()) {
     ZoomHistory zoomHistory;
     zoomHistory.update(0, TimePoint::min() + delta);
 
@@ -25,7 +26,7 @@ float evaluate(TransitioningProperty<PropertyValue<float>>& property, Duration d
     return property.evaluate(evaluator, parameters.now);
 }
 
-PossiblyEvaluatedPropertyValue<float> evaluate(TransitioningProperty<DataDrivenPropertyValue<float>>& property, Duration delta = Duration::zero()) {
+PossiblyEvaluatedPropertyValue<float> evaluate(Transitioning<DataDrivenPropertyValue<float>>& property, Duration delta = Duration::zero()) {
     ZoomHistory zoomHistory;
     zoomHistory.update(0, TimePoint::min() + delta);
 
@@ -43,15 +44,15 @@ PossiblyEvaluatedPropertyValue<float> evaluate(TransitioningProperty<DataDrivenP
     return property.evaluate(evaluator, parameters.now);
 }
 
-TEST(TransitioningProperty, EvaluateDefaultValue) {
-    TransitioningProperty<PropertyValue<float>> property;
+TEST(TransitioningPropertyValue, EvaluateDefaultValue) {
+    Transitioning<PropertyValue<float>> property;
     ASSERT_EQ(0.0f, evaluate(property));
 }
 
-TEST(TransitioningProperty, EvaluateUntransitionedConstant) {
-    TransitioningProperty<PropertyValue<float>> property {
+TEST(TransitioningPropertyValue, EvaluateUntransitionedConstant) {
+    Transitioning<PropertyValue<float>> property {
         PropertyValue<float>(1.0f),
-        TransitioningProperty<PropertyValue<float>>(),
+        Transitioning<PropertyValue<float>>(),
         TransitionOptions(),
         TimePoint::min()
     };
@@ -59,18 +60,18 @@ TEST(TransitioningProperty, EvaluateUntransitionedConstant) {
     ASSERT_EQ(1.0f, evaluate(property));
 }
 
-TEST(TransitioningProperty, EvaluateTransitionedConstantWithoutDelay) {
+TEST(TransitioningPropertyValue, EvaluateTransitionedConstantWithoutDelay) {
     TransitionOptions transition;
     transition.duration = { 1000ms };
 
-    TransitioningProperty<PropertyValue<float>> t0 {
+    Transitioning<PropertyValue<float>> t0 {
         PropertyValue<float>(0.0f),
-        TransitioningProperty<PropertyValue<float>>(),
+        Transitioning<PropertyValue<float>>(),
         TransitionOptions(),
         TimePoint::min()
     };
 
-    TransitioningProperty<PropertyValue<float>> t1 {
+    Transitioning<PropertyValue<float>> t1 {
         PropertyValue<float>(1.0f),
         t0,
         transition,
@@ -82,19 +83,19 @@ TEST(TransitioningProperty, EvaluateTransitionedConstantWithoutDelay) {
     ASSERT_FLOAT_EQ(1.0f, evaluate(t1, 1500ms));
 }
 
-TEST(TransitioningProperty, EvaluateTransitionedConstantWithDelay) {
+TEST(TransitioningPropertyValue, EvaluateTransitionedConstantWithDelay) {
     TransitionOptions transition;
     transition.delay = { 1000ms };
     transition.duration = { 1000ms };
 
-    TransitioningProperty<PropertyValue<float>> t0 {
+    Transitioning<PropertyValue<float>> t0 {
         PropertyValue<float>(0.0f),
-        TransitioningProperty<PropertyValue<float>>(),
+        Transitioning<PropertyValue<float>>(),
         TransitionOptions(),
         TimePoint::min()
     };
 
-    TransitioningProperty<PropertyValue<float>> t1 {
+    Transitioning<PropertyValue<float>> t1 {
         PropertyValue<float>(1.0f),
         t0,
         transition,
@@ -108,14 +109,14 @@ TEST(TransitioningProperty, EvaluateTransitionedConstantWithDelay) {
     ASSERT_FLOAT_EQ(1.0f, evaluate(t1, 2500ms));
 }
 
-TEST(TransitioningProperty, EvaluateDataDrivenValue) {
+TEST(TransitioningDataDrivenPropertyValue, Evaluate) {
     TransitionOptions transition;
     transition.delay = { 1000ms };
     transition.duration = { 1000ms };
     
-    TransitioningProperty<DataDrivenPropertyValue<float>> t0 {
+    Transitioning<DataDrivenPropertyValue<float>> t0 {
         DataDrivenPropertyValue<float>(0.0f),
-        TransitioningProperty<DataDrivenPropertyValue<float>>(),
+        Transitioning<DataDrivenPropertyValue<float>>(),
         TransitionOptions(),
         TimePoint::min()
     };
@@ -125,7 +126,7 @@ TEST(TransitioningProperty, EvaluateDataDrivenValue) {
         IdentityStops<float>()
     };
     
-    TransitioningProperty<DataDrivenPropertyValue<float>> t1 {
+    Transitioning<DataDrivenPropertyValue<float>> t1 {
         DataDrivenPropertyValue<float>(sourceFunction),
         t0,
         transition,
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index 2eafa4699e..03896199f4 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -68,7 +68,7 @@ TEST(VectorTile, Issue7615) {
         style::SymbolLayoutProperties::PossiblyEvaluated(),
         std::map<
             std::string,
-            std::pair<style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>>(),
+            std::pair<style::IconPaintProperties::PossiblyEvaluated, style::TextPaintProperties::PossiblyEvaluated>>(),
         16.0f, 1.0f, 0.0f, false, false);
     
     // Simulate placement of a symbol layer.