Add test for missing tax counter to pin evaluateModifyCounter check ordering + test comment cleanup

This commit is contained in:
DawnFire42 2026-08-10 16:33:53 -04:00
parent 9121064709
commit 1c82d972ae
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33

View file

@ -24,8 +24,6 @@ Server_Counter makeCounter(int id, int count)
} }
} // namespace } // namespace
// evaluateDelCounter
TEST(EvaluateDelCounter, RejectsWhenGameNotStarted) TEST(EvaluateDelCounter, RejectsWhenGameNotStarted)
{ {
Server_Counter counter = makeCounter(UserCounterId, 0); Server_Counter counter = makeCounter(UserCounterId, 0);
@ -70,8 +68,6 @@ TEST(EvaluateDelCounter, GameNotStartedTakesPrecedenceOverTaxGuard)
Response::RespGameNotStarted); Response::RespGameNotStarted);
} }
// evaluateSetCounterActive
TEST(EvaluateSetCounterActive, RejectsWhenGameNotStarted) TEST(EvaluateSetCounterActive, RejectsWhenGameNotStarted)
{ {
Server_Counter counter = makeCounter(CounterIds::CommanderTax, 0); Server_Counter counter = makeCounter(CounterIds::CommanderTax, 0);
@ -150,8 +146,6 @@ TEST(EvaluateSetCounterActive, RejectsDisablingPartnerTaxWhenAccumulated)
Response::RespContextError); Response::RespContextError);
} }
// evaluateCreateCounter
TEST(EvaluateCreateCounter, RejectsWhenGameNotStarted) TEST(EvaluateCreateCounter, RejectsWhenGameNotStarted)
{ {
EXPECT_EQ(Server_Player::evaluateCreateCounter(/*gameStarted=*/false, /*playerConceded=*/false, "mycounter"), EXPECT_EQ(Server_Player::evaluateCreateCounter(/*gameStarted=*/false, /*playerConceded=*/false, "mycounter"),
@ -183,8 +177,6 @@ TEST(EvaluateCreateCounter, AllowsOrdinaryNames)
EXPECT_EQ(Server_Player::evaluateCreateCounter(true, false, ""), Response::RespOk); EXPECT_EQ(Server_Player::evaluateCreateCounter(true, false, ""), Response::RespOk);
} }
// evaluateModifyCounter (shared by cmdIncCounter / cmdSetCounter)
TEST(EvaluateModifyCounter, RejectsWhenGameNotStarted) TEST(EvaluateModifyCounter, RejectsWhenGameNotStarted)
{ {
Server_Counter counter = makeCounter(UserCounterId, 0); Server_Counter counter = makeCounter(UserCounterId, 0);
@ -238,6 +230,13 @@ TEST(EvaluateModifyCounter, AllowsActiveTaxCounter)
Response::RespOk); Response::RespOk);
} }
TEST(EvaluateModifyCounter, RejectsMissingTaxCounter)
{
EXPECT_EQ(Server_Player::evaluateModifyCounter(true, false, /*commandZoneEnabled=*/true, CounterIds::CommanderTax,
/*counter=*/nullptr),
Response::RespNameNotFound);
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);