refactor: collapse polling-impl test setup into HandleResponse helper

Author: beekld

libs/server-sdk/tests/fdv2_polling_impl_test.cpp

@@ -18,63 +18,46 @@ static Logger MakeNullLogger() {
     return Logger{std::make_shared<NullBackend>()};
 }
 
-TEST(HandleFDv2PollResponseTest, NotModifiedSetsFdv1FallbackWhenHeaderPresent) {
+static FDv2SourceResult HandleResponse(
+    unsigned status,
+    std::optional<std::string> body,
+    network::HttpResult::HeadersType headers) {
     auto logger = MakeNullLogger();
     FDv2ProtocolHandler handler;
+    network::HttpResult res{status, std::move(body), std::move(headers)};
+    return HandleFDv2PollResponse(res, &handler, logger, "test");
+}
 
-    network::HttpResult::HeadersType headers{{"X-LD-FD-Fallback", "true"}};
-    network::HttpResult res{304, std::nullopt, std::move(headers)};
-
-    auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
-
+TEST(HandleFDv2PollResponseTest, NotModifiedSetsFdv1FallbackWhenHeaderPresent) {
+    auto result =
+        HandleResponse(304, std::nullopt, {{"X-LD-FD-Fallback", "true"}});
     EXPECT_TRUE(
         std::holds_alternative<FDv2SourceResult::ChangeSet>(result.value));
     EXPECT_TRUE(result.fdv1_fallback);
 }
 
 TEST(HandleFDv2PollResponseTest, FlagIsFalseWhenHeaderAbsent) {
-    auto logger = MakeNullLogger();
-    FDv2ProtocolHandler handler;
-
-    network::HttpResult res{304, std::nullopt, {}};
-
-    auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
-
+    auto result = HandleResponse(304, std::nullopt, {});
     EXPECT_FALSE(result.fdv1_fallback);
 }
 
 TEST(HandleFDv2PollResponseTest, RecoverableErrorPropagatesFlag) {
-    auto logger = MakeNullLogger();
-    FDv2ProtocolHandler handler;
-
-    network::HttpResult::HeadersType headers{{"x-ld-fd-fallback", "true"}};
-    network::HttpResult res{400, std::nullopt, std::move(headers)};
-
-    auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
-
+    auto result =
+        HandleResponse(400, std::nullopt, {{"x-ld-fd-fallback", "true"}});
     EXPECT_TRUE(
         std::holds_alternative<FDv2SourceResult::Interrupted>(result.value));
     EXPECT_TRUE(result.fdv1_fallback);
 }
 
 TEST(HandleFDv2PollResponseTest, TerminalErrorPropagatesFlag) {
-    auto logger = MakeNullLogger();
-    FDv2ProtocolHandler handler;
-
-    network::HttpResult::HeadersType headers{{"X-LD-FD-Fallback", "true"}};
-    network::HttpResult res{401, std::nullopt, std::move(headers)};
-
-    auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
-
+    auto result =
+        HandleResponse(401, std::nullopt, {{"X-LD-FD-Fallback", "true"}});
     EXPECT_TRUE(
         std::holds_alternative<FDv2SourceResult::TerminalError>(result.value));
     EXPECT_TRUE(result.fdv1_fallback);
 }
 
 TEST(HandleFDv2PollResponseTest, OkWithChangeSetBodyPropagatesFlag) {
-    auto logger = MakeNullLogger();
-    FDv2ProtocolHandler handler;
-
     std::string const body =
         R"({"events":[)"
         R"({"event":"server-intent","data":{"payloads":[)"
@@ -86,10 +69,7 @@ TEST(HandleFDv2PollResponseTest, OkWithChangeSetBodyPropagatesFlag) {
         R"({"event":"payload-transferred","data":{"state":"abc","version":1}})"
         R"(]})";
 
-    network::HttpResult::HeadersType headers{{"X-LD-FD-Fallback", "true"}};
-    network::HttpResult res{200, body, std::move(headers)};
-
-    auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
+    auto result = HandleResponse(200, body, {{"X-LD-FD-Fallback", "true"}});
 
     auto* change_set = std::get_if<FDv2SourceResult::ChangeSet>(&result.value);
     ASSERT_NE(change_set, nullptr);
@@ -98,49 +78,29 @@ TEST(HandleFDv2PollResponseTest, OkWithChangeSetBodyPropagatesFlag) {
 }
 
 TEST(HandleFDv2PollResponseTest, OkWithMissingBodyPropagatesFlag) {
-    auto logger = MakeNullLogger();
-    FDv2ProtocolHandler handler;
-
-    network::HttpResult::HeadersType headers{{"X-LD-FD-Fallback", "true"}};
-    network::HttpResult res{200, std::nullopt, std::move(headers)};
-
-    auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
-
+    auto result =
+        HandleResponse(200, std::nullopt, {{"X-LD-FD-Fallback", "true"}});
     EXPECT_TRUE(
         std::holds_alternative<FDv2SourceResult::Interrupted>(result.value));
     EXPECT_TRUE(result.fdv1_fallback);
 }
 
 TEST(HandleFDv2PollResponseTest, HeaderValueIsCaseInsensitive) {
-    auto logger = MakeNullLogger();
-    FDv2ProtocolHandler handler;
-
-    network::HttpResult::HeadersType headers{{"X-LD-FD-Fallback", "TRUE"}};
-    network::HttpResult res{304, std::nullopt, std::move(headers)};
-
-    auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
-
+    auto result =
+        HandleResponse(304, std::nullopt, {{"X-LD-FD-Fallback", "TRUE"}});
     EXPECT_TRUE(result.fdv1_fallback);
 }
 
 TEST(HandleFDv2PollResponseTest, HeaderValueOtherThanTrueDoesNotSetFlag) {
-    auto logger = MakeNullLogger();
-    FDv2ProtocolHandler handler;
-
-    network::HttpResult::HeadersType headers{{"X-LD-FD-Fallback", "false"}};
-    network::HttpResult res{304, std::nullopt, std::move(headers)};
-
-    auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
-
+    auto result =
+        HandleResponse(304, std::nullopt, {{"X-LD-FD-Fallback", "false"}});
     EXPECT_FALSE(result.fdv1_fallback);
 }
 
 TEST(HandleFDv2PollResponseTest, NetworkErrorDoesNotSetFlag) {
     auto logger = MakeNullLogger();
     FDv2ProtocolHandler handler;
-
     network::HttpResult res{std::optional<std::string>{"connection refused"}};
-
     auto result = HandleFDv2PollResponse(res, &handler, logger, "test");
 
     EXPECT_TRUE(