Refactor server counter API to own overflow protection and filter no-op events

Counter modifications now clamp to int bounds server-side and return change
  status, allowing command handlers to skip network broadcasts when values
  don't actually change.
This commit is contained in:
DawnFire42 2026-05-11 19:56:51 -04:00
parent 33e0f8699b
commit 5f92bff741
No known key found for this signature in database
GPG key ID: 24BB855EE2911B33
8 changed files with 379 additions and 29 deletions

View file

@ -0,0 +1,149 @@
/** @file server_card_counter_test.cpp
* @brief Tests for Server_Card counter operations.
* @ingroup Tests
*/
#include <gtest/gtest.h>
#include <libcockatrice/network/server/remote/game/server_card.h>
#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
#include <libcockatrice/utility/card_ref.h>
#include <limits>
TEST(ServerCardCounter, IncrementNewCounter)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
EXPECT_TRUE(card.incrementCounter(1, 10));
EXPECT_EQ(card.getCounter(1), 10);
}
TEST(ServerCardCounter, IncrementExistingCounter)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 50));
EXPECT_TRUE(card.incrementCounter(1, 10));
EXPECT_EQ(card.getCounter(1), 60);
}
TEST(ServerCardCounter, IncrementOverflowProtection)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, std::numeric_limits<int>::max()));
EXPECT_FALSE(card.incrementCounter(1, 1));
EXPECT_EQ(card.getCounter(1), std::numeric_limits<int>::max());
}
TEST(ServerCardCounter, DecrementUnderflowProtection)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, std::numeric_limits<int>::min()));
EXPECT_FALSE(card.incrementCounter(1, -1));
EXPECT_EQ(card.getCounter(1), std::numeric_limits<int>::min());
}
TEST(ServerCardCounter, ReturnsFalseWhenUnchanged)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 50));
EXPECT_FALSE(card.incrementCounter(1, 0));
EXPECT_EQ(card.getCounter(1), 50);
}
TEST(ServerCardCounter, DecrementToZeroRemovesCounter)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 10));
EXPECT_TRUE(card.incrementCounter(1, -10));
EXPECT_EQ(card.getCounter(1), 0);
EXPECT_FALSE(card.getCounters().contains(1));
}
TEST(ServerCardCounter, SetToZeroRemovesCounter)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 10));
EXPECT_TRUE(card.setCounter(1, 0));
EXPECT_EQ(card.getCounter(1), 0);
EXPECT_FALSE(card.getCounters().contains(1));
}
TEST(ServerCardCounter, SetCounterReturnsFalseWhenUnchanged)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 50));
EXPECT_FALSE(card.setCounter(1, 50));
EXPECT_EQ(card.getCounter(1), 50);
}
TEST(ServerCardCounter, SetCounterReturnsTrueWhenChanged)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 50));
EXPECT_TRUE(card.setCounter(1, 100));
EXPECT_EQ(card.getCounter(1), 100);
}
TEST(ServerCardCounter, SetCounterEventNotPopulatedWhenUnchanged)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 50));
Event_SetCardCounter event;
event.set_counter_id(999);
event.set_counter_value(999);
EXPECT_FALSE(card.setCounter(1, 50, &event));
EXPECT_EQ(event.counter_id(), 999);
EXPECT_EQ(event.counter_value(), 999);
}
TEST(ServerCardCounter, IncrementCounterPopulatesEvent)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 50));
Event_SetCardCounter event;
EXPECT_TRUE(card.incrementCounter(1, 10, &event));
EXPECT_EQ(event.counter_id(), 1);
EXPECT_EQ(event.counter_value(), 60);
}
TEST(ServerCardCounter, IncrementCounterEventReflectsClampedValue)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, std::numeric_limits<int>::max() - 5));
Event_SetCardCounter event;
EXPECT_TRUE(card.incrementCounter(1, 10, &event));
EXPECT_EQ(event.counter_id(), 1);
EXPECT_EQ(event.counter_value(), std::numeric_limits<int>::max());
}
TEST(ServerCardCounter, IncrementCounterNoEventWhenNullptr)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, 50));
EXPECT_TRUE(card.incrementCounter(1, 10, nullptr));
EXPECT_EQ(card.getCounter(1), 60);
}
TEST(ServerCardCounter, IncrementCounterEventNotPopulatedWhenUnchanged)
{
Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
ASSERT_TRUE(card.setCounter(1, std::numeric_limits<int>::max()));
Event_SetCardCounter event;
event.set_counter_id(999);
event.set_counter_value(999);
EXPECT_FALSE(card.incrementCounter(1, 1, &event));
EXPECT_EQ(event.counter_id(), 999);
EXPECT_EQ(event.counter_value(), 999);
}
int main(int argc, char **argv)
{
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}