Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions libs/client-sdk/tests/fdv2_polling_impl_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

static Logger MakeNullLogger() {
struct NullBackend : ILogBackend {
bool Enabled(LogLevel) noexcept override { return false; }

Check warning on line 27 in libs/client-sdk/tests/fdv2_polling_impl_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/client-sdk/tests/fdv2_polling_impl_test.cpp:27:30 [readability-named-parameter]

all parameters should be named in a function
void Write(LogLevel, std::string) noexcept override {}

Check warning on line 28 in libs/client-sdk/tests/fdv2_polling_impl_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/client-sdk/tests/fdv2_polling_impl_test.cpp:28:28 [readability-named-parameter]

all parameters should be named in a function
};
return Logger{std::make_shared<NullBackend>()};
}
Expand Down Expand Up @@ -87,6 +87,28 @@
EXPECT_EQ("http://example.com/sdk/poll/eval?basis=state-3", req.Url());
}

TEST(ClientHandleFDv2PollResponseTest,
SelectorlessFullTransferOmitsBasisOnNextPoll) {
auto result = HandleResponse(
200,
R"({"events":[)"
R"({"event":"server-intent","data":{"payloads":[)"
R"({"id":"","target":0,"intentCode":"xfer-full"}]}},)"
R"({"event":"payload-transferred","data":{"state":"","version":0}})"
R"(]})",
{});
auto* change_set = std::get_if<FDv2SourceResult::ChangeSet>(&result.value);
ASSERT_NE(nullptr, change_set);
EXPECT_EQ(data_model::ChangeSetType::kFull, change_set->change_set.type);
EXPECT_FALSE(change_set->change_set.selector.value.has_value());

auto req = MakeFDv2PollRequest(
MakeConfig("http://example.com", FDv2ContextTransport::kPostBody,
/* with_reasons= */ false),
change_set->change_set.selector);
EXPECT_EQ("http://example.com/sdk/poll/eval", req.Url());
}

TEST(ClientMakeFDv2PollRequestTest, RequestsReasonsWhenConfigured) {
auto req = MakeFDv2PollRequest(
MakeConfig("http://example.com", FDv2ContextTransport::kPostBody, true),
Expand All @@ -100,8 +122,8 @@
MakeConfig("http://example.com", FDv2ContextTransport::kGetPath, false),
data_model::Selector{data_model::Selector::State{3, "state-3"}});

EXPECT_EQ(0u, req.Properties().BaseHeaders().count("if-none-match"));

Check warning on line 125 in libs/client-sdk/tests/fdv2_polling_impl_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/client-sdk/tests/fdv2_polling_impl_test.cpp:125:15 [readability-uppercase-literal-suffix]

integer literal has suffix 'u', which is not uppercase
EXPECT_EQ(0u, req.Properties().BaseHeaders().count("If-None-Match"));

Check warning on line 126 in libs/client-sdk/tests/fdv2_polling_impl_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/client-sdk/tests/fdv2_polling_impl_test.cpp:126:15 [readability-uppercase-literal-suffix]

integer literal has suffix 'u', which is not uppercase
}

TEST(ClientMakeFDv2PollRequestTest, BaseWithTrailingSlashJoinsCleanly) {
Expand Down Expand Up @@ -137,7 +159,7 @@
auto* change_set = std::get_if<FDv2SourceResult::ChangeSet>(&result.value);
ASSERT_NE(nullptr, change_set);
EXPECT_EQ(data_model::ChangeSetType::kFull, change_set->change_set.type);
ASSERT_EQ(1u, change_set->change_set.data.size());

Check warning on line 162 in libs/client-sdk/tests/fdv2_polling_impl_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/client-sdk/tests/fdv2_polling_impl_test.cpp:162:15 [readability-uppercase-literal-suffix]

integer literal has suffix 'u', which is not uppercase
EXPECT_EQ("my-flag", change_set->change_set.data[0].key);
ASSERT_TRUE(change_set->change_set.selector.value.has_value());
EXPECT_EQ("abc", change_set->change_set.selector.value->state);
Expand Down
11 changes: 7 additions & 4 deletions libs/internal/src/fdv2_protocol_handler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,13 @@ FDv2ProtocolHandler::Result FDv2ProtocolHandler::HandlePayloadTransferred(
auto type = (state_ == State::kPartial)
? data_model::ChangeSetType::kPartial
: data_model::ChangeSetType::kFull;
data_model::FDv2ChangeSet changeset{
type, std::move(changes_),
data_model::Selector{data_model::Selector::State{transferred.version,
transferred.state}}};
data_model::Selector selector;
if (!transferred.state.empty()) {
selector.value =
data_model::Selector::State{transferred.version, transferred.state};
}
data_model::FDv2ChangeSet changeset{type, std::move(changes_),
std::move(selector)};
// Transition to kPartial so subsequent put-object/payload-transferred
// cycles work without requiring a new server-intent.
changes_.clear();
Expand Down
22 changes: 22 additions & 0 deletions libs/internal/tests/fdv2_protocol_handler_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
auto* cs = std::get_if<data_model::FDv2ChangeSet>(&result);
ASSERT_NE(cs, nullptr);
EXPECT_EQ(cs->type, data_model::ChangeSetType::kPartial);
ASSERT_EQ(cs->changes.size(), 1u);

Check warning on line 77 in libs/internal/tests/fdv2_protocol_handler_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/internal/tests/fdv2_protocol_handler_test.cpp:77:35 [readability-uppercase-literal-suffix]

integer literal has suffix 'u', which is not uppercase
EXPECT_EQ(cs->changes[0].key, "my-flag");
}

Expand Down Expand Up @@ -114,7 +114,7 @@
auto* cs = std::get_if<data_model::FDv2ChangeSet>(&r3);
ASSERT_NE(cs, nullptr);
EXPECT_EQ(cs->type, data_model::ChangeSetType::kFull);
EXPECT_EQ(cs->changes.size(), 1u);

Check warning on line 117 in libs/internal/tests/fdv2_protocol_handler_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/internal/tests/fdv2_protocol_handler_test.cpp:117:35 [readability-uppercase-literal-suffix]

integer literal has suffix 'u', which is not uppercase
EXPECT_EQ(cs->changes[0].key, "my-flag");
ASSERT_TRUE(cs->selector.value.has_value());
EXPECT_EQ(cs->selector.value->state, "state-abc");
Expand All @@ -138,9 +138,31 @@
auto* cs = std::get_if<data_model::FDv2ChangeSet>(&result);
ASSERT_NE(cs, nullptr);
EXPECT_EQ(cs->type, data_model::ChangeSetType::kFull);
EXPECT_EQ(cs->changes.size(), 3u);

Check warning on line 141 in libs/internal/tests/fdv2_protocol_handler_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/internal/tests/fdv2_protocol_handler_test.cpp:141:35 [readability-uppercase-literal-suffix]

integer literal has suffix 'u', which is not uppercase
}

TEST(FDv2ProtocolHandlerTest, SelectorlessFullTransferHasNoSelector) {

Check warning on line 144 in libs/internal/tests/fdv2_protocol_handler_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/internal/tests/fdv2_protocol_handler_test.cpp:144:1 [readability-function-cognitive-complexity]

function 'TestBody' has cognitive complexity of 33 (threshold 25)
for (bool with_object : {false, true}) {
FDv2ProtocolHandler handler;
auto intent = boost::json::parse(
R"({"payloads":[{"id":"","target":0,"intentCode":"xfer-full"}]})");
auto result = handler.HandleEvent("server-intent", intent);
ASSERT_TRUE(std::holds_alternative<std::monostate>(result));
if (with_object) {
handler.HandleEvent("put-object",
MakePutObject("flag", "my-flag", kFlagJson));
}

result = handler.HandleEvent("payload-transferred",
MakePayloadTransferred("", 0));
auto* cs = std::get_if<data_model::FDv2ChangeSet>(&result);
ASSERT_NE(cs, nullptr);
EXPECT_EQ(cs->type, data_model::ChangeSetType::kFull);
EXPECT_FALSE(cs->selector.value.has_value());
EXPECT_EQ(cs->changes.size(), with_object ? 1u : 0u);

Check warning on line 162 in libs/internal/tests/fdv2_protocol_handler_test.cpp

View workflow job for this annotation

GitHub Actions / cpp-linter

libs/internal/tests/fdv2_protocol_handler_test.cpp:162:53 [readability-uppercase-literal-suffix]

integer literal has suffix 'u', which is not uppercase
}
}

TEST(FDv2ProtocolHandlerTest,
SecondServerIntentMidTransferDiscardsAccumulatedChanges) {
FDv2ProtocolHandler handler;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,8 @@ void FDv2DataSystem::OnFDv1RetryTimer() {

void FDv2DataSystem::ApplyChangeSet(
data_model::ChangeSet<data_interfaces::ChangeSetData> change_set) {
if (change_set.selector.value.has_value()) {
if (change_set.selector.value.has_value() ||
change_set.type != data_model::ChangeSetType::kNone) {
std::lock_guard<std::mutex> lock(mutex_);
selector_ = change_set.selector;
}
Expand Down
35 changes: 35 additions & 0 deletions libs/server-sdk/tests/fdv2_data_system_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,41 @@ TEST(FDv2DataSystemTest, SynchronizerInterrupted_RetriesSameSynchronizer) {
DataSourceStatus::DataSourceState::kValid);
}

TEST(FDv2DataSystemTest, SelectorlessFullClearsHeldSelectorAndNonePreservesIt) {
auto logger = MakeNullLogger();
boost::asio::io_context ioc;
data_components::DataSourceStatusManager status_manager;
std::vector<FDv2SourceResult> results;
results.push_back(
MakeFullChangeSetResult(ChangeSetData{}, MakeSelector(1, "initial")));
results.push_back(FDv2SourceResult{
FDv2SourceResult::ChangeSet{data_model::ChangeSet<ChangeSetData>{
data_model::ChangeSetType::kNone, {}, data_model::Selector{}}}});
results.push_back(
MakeFullChangeSetResult(ChangeSetData{}, data_model::Selector{}));
std::vector<data_model::Selector> next_calls;
std::vector<std::unique_ptr<IFDv2SynchronizerFactory>> synchronizers;
synchronizers.push_back(std::make_unique<OneShotSynchronizerFactory>(
std::make_unique<MockSynchronizer>(
std::move(results), /* closed_flag= */ nullptr, &next_calls)));

FDv2DataSystem ds({}, std::move(synchronizers),
/* fallback_condition_factory= */ nullptr,
/* recovery_condition_factory= */ nullptr,
ioc.get_executor(), &status_manager, logger);
ds.Initialize();
ioc.run();

EXPECT_TRUE(ds.Initialized());
ASSERT_EQ(4u, next_calls.size());
EXPECT_FALSE(next_calls[0].value.has_value());
ASSERT_TRUE(next_calls[1].value.has_value());
EXPECT_EQ("initial", next_calls[1].value->state);
ASSERT_TRUE(next_calls[2].value.has_value());
EXPECT_EQ("initial", next_calls[2].value->state);
EXPECT_FALSE(next_calls[3].value.has_value());
}

TEST(FDv2DataSystemTest, SynchronizerNext_ReceivesUpdatedSelector) {
auto logger = MakeNullLogger();
boost::asio::io_context ioc;
Expand Down
23 changes: 23 additions & 0 deletions libs/server-sdk/tests/fdv2_polling_impl_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,29 @@ TEST(HandleFDv2PollResponseTest, FlagIsFalseWhenHeaderAbsent) {
EXPECT_FALSE(result.fdv1_fallback);
}

TEST(HandleFDv2PollResponseTest, SelectorlessFullTransferOmitsBasisOnNextPoll) {
auto result = HandleResponse(
200,
R"({"events":[)"
R"({"event":"server-intent","data":{"payloads":[)"
R"({"id":"","target":0,"intentCode":"xfer-full"}]}},)"
R"({"event":"payload-transferred","data":{"state":"","version":0}})"
R"(]})",
{});
auto* change_set = std::get_if<FDv2SourceResult::ChangeSet>(&result.value);
ASSERT_NE(nullptr, change_set);
EXPECT_EQ(data_model::ChangeSetType::kFull, change_set->change_set.type);
EXPECT_FALSE(change_set->change_set.selector.value.has_value());

auto logger = MakeNullLogger();
auto props =
config::shared::Defaults<config::shared::ServerSDK>::HttpProperties();
auto req = MakeFDv2PollRequest("http://example.com", props,
change_set->change_set.selector,
std::nullopt, logger);
EXPECT_EQ("http://example.com/sdk/poll", req.Url());
}

TEST(HandleFDv2PollResponseTest, RecoverableErrorPropagatesFlag) {
auto result =
HandleResponse(400, std::nullopt, {{"x-ld-fd-fallback", "true"}});
Expand Down
Loading