mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-28 08:52:19 -07:00
Add test for missing tax counter to pin evaluateModifyCounter check ordering + test comment cleanup
This commit is contained in:
parent
9121064709
commit
1c82d972ae
1 changed files with 7 additions and 8 deletions
|
|
@ -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);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue