Bind confirmed bank and ticket actions to real careers (by Codex)

This commit is contained in:
Codex committed 2026-10-28 11:04:11 +01:00
1 parent f75e0f8e49
commit dcf42f2da7
23 files changed
+535 -56

No files matched your search

+4 -2
View File
@@ -286,7 +286,7 @@ int main(int argc, char **argv) try {
"<div class='desk-account-main'><strong id='widget-positive' class='money-amount'>1.000 €</strong>"
"<strong id='widget-negative' class='money-amount is-negative'>-1.000 €</strong></div>"
"<span id='money-reference' class='money-amount'>Money</span><span id='negative-reference' style='color:var(--danger);'>Negative</span>"
"<span id='text-reference'>Text</span>";
"<span id='text-reference'>Text</span><div class='amount-review'><strong id='amount-money-test'>100 €</strong></div><strong id='native-ticket-amount'>20 €</strong>";
auto *doc = context->LoadDocumentFromMemory(
"<rml><head><style>" + css.str() + "</style></head><body class='" +
theme + "'>" + content + "</body></rml>");
@@ -310,8 +310,10 @@ int main(int argc, char **argv) try {
for (const auto *id : {"cash-negative", "widget-negative"})
require(doc->GetElementById(id)->GetComputedValues().color() == negative_color, "Negative balance lost its warning colour");
require(money_color != negative_color, "Money and negative colours are indistinguishable");
if (std::string(theme) == "matchday")
if (std::string(theme) == "matchday") {
require(doc->GetElementById("amount-money-test")->GetComputedValues().color() == money_color && doc->GetElementById("native-ticket-amount")->GetComputedValues().color() == money_color, "Positive input amounts must stay neutral in Matchday");
require(money_color == doc->GetElementById("text-reference")->GetComputedValues().color(), "Matchday positive money must use neutral text colour");
}
for (const auto *id : {"stats-scale-label", "stats-legend-label", "stats-player-label", "stats-world-label", "stats-from-label", "stats-winner-label", "news-brand-test", "settings-row-label", "settings-row-help", "month-label", "warning-label", "fixture-label", "front-test-label", "mod-test-name"}) {
auto *label = doc->GetElementById(id);
+36 -1
View File
@@ -8,7 +8,7 @@ using namespace bmh;
using namespace bmh::modern_ui;
int main(int argc, char **argv) {
try {
if (argc != 4 || (std::string(argv[1]) != "prepare" && std::string(argv[1]) != "verify" && std::string(argv[1]) != "verify-lineup" && std::string(argv[1]) != "verify-sports")) throw std::runtime_error("usage: modern_engine_bridge_probe prepare|verify|verify-lineup|verify-sports <world.obw> <new-output-directory>");
if (argc != 4 || (std::string(argv[1]) != "prepare" && std::string(argv[1]) != "verify" && std::string(argv[1]) != "verify-lineup" && std::string(argv[1]) != "verify-sports" && std::string(argv[1]) != "verify-bank")) throw std::runtime_error("usage: modern_engine_bridge_probe prepare|verify|verify-lineup|verify-sports|verify-bank <world.obw> <new-output-directory>");
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
if (std::string(argv[1]) == "prepare") {
@@ -80,6 +80,41 @@ int main(int argc, char **argv) {
link = EngineBridge::open(world, out / "sports.obs"); const auto loaded = link->snapshot(); write("sports-loaded.json", loaded);
if (engine_tactics_projection(loaded).at("values") != tactics.at("values") || engine_training_projection(loaded).at("types") != training.at("types") || engine_training_projection(loaded).at("areas") != training.at("areas")) throw std::runtime_error("sports lost in OBS round trip");
}
if (std::string(argv[1]) == "verify-bank") {
const auto M = [](int n) { return Json{{"currency","EUR"},{"minorUnits",2},{"minor",std::to_string(int64_t(n)*100)}}; };
const auto run = [&](const Json &payload, const std::string &id) {
const auto request = engine_bank_command(link->snapshot(),payload,id);
const auto response = link->command(request); write((id.substr(8)+"-response.json").c_str(),response);
if (response.value("messageType","") != "command_result" || link->command(request) != response) throw std::runtime_error(response.dump());
};
run({{"action","deposit"},{"amount",M(10000)}},"request:deposit");
run({{"action","withdraw"},{"amount",M(2500)}},"request:withdraw");
const auto deposited = link->snapshot();
if (engine_money_minor(deposited.at("bank").at("data").at("accounts").at("deposit")) != 750000) throw std::runtime_error("deposit arithmetic wrong");
run({{"action","buy"},{"assetId","stock:0"},{"count",10}},"request:stock-buy");
run({{"action","sell"},{"assetId","stock:0"},{"count",3}},"request:stock-sell");
run({{"action","buy"},{"assetId","fund:0"},{"count",1}},"request:property-buy");
run({{"action","sell"},{"assetId","fund:0"},{"count",1}},"request:property-sell");
auto now = link->snapshot();
const auto tc = engine_ticket_command(now,25,"request:ticket");
const auto tr = link->command(tc); write("ticket-response.json",tr);
if (tr.value("messageType","") != "command_result" || link->command(tc) != tr) throw std::runtime_error(tr.dump());
now = link->snapshot();
auto stale = tc; stale["requestId"] = "request:stale-bank";
if (link->command(stale).value("code","") != "stale_revision" || link->snapshot() != now) throw std::runtime_error("stale bank command changed state");
Json edits = Json::array({{{"field",0},{"value",1000000}}});
auto preview = link->read({{"kind","credit"},{"edits",edits}}); write("credit-preview.json",preview);
(void)engine_credit_projection(now,preview);
if (now != link->snapshot()) throw std::runtime_error("credit preview mutated state");
const auto cc = engine_credit_command(now,preview,edits,"request:credit");
auto cr = link->command(cc); write("credit-response.json",cr);
if (cr.value("messageType","") != "command_result" || link->command(cc) != cr) throw std::runtime_error(cr.dump());
const auto after = link->snapshot(); write("bank-after.json",after);
write("bank-saved.json",link->save_copy(out / "bank.obs")); link.reset();
link = EngineBridge::open(world,out / "bank.obs"); const auto loaded = link->snapshot(); write("bank-loaded.json",loaded);
for (const auto *kind : {"bank","credit","stadium"}) if (loaded.at(kind).at("data") != after.at(kind).at("data")) throw std::runtime_error("finance lost during OBS round trip");
}
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
}
+41
View File
@@ -130,6 +130,47 @@ int main() {
training = engine_training_projection(sports); training["players"]["player:0"]["focus"] = 1; rejects([&] { engine_training_command(sports,training,"request:p"); });
training = engine_training_projection(sports); training["players"]["foreign"] = {{"focus",0},{"intensity",2}}; rejects([&] { engine_training_command(sports,training,"request:p"); });
auto different = sports; different["training"]["meta"]["scope"]["managerId"] = "manager:1"; rejects([&] { engine_training_projection(different); });
auto bank = fixture();
const auto M = [](int64_t v) { return Json{{"currency","EUR"},{"minorUnits",2},{"minor",std::to_string(v)}}; };
bank["desktop"]["data"]["accounts"]["cash"] = M(1000000);
for (auto &[kind,row] : bank.items()) row["meta"]["scope"]["allowedCommands"] = {"bank.commit","ticket.commit"};
const auto bm = bank["desktop"]["meta"];
bank["bank"] = {{"messageType","snapshot"},{"meta",bm},{"data",{{"kind","bank"},{"teamId","club:6"},
{"accounts",{{"cash",M(1000000)},{"deposit",M(50000)},{"creditLine",M(9000)}}},
{"stocks",Json::array({{{"id","stock:8"},{"name",""},{"price",M(900)},{"previousPrice",M(1000)},{"history",{M(0),M(900),M(850)}},{"owned",2},{"maxToBuy",10}}})},
{"funds",Json::array({{{"id","fund:4"},{"name","Office"},{"price",M(400000)},{"owned",1},{"maxToBuy",2}}})}}}};
bank["stadium"] = {{"messageType","snapshot"},{"meta",bm},{"data",{{"kind","stadium"},{"teamId","club:6"},{"ticketPrice",M(2000)},{"ticketPriceRange",{{"min",M(800)},{"max",M(2500)}}}}}};
const auto bp = engine_bank_projection(bank);
require(bp.at("assets").at("properties")[0].at("image") == "bank.property.4" && bp.at("summary").at("stocks") == 1800, "asset identity or minor units lost");
require(bp.at("assets").at("stocks")[0].at("history") == Json::array({0,900,850}) && bp.at("assets").at("stocks")[0].at("name") == "Aktie · stock:8", "invented bank labels or history");
auto bc = engine_bank_command(bank,{{"action","deposit"},{"amount",M(1000)}},"request:bank");
require(bc.at("owner").at("managerId") == "manager:99" && bc.at("expectedRevision") == bm.at("stateRevision"), "bank scope lost");
rejects([&] { engine_bank_command(bank,{{"action","withdraw"},{"amount",M(50001)}},"r"); });
rejects([&] { engine_bank_command(bank,{{"action","deposit"},{"amount",M(1000100)}},"r"); });
rejects([&] { engine_bank_command(bank,{{"action","buy"},{"assetId","stock:0"},{"count",1}},"r"); });
rejects([&] { engine_bank_command(bank,{{"action","sell"},{"assetId","stock:8"},{"count",3}},"r"); });
require(engine_bank_command(bank,{{"action","sell"},{"assetId","stock:8"},{"count",2}},"r").at("payload").at("count") == 2, "sell count changed");
require(engine_ticket_command(bank,25,"r").at("payload").at("price") == M(2500), "ticket conversion wrong");
rejects([&] { engine_ticket_command(bank,7,"r"); });
auto formatted_bank = bank; formatted_bank["bank"]["data"]["stocks"][0]["name"] = "%%10 COMPANY";
require(engine_bank_projection(formatted_bank).at("assets").at("stocks")[0].at("name") == "Aktie · stock:8", "legacy formatting displayed as company name");
auto credit = Json{{"messageType","snapshot"},{"meta",bm},{"data",{{"kind","credit"},{"lenderId","bank"},{"fields",Json::array()},
{"saved",{0,0,0,0,0,0}},{"fees",M(100)},{"refund",M(0)},{"principalPaid",M(0)}}}};
for (int i=0;i<8;++i) credit["data"]["fields"].push_back({{"field",i},{"label","Field"},{"value",0},{"editable",i==0},{"min",i==0?Json(1000):Json()},{"max",i==0?Json(5000):Json()}});
const auto edits = Json::array({{{"field",0},{"value",2000}}});
require(engine_credit_command(bank,credit,edits,"r").at("payload").at("acceptFees") == true,"confirmed fee consent lost");
rejects([&] { engine_credit_command(bank,credit,Json::array(),"r"); });
auto active_credit=credit; active_credit["data"]["saved"][0]=2000;
rejects([&] { engine_credit_command(bank,active_credit,edits,"r"); });
auto foreign_credit=credit; foreign_credit["meta"]["scope"]["managerId"]="foreign";
rejects([&] { engine_credit_command(bank,foreign_credit,edits,"r"); });
auto broken_bank = bank; broken_bank["bank"]["meta"]["stateRevision"] = "1"; rejects([&] { engine_bank_projection(broken_bank); });
broken_bank = bank; broken_bank["bank"]["data"]["teamId"] = "foreign"; rejects([&] { engine_bank_projection(broken_bank); });
broken_bank = bank; broken_bank["stadium"]["data"]["ticketPrice"] = M(2001); rejects([&] { engine_ticket_projection(broken_bank); });
broken_bank = bank; broken_bank["desktop"]["meta"]["scope"]["allowedCommands"] = Json::array();
for (auto &[kind,row] : broken_bank.items()) row["meta"]["scope"]["allowedCommands"] = Json::array();
rejects([&] { engine_ticket_command(broken_bank,10,"r"); });
std::cout << "engine DTO, exact money, scope and booking tests passed\n";
return 0;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
+14
View File
@@ -191,6 +191,20 @@ int main(int argc, char **argv) try {
CHECK(!popup.open(anchor, 1, 2, 25, 2));
CHECK(!popup.is_open());
}
{
// An async owner accepts a proposal without optimistically publishing it.
source.s.state["ticket"] = 20;
int proposals = 0; Action staged;
TicketPopover popup(*context, *doc, [&] { return source.snapshot(); },
[&](const Action &a) { ++proposals; staged = a; return ActionResult{true, source.s.revision, {}}; }, [] {});
CHECK(popup.open(doc->GetElementById("desktop-ticket"), 1, 8, 25));
Rml::Dictionary k; k["key_identifier"] = int(Rml::Input::KI_END);
doc->GetElementById("native-ticket-range")->DispatchEvent("keydown", k);
doc->QuerySelector("[data-ticket-action=review]")->Click();
CHECK(proposals == 0 && source.s.state["ticket"] == 20);
doc->QuerySelector("[data-ticket-action=confirm]")->Click();
CHECK(proposals == 1 && staged.value == 25 && source.s.state["ticket"] == 20 && !popup.is_open());
}
doc->Close();
Rml::RemoveContext("ticket-fixture");
Rml::Shutdown();