Update event serialization tests to use FeatureEvent constructor

Author: cwaldren-ld

libs/common/include/events/client_events.hpp

@@ -30,6 +30,8 @@ struct FeatureEventBase {
     Value value;
     std::optional<Reason> reason;
     Value default_;
+
+    explicit FeatureEventBase(FeatureEventParams const& params);
 };
 
 struct FeatureEvent : public FeatureEventBase {

libs/common/src/CMakeLists.txt

@@ -42,10 +42,11 @@ add_library(${LIBNAME}
         events/outbox.cpp
         events/conn_pool.cpp
         events/summarizer.cpp
+        events/client_events.cpp
         config/http_properties.cpp
         config/data_source_builder.cpp
         config/http_properties_builder.cpp)
-        
+
 
 add_library(launchdarkly::common ALIAS ${LIBNAME})
 

libs/common/src/events/asio_event_processor.cpp

@@ -173,21 +173,7 @@ std::vector<OutputEvent> AsioEventProcessor::Process(InputEvent input_event) {
                            return;
                        }
 
-                       // TODO(cwaldren): should also add the reason if the
-                       // variation method was VariationDetail().
-                       std::optional<Reason> reason;
-                       if (event.eval_result.track_reason()) {
-                           reason = event.eval_result.detail().reason();
-                       }
-
-                       client::FeatureEventBase base = {
-                           event.creation_date,
-                           std::move(event.key),
-                           event.eval_result.version(),
-                           event.eval_result.detail().variation_index(),
-                           event.eval_result.detail().value(),
-                           reason,
-                           std::move(event.default_)};
+                       client::FeatureEventBase base{event};
 
                        auto debug_until_date =
                            event.eval_result.debug_events_until_date();

libs/common/src/events/client_events.cpp

@@ -0,0 +1,19 @@
+#include "events/client_events.hpp"
+
+namespace launchdarkly::events::client {
+FeatureEventBase::FeatureEventBase(FeatureEventParams const& params)
+    : creation_date(params.creation_date),
+      key(params.key),
+      version(params.eval_result.version()),
+      variation(params.eval_result.detail().variation_index()),
+      value(params.eval_result.detail().value()),
+      default_(params.default_) {
+
+    // TODO(cwaldren): should also add the reason if the
+    // variation method was VariationDetail().
+    if (params.eval_result.track_reason()) {
+        reason = params.eval_result.detail().reason();
+    }
+}
+
+}  // namespace launchdarkly::events::client

libs/common/tests/event_serialization_test.cpp

@@ -13,61 +13,70 @@ namespace launchdarkly::events {
 
 TEST(EventSerialization, FeatureEvent) {
     auto creation_date = std::chrono::system_clock::from_time_t({});
-    auto e = events::client::FeatureEvent{
-        {creation_date, "key", 17, 2, "value",
-         EvaluationReason("foo", std::nullopt, std::nullopt, std::nullopt,
-                          std::nullopt, false, std::nullopt),
-
-         17},
+    auto event = events::client::FeatureEvent{
+        client::FeatureEventBase(client::FeatureEventParams{
+            creation_date,
+            "key",
+            ContextBuilder().kind("foo", "bar").build(),
+            EvaluationResult(
+                1, std::nullopt, false, false, std::nullopt,
+                EvaluationDetailInternal(
+                    Value(42), 2,
+                    Reason("error", std::nullopt, std::nullopt, std::nullopt,
+                           std::nullopt, false, std::nullopt))),
+            3,
+        }),
         std::map<std::string, std::string>{{"foo", "bar"}}};
 
-    auto event = boost::json::value_from(e);
+    auto event_json = boost::json::value_from(event);
 
     auto result = boost::json::parse(
-        "{\"creationDate\":0,\"key\":\"key\",\"version\":17,\"variation\":2,"
-        "\"value\":\"value\",\"reason\":{\"kind\":\"foo\"},\"default\":1.7E1,"
-        "\"kind\":\"feature\",\"contextKeys\":{\"foo\":\"bar\"}}");
+        R"({"creationDate":0,"key":"key","version":1,"variation":2,"value":4.2E1,"default":3E0,"kind":"feature","contextKeys":{"foo":"bar"}})");
 
-    ASSERT_EQ(result, event);
+    ASSERT_EQ(result, event_json);
 }
 
 TEST(EventSerialization, DebugEvent) {
     auto creation_date = std::chrono::system_clock::from_time_t({});
     AttributeReference::SetType attrs;
     ContextFilter filter(false, attrs);
-    auto e = events::client::DebugEvent{
-        {creation_date, "key", 17, 2, "value",
-         EvaluationReason("foo", std::nullopt, std::nullopt, std::nullopt,
-                          std::nullopt, false, std::nullopt),
-
-         17},
-        filter.filter(ContextBuilder().kind("foo", "bar").build())};
-
-    auto event = boost::json::value_from(e);
+    auto context = ContextBuilder().kind("foo", "bar").build();
+    auto event = events::client::DebugEvent{
+        client::FeatureEventBase(client::FeatureEventParams{
+            creation_date,
+            "key",
+            context,
+            EvaluationResult(
+                1, std::nullopt, false, false, std::nullopt,
+                EvaluationDetailInternal(
+                    Value(42), 2,
+                    Reason("error", std::nullopt, std::nullopt, std::nullopt,
+                           std::nullopt, false, std::nullopt))),
+            3,
+        }),
+        filter.filter(context)};
+
+    auto event_json = boost::json::value_from(event);
 
     auto result = boost::json::parse(
-        "{\"creationDate\":0,\"key\":\"key\",\"version\":17,\"variation\":2,"
-        "\"value\":\"value\",\"reason\":{\"kind\":\"foo\"},\"default\":1.7E1,"
-        "\"kind\":\"debug\",\"context\":{\"key\":\"bar\",\"kind\":\"foo\"}}");
+        R"({"creationDate":0,"key":"key","version":1,"variation":2,"value":4.2E1,"default":3E0,"kind":"debug","context":{"key":"bar","kind":"foo"}})");
 
-    ASSERT_EQ(result, event);
+    ASSERT_EQ(result, event_json);
 }
 
 TEST(EventSerialization, IdentifyEvent) {
     auto creation_date = std::chrono::system_clock::from_time_t({});
     AttributeReference::SetType attrs;
     ContextFilter filter(false, attrs);
-    auto e = events::client::IdentifyEvent{
+    auto event = events::client::IdentifyEvent{
         creation_date,
         filter.filter(ContextBuilder().kind("foo", "bar").build())};
 
-    auto event = boost::json::value_from(e);
+    auto event_json = boost::json::value_from(event);
 
     auto result = boost::json::parse(
-        "{\"kind\":\"identify\",\"creationDate\":0,\"context\":{\"key\":"
-        "\"bar\",\"kind\":\"foo\"}}");
-
-    ASSERT_EQ(result, event);
+        R"({"kind":"identify","creationDate":0,"context":{"key":"bar","kind":"foo"}})");
+    ASSERT_EQ(result, event_json);
 }
 
 }  // namespace launchdarkly::events