jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-08 11:03:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Tests] Format the zone dump helper and its tests to clang-format

Browse source
This commit is contained in:
Lukas Brübach 2026-10-05 10:56:38 +02:00
parent 8405b491b3
commit 86ae4a0c6b
2 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.cpp
View file

@ -13,5 +13,5 @@ std::pair<qsizetype, qsizetype> dumpZoneCardRange(qsizetype cardCount, int numbe
count = std::max<qsizetype>(count, 0); count = std::max<qsizetype>(count, 0);
const qsizetype begin = isReversed ? cardCount - count : 0; const qsizetype begin = isReversed ? cardCount - count : 0;
return { begin, begin + count }; return {begin, begin + count};
} }

37
tests/server_dump_zone_test.cpp
View file

@ -3,11 +3,11 @@
* @ingroup Tests * @ingroup Tests
*/ */
#include <gtest/gtest.h>
#include <climits>
#include <vector>
#include <libcockatrice/network/server/remote/game/dump_zone_range.h>
#include <QList> #include <QList>
#include <climits>
#include <gtest/gtest.h>
#include <libcockatrice/network/server/remote/game/dump_zone_range.h>
#include <vector>
namespace namespace
{ {
@ -25,32 +25,32 @@ std::vector<qsizetype> walked(qsizetype cardCount, int numberCards, bool isRever
TEST(ServerDumpZone, ForwardTakesLeadingCards) TEST(ServerDumpZone, ForwardTakesLeadingCards)
{ {
EXPECT_EQ(walked(5, 2, false), (std::vector<qsizetype>{ 0, 1 })); EXPECT_EQ(walked(5, 2, false), (std::vector<qsizetype>{0, 1}));
} }
TEST(ServerDumpZone, ForwardTakingAllCardsCoversTheZone) TEST(ServerDumpZone, ForwardTakingAllCardsCoversTheZone)
{ {
EXPECT_EQ(walked(3, 3, false), (std::vector<qsizetype>{ 0, 1, 2 })); EXPECT_EQ(walked(3, 3, false), (std::vector<qsizetype>{0, 1, 2}));
} }
TEST(ServerDumpZone, ForwardAskingForOneDumpsOne) TEST(ServerDumpZone, ForwardAskingForOneDumpsOne)
{ {
EXPECT_EQ(walked(3, 1, false), (std::vector<qsizetype>{ 0 })); EXPECT_EQ(walked(3, 1, false), (std::vector<qsizetype>{0}));
} }
TEST(ServerDumpZone, MinusOneMeansTheWholeZone) TEST(ServerDumpZone, MinusOneMeansTheWholeZone)
{ {
EXPECT_EQ(walked(4, -1, false), (std::vector<qsizetype>{ 0, 1, 2, 3 })); EXPECT_EQ(walked(4, -1, false), (std::vector<qsizetype>{0, 1, 2, 3}));
} }
TEST(ServerDumpZone, ReversedTakesTrailingCards) TEST(ServerDumpZone, ReversedTakesTrailingCards)
{ {
EXPECT_EQ(walked(5, 2, true), (std::vector<qsizetype>{ 3, 4 })); EXPECT_EQ(walked(5, 2, true), (std::vector<qsizetype>{3, 4}));
} }
TEST(ServerDumpZone, ReversedAskingForOneTakesTheLast) TEST(ServerDumpZone, ReversedAskingForOneTakesTheLast)
{ {
EXPECT_EQ(walked(5, 1, true), (std::vector<qsizetype>{ 4 })); EXPECT_EQ(walked(5, 1, true), (std::vector<qsizetype>{4}));
} }
TEST(ServerDumpZone, ZeroDumpsNothing) TEST(ServerDumpZone, ZeroDumpsNothing)
@ -63,20 +63,20 @@ TEST(ServerDumpZone, ZeroDumpsNothing)
// Forward, the old loop stopped at the zone's size on its own. // Forward, the old loop stopped at the zone's size on its own.
TEST(ServerDumpZone, ForwardOversizedRequestIsClamped) TEST(ServerDumpZone, ForwardOversizedRequestIsClamped)
{ {
EXPECT_EQ(walked(3, 1000, false), (std::vector<qsizetype>{ 0, 1, 2 })); EXPECT_EQ(walked(3, 1000, false), (std::vector<qsizetype>{0, 1, 2}));
} }
// Reversed, an oversized request put the offset at cardCount - numberCards, which is // Reversed, an oversized request put the offset at cardCount - numberCards, which is
// negative, so the walk started before the first card. // negative, so the walk started before the first card.
TEST(ServerDumpZone, ReversedOversizedRequestIsClamped) TEST(ServerDumpZone, ReversedOversizedRequestIsClamped)
{ {
EXPECT_EQ(walked(3, 1000, true), (std::vector<qsizetype>{ 0, 1, 2 })); EXPECT_EQ(walked(3, 1000, true), (std::vector<qsizetype>{0, 1, 2}));
} }
// Reversed, -1 put the offset at cardCount + 1, so the walk started one past the last card. // Reversed, -1 put the offset at cardCount + 1, so the walk started one past the last card.
TEST(ServerDumpZone, ReversedWholeZoneRequestStaysInRange) TEST(ServerDumpZone, ReversedWholeZoneRequestStaysInRange)
{ {
EXPECT_EQ(walked(3, -1, true), (std::vector<qsizetype>{ 0, 1, 2 })); EXPECT_EQ(walked(3, -1, true), (std::vector<qsizetype>{0, 1, 2}));
} }
// Only -1 means "the whole zone". Any other negative count is not a request for anything, // Only -1 means "the whole zone". Any other negative count is not a request for anything,
@ -107,16 +107,15 @@ TEST(ServerDumpZone, NonPositiveCardCountYieldsAnEmptyRange)
// unbounded client-supplied sint32, so this sweeps the edges rather than a chosen few. // unbounded client-supplied sint32, so this sweeps the edges rather than a chosen few.
TEST(ServerDumpZone, ResolvedRangeIsAlwaysWithinTheZone) TEST(ServerDumpZone, ResolvedRangeIsAlwaysWithinTheZone)
{ {
const QList<int> cardCounts = { 0, 1, 2, 3, 7, 60, 1000000 }; const QList<int> cardCounts = {0, 1, 2, 3, 7, 60, 1000000};
const QList<int> requests = { INT_MIN, -1000, -2, -1, 0, 1, 2, 3, const QList<int> requests = {INT_MIN, -1000, -2, -1, 0, 1, 2, 3, 59, 60, 61, 999999, INT_MAX};
59, 60, 61, 999999, INT_MAX };
for (int cardCount : cardCounts) { for (int cardCount : cardCounts) {
for (int request : requests) { for (int request : requests) {
for (bool isReversed : { false, true }) { for (bool isReversed : {false, true}) {
const auto [begin, end] = dumpZoneCardRange(cardCount, request, isReversed); const auto [begin, end] = dumpZoneCardRange(cardCount, request, isReversed);
SCOPED_TRACE(testing::Message() << "cardCount=" << cardCount << " request=" << request SCOPED_TRACE(testing::Message()
<< " isReversed=" << isReversed); << "cardCount=" << cardCount << " request=" << request << " isReversed=" << isReversed);
ASSERT_GE(begin, 0); ASSERT_GE(begin, 0);
ASSERT_GE(end, begin); ASSERT_GE(end, begin);
ASSERT_LE(end, cardCount); ASSERT_LE(end, cardCount);