dandri/pyxis
1
0
Fork 0
mirror of https://github.com/torlando-tech/pyxis.git synced 2026-08-29 07:08:33 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: serialize map style activation lifecycle

Browse Source
This commit is contained in:
torlando-agent[bot]
2026-08-08 18:10:02 +00:00
parent c1a27fdf08
commit f03e1c5937
6 changed files with 279 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/native/test_map_style_selector.cpp
+116 -3
View File
@@ -47,6 +47,7 @@ void cyclesDeterministicallyAndBoundsPendingIntent() {
CHECK(std::strcmp(request.style_id, "positron") == 0);
CHECK(request.token != 0U);
CHECK(selector.state() == Pyxis::MapStyleSelector::State::APPLYING);
CHECK(selector.activationInFlight());
Pyxis::MapStyleRequest duplicate{};
CHECK(!selector.requestNext(duplicate));
@@ -67,6 +68,8 @@ void cyclesDeterministicallyAndBoundsPendingIntent() {
CHECK(selector.state() == Pyxis::MapStyleSelector::State::ERROR);
CHECK(std::strcmp(selector.activeId(), "dark-matter") == 0);
CHECK(!selector.requestNext(request));
CHECK(selector.releaseActivation(failure.token));
CHECK(selector.requestNext(request));
Pyxis::MapStyleCompletion success{};
success.token = request.token;
@@ -74,6 +77,7 @@ void cyclesDeterministicallyAndBoundsPendingIntent() {
success.success = true;
std::strcpy(success.style_id, request.style_id);
CHECK(selector.complete(success));
CHECK(selector.releaseActivation(success.token));
CHECK(selector.state() == Pyxis::MapStyleSelector::State::READY);
CHECK(std::strcmp(selector.activeId(), "positron") == 0);
CHECK(std::strcmp(selector.activeLabel(), "Positron") == 0);
@@ -91,13 +95,16 @@ void rejectsMalformedCatalogsAndStaleCompletions() {
CHECK(selector.setCatalog(3U, styles, 2U, "osm-bright"));
Pyxis::MapStyleRequest request{};
CHECK(selector.requestNext(request));
CHECK(selector.setCatalog(4U, styles, 2U, "osm-bright"));
CHECK(!selector.setCatalog(4U, styles, 2U, "osm-bright"));
Pyxis::MapStyleCompletion old{};
old.token = request.token;
old.catalog_generation = request.catalog_generation;
old.success = true;
old.catalog_generation = request.catalog_generation + 1U;
old.success = false;
std::strcpy(old.style_id, request.style_id);
CHECK(!selector.complete(old));
old.catalog_generation = request.catalog_generation;
CHECK(selector.complete(old));
CHECK(selector.releaseActivation(old.token));
CHECK(std::strcmp(selector.activeId(), "osm-bright") == 0);
}
@@ -112,6 +119,108 @@ void permitsSoleInstalledStyleWhenNoRecognizedStyleIsActive() {
CHECK(selector.requestNext(request));
CHECK(std::strcmp(request.style_id, "positron") == 0);
}
void activationLeaseSpansCatalogReconciliation() {
Pyxis::MapStyleSelector selector;
const Pyxis::MapStyleSummary styles[] = {
style("osm-bright", "Bright"), style("toner", "Toner")};
CHECK(selector.setCatalog(7U, styles, 2U, "osm-bright"));
Pyxis::MapStyleRequest first{};
CHECK(selector.requestNext(first));
CHECK(selector.activationOwnedBy(first.token));
CHECK(!selector.activationOwnedBy(first.token + 1U));
CHECK(!selector.releaseActivation(first.token + 1U));
Pyxis::MapStyleCompletion success{};
success.token = first.token;
success.catalog_generation = first.catalog_generation;
success.success = true;
std::strcpy(success.style_id, first.style_id);
CHECK(selector.complete(success));
CHECK(!selector.setCatalog(8U, styles, 2U, "toner"));
CHECK(selector.reconcileActivation(first.token, 8U, styles, 2U, "toner", false));
Pyxis::MapStyleRequest second{};
CHECK(!selector.requestNext(second));
CHECK(selector.releaseActivation(first.token));
CHECK(!selector.activationInFlight());
CHECK(selector.requestNext(second));
CHECK(second.catalog_generation == 8U);
CHECK(std::strcmp(second.style_id, "osm-bright") == 0);
}
void cancellationIsScopedToUnborrowedOwner() {
Pyxis::MapStyleSelector selector;
const Pyxis::MapStyleSummary styles[] = {
style("osm-bright", "Bright"), style("toner", "Toner")};
CHECK(selector.setCatalog(12U, styles, 2U, "osm-bright"));
Pyxis::MapStyleRequest request{};
CHECK(selector.requestNext(request));
CHECK(!selector.cancelPending(request.token + 1U));
CHECK(selector.cancelPending(request.token));
CHECK(selector.state() == Pyxis::MapStyleSelector::State::READY);
CHECK(selector.requestNext(request));
CHECK(selector.cancelPending(request.token));
CHECK(selector.requestNext(request));
Pyxis::MapStyleCompletion failure{};
failure.token = request.token;
failure.catalog_generation = request.catalog_generation;
failure.success = false;
std::strcpy(failure.style_id, request.style_id);
CHECK(selector.complete(failure));
CHECK(selector.clearError());
CHECK(selector.state() == Pyxis::MapStyleSelector::State::READY);
CHECK(selector.releaseActivation(request.token));
}
void committedActivationFailureStillReconcilesGeneration() {
Pyxis::MapStyleSelector selector;
const Pyxis::MapStyleSummary styles[] = {
style("osm-bright", "Bright"), style("toner", "Toner")};
CHECK(selector.setCatalog(21U, styles, 2U, "osm-bright"));
Pyxis::MapStyleRequest request{};
CHECK(selector.requestNext(request));
Pyxis::MapStyleCompletion reload_failure{};
reload_failure.token = request.token;
reload_failure.catalog_generation = request.catalog_generation;
reload_failure.success = false;
std::strcpy(reload_failure.style_id, request.style_id);
CHECK(selector.complete(reload_failure));
CHECK(selector.reconcileActivation(request.token, 22U, styles, 2U,
"toner", true));
CHECK(selector.state() == Pyxis::MapStyleSelector::State::ERROR);
CHECK(selector.generation() == 22U);
CHECK(std::strcmp(selector.activeId(), "toner") == 0);
CHECK(selector.releaseActivation(request.token));
Pyxis::MapStyleRequest retry{};
CHECK(selector.requestNext(retry));
CHECK(retry.catalog_generation == 22U);
CHECK(std::strcmp(retry.style_id, "osm-bright") == 0);
}
void hiddenLifecycleCannotReintroduceFailureDuringReconciliation() {
Pyxis::MapStyleSelector selector;
const Pyxis::MapStyleSummary styles[] = {
style("osm-bright", "Bright"), style("toner", "Toner")};
CHECK(selector.setCatalog(30U, styles, 2U, "osm-bright"));
Pyxis::MapStyleRequest request{};
CHECK(selector.requestNext(request));
Pyxis::MapStyleCompletion failure{};
failure.token = request.token;
failure.catalog_generation = request.catalog_generation;
failure.success = false;
std::strcpy(failure.style_id, request.style_id);
CHECK(selector.complete(failure));
CHECK(selector.clearError());
CHECK(selector.reconcileActivation(request.token, 31U, styles, 2U,
"toner", false));
CHECK(selector.state() == Pyxis::MapStyleSelector::State::READY);
CHECK(selector.releaseActivation(request.token));
}
}
int main() {
@@ -119,6 +228,10 @@ int main() {
cyclesDeterministicallyAndBoundsPendingIntent();
rejectsMalformedCatalogsAndStaleCompletions();
permitsSoleInstalledStyleWhenNoRecognizedStyleIsActive();
activationLeaseSpansCatalogReconciliation();
cancellationIsScopedToUnborrowedOwner();
committedActivationFailureStillReconcilesGeneration();
hiddenLifecycleCannotReintroduceFailureDuringReconciliation();
std::cout << "map style selector: " << passed << " passed, " << failed << " failed\n";
return failed == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}