From 86ae4a0c6bf26dc23bbfc23c2fb00cd316d2b723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Mon, 5 Oct 2026 10:56:38 +0200 Subject: [PATCH] [Tests] Format the zone dump helper and its tests to clang-format --- .../server/remote/game/dump_zone_range.cpp | 2 +- tests/server_dump_zone_test.cpp | 37 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.cpp index d5046d4e9..4ecca95cb 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/dump_zone_range.cpp @@ -13,5 +13,5 @@ std::pair dumpZoneCardRange(qsizetype cardCount, int numbe count = std::max(count, 0); const qsizetype begin = isReversed ? cardCount - count : 0; - return { begin, begin + count }; + return {begin, begin + count}; } diff --git a/tests/server_dump_zone_test.cpp b/tests/server_dump_zone_test.cpp index cc4c3e29f..71c410655 100644 --- a/tests/server_dump_zone_test.cpp +++ b/tests/server_dump_zone_test.cpp @@ -3,11 +3,11 @@ * @ingroup Tests */ -#include -#include -#include -#include #include +#include +#include +#include +#include namespace { @@ -25,32 +25,32 @@ std::vector walked(qsizetype cardCount, int numberCards, bool isRever TEST(ServerDumpZone, ForwardTakesLeadingCards) { - EXPECT_EQ(walked(5, 2, false), (std::vector{ 0, 1 })); + EXPECT_EQ(walked(5, 2, false), (std::vector{0, 1})); } TEST(ServerDumpZone, ForwardTakingAllCardsCoversTheZone) { - EXPECT_EQ(walked(3, 3, false), (std::vector{ 0, 1, 2 })); + EXPECT_EQ(walked(3, 3, false), (std::vector{0, 1, 2})); } TEST(ServerDumpZone, ForwardAskingForOneDumpsOne) { - EXPECT_EQ(walked(3, 1, false), (std::vector{ 0 })); + EXPECT_EQ(walked(3, 1, false), (std::vector{0})); } TEST(ServerDumpZone, MinusOneMeansTheWholeZone) { - EXPECT_EQ(walked(4, -1, false), (std::vector{ 0, 1, 2, 3 })); + EXPECT_EQ(walked(4, -1, false), (std::vector{0, 1, 2, 3})); } TEST(ServerDumpZone, ReversedTakesTrailingCards) { - EXPECT_EQ(walked(5, 2, true), (std::vector{ 3, 4 })); + EXPECT_EQ(walked(5, 2, true), (std::vector{3, 4})); } TEST(ServerDumpZone, ReversedAskingForOneTakesTheLast) { - EXPECT_EQ(walked(5, 1, true), (std::vector{ 4 })); + EXPECT_EQ(walked(5, 1, true), (std::vector{4})); } TEST(ServerDumpZone, ZeroDumpsNothing) @@ -63,20 +63,20 @@ TEST(ServerDumpZone, ZeroDumpsNothing) // Forward, the old loop stopped at the zone's size on its own. TEST(ServerDumpZone, ForwardOversizedRequestIsClamped) { - EXPECT_EQ(walked(3, 1000, false), (std::vector{ 0, 1, 2 })); + EXPECT_EQ(walked(3, 1000, false), (std::vector{0, 1, 2})); } // Reversed, an oversized request put the offset at cardCount - numberCards, which is // negative, so the walk started before the first card. TEST(ServerDumpZone, ReversedOversizedRequestIsClamped) { - EXPECT_EQ(walked(3, 1000, true), (std::vector{ 0, 1, 2 })); + EXPECT_EQ(walked(3, 1000, true), (std::vector{0, 1, 2})); } // Reversed, -1 put the offset at cardCount + 1, so the walk started one past the last card. TEST(ServerDumpZone, ReversedWholeZoneRequestStaysInRange) { - EXPECT_EQ(walked(3, -1, true), (std::vector{ 0, 1, 2 })); + EXPECT_EQ(walked(3, -1, true), (std::vector{0, 1, 2})); } // 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. TEST(ServerDumpZone, ResolvedRangeIsAlwaysWithinTheZone) { - const QList cardCounts = { 0, 1, 2, 3, 7, 60, 1000000 }; - const QList requests = { INT_MIN, -1000, -2, -1, 0, 1, 2, 3, - 59, 60, 61, 999999, INT_MAX }; + const QList cardCounts = {0, 1, 2, 3, 7, 60, 1000000}; + const QList requests = {INT_MIN, -1000, -2, -1, 0, 1, 2, 3, 59, 60, 61, 999999, INT_MAX}; for (int cardCount : cardCounts) { for (int request : requests) { - for (bool isReversed : { false, true }) { + for (bool isReversed : {false, true}) { const auto [begin, end] = dumpZoneCardRange(cardCount, request, isReversed); - SCOPED_TRACE(testing::Message() << "cardCount=" << cardCount << " request=" << request - << " isReversed=" << isReversed); + SCOPED_TRACE(testing::Message() + << "cardCount=" << cardCount << " request=" << request << " isReversed=" << isReversed); ASSERT_GE(begin, 0); ASSERT_GE(end, begin); ASSERT_LE(end, cardCount);