mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-10-27 18:10:47 -05:00
d603a2bb6a
* [DeckList] Apply include-what-you-use to libcockatrice_deck_list * [IWYU] Apply include-what-you-use across the tree Run one whole-tree IWYU pass over the libcockatrice_* libraries, the Cockatrice client, Oracle, Servatrice and the test suite, so each translation unit includes what it uses directly and forward-declares what it does not need. IWYU only analyses real translation units, never the moc code CMake generates from Q_OBJECT headers, so it strips includes that moc output silently relies on. Where a type is passed by value (or nested in a QList/QMap) in a signal or slot signature, the generated moc code needs the complete type; those includes are kept with an explanatory `// IWYU pragma: keep`. The same holds for Q_DECLARE_METATYPE targets such as QSqlDatabase. A handful of includes are added by hand where callers brace-initialize a const-reference parameter, which also requires the complete type. Applied as a single commit on purpose: stripping includes from the libcockatrice_* headers is precisely what breaks the client, test and server translation units, and the fixes for those live in the same translation units. Splitting by component would therefore leave intermediate commits that do not compile. All 426 modified Q_OBJECT/Q_GADGET headers were verified to be moc-self-contained by compiling each generated moc_*.cpp standalone; several built only because of moc include ordering in mocs_compilation.cpp before the keep-includes were added. * [Tooling] Emit public Qt headers and fix IWYU fallout CI found Three problems the local build could not see, all because a green local build only proves the configuration it was run under. Private Qt headers. IWYU emitted private, lowercase Qt headers, and qtypes.h does not exist at all before Qt 6.9, so the Debian 12 and Ubuntu 24.04 jobs on Qt 6.4.2 failed to compile. The generator only emitted a mapping when the capital header name mirrored the private one (QAbstractAnimation for qabstractanimation.h), so qtypes.h, which is wrapped by QtTypes instead, got no mapping and kept the private spelling. Map it explicitly to <QtTypes>, which is public since Qt 5 and provides the same typedefs either way, and rewrite the 100 affected includes. Do not generalize this to "prefer any Qt* wrapper". The table is generated from whichever Qt is installed, and the wrappers are not equally old: QtLogging only appeared in Qt 6.8 and QtMinMax in 6.5, so that heuristic trades one breakage for another. Every other lowercase header still in the tree has shipped publicly since Qt 5, so those are left alone. Platform-guarded includes. IWYU only sees the preprocessor configuration it is handed, so it dropped an include that only the macOS branch of main.cpp needs, and the macOS jobs failed on an undeclared UrlSchemeEventFilter. Restore the include. Force-compiling every file that carries a platform guard under Q_OS_MAC, Q_OS_MACOS and __APPLE__ reports nothing else, so the macOS branches are covered rather than assumed. shellcheck. Drop a leftover variable and stop assigning the include-what-you-use lookup, which was only ever an existence check. * [Tooling] Map Qt 6.5+ split headers to QtGlobal for Qt 6.4 compatibility IWYU emitted QtTypes, QtPreprocessorSupport, QtVersionChecks, QtAssert, QtMinMax, QtClassHelperMacros, QtEnvironmentVariables and QtTranslation. Qt 6.5 split those declarations out of qglobal.h into separate headers, so neither the Qt* wrapper nor the q*.h private name exists on the oldest Qt we support (6.4.2), and Debian 12 / Ubuntu 24.04 fail with "No such file or directory". qtypes.h is worse still: it only appeared in Qt 6.9. QtGlobal is the one spelling that works across the whole supported range. It has been public since Qt 5, defines these declarations itself up to Qt 6.4, and includes the split headers from Qt 6.5 on, so redirect all eight private headers to it and collapse the affected includes in the tree. Curated overrides now take precedence over the name-mirroring rule, which cannot know about Qt version floors because the mapping is generated from whatever Qt is installed. That rule was mapping qtversionchecks.h to <QtVersionChecks> even with an override present, because the override was only consulted as a fallback. A curated key that matches nothing is now a hard error rather than a silent fallback, and the redirected headers are no longer advertised as the home of a symbol. Verified every Qt include in the tree resolves against the real qt6-base-dev 6.4.2 package: 15 distinct includes, 0 missing. * [Tooling] Map QOverload to QtGlobal and drop the QMetaMethodArgument include Two more headers IWYU emitted do not exist on Qt 6.4.2: QOverload was split out of qglobal.h in Qt 6.5, so on 6.4.2 it is declared in qglobal.h directly and the standalone header is a hard error. QtGlobal covers both, so map qoverload.h to it like the other 6.5+ split headers. QMetaMethodArgument is never referenced anywhere in the tree. It is a bare forwarder for qobjectdefs.h that our generator advertised as a class symbol, which is how IWYU came to add the include at all. The symbol mappings are generated from header names, so they cannot tell a forwarder that happens to be capitalised from a real class; removing the unused include is the fix, and the generic case stays a known limitation of the generator. Extending the audit to every Q* header (an earlier pass only matched headers starting with "Qt" or lowercase q*.h, so it missed all of them) against the real qt6-base-dev, qt6-multimedia-dev, qt6-declarative-dev, qt6-svg-dev and qt6-websockets-dev 6.4.2 packages: 341 distinct Qt includes, 0 missing. * [Game] Give moc the complete CardItem type in player_actions.h player_actions.h forward declares CardItem but passes QList<CardItem *> by value in actPlay/actPlayFacedown/actHide. moc instantiates the metatype for those parameters, and on Qt 6.4 that expands to sizeof(CardItem), so Ubuntu 24.04 fails with "invalid application of 'sizeof' to incomplete type 'CardItem'". Newer Qt tolerates the incomplete type, which is why only the 6.4.2 jobs failed. Include the defining header with an IWYU pragma keep, matching how the other MOC-required includes in this area are handled. * [Game] Give moc the complete ServerInfo_Card type player_logic.h, game_scene.h, view_zone.h and view_zone_widget.h forward declare ServerInfo_Card but pass QList<const ServerInfo_Card *> through signal and slot signatures. moc instantiates the metatype for those parameters, which Qt 6.4 expands to sizeof(ServerInfo_Card), so the connect in game_scene.cpp fails on Debian 12 and Ubuntu 24.04 with "invalid application of 'sizeof' to incomplete type 'const ServerInfo_Card'". Newer Qt tolerates it, so only the 6.4.2 jobs failed. Include the generated protobuf header with an IWYU pragma keep, following the pattern already used for ServerInfo_Player and ServerInfo_User in game_event_handler.h. * [Client] Complete the types Qt 6.4 needs for connect and moc Qt 6.4 expands QMetaType::fromType on the normalised argument list of a PMF connect and on moc-generated metatypes, which requires sizeof on every signal and slot parameter. Newer Qt tolerates forward declarations there, so only the Debian 12 and Ubuntu 24.04 jobs failed, with "invalid application of 'sizeof' to incomplete type" for QMouseEvent, QPrinter and GameReplay. Replace the forward declarations with the real includes: - QMouseEvent in the nine widget headers that pass it through signals - QPrinter in abstract_tab_deck_editor.cpp, for the actPrintDeck lambda - game_replay.pb.h in tab_replays.h. GameReplay is a protobuf message, so the project's game/replay.h only forward declares it and cannot supply the complete type. Found by recompiling all 1918 project TUs against the Debian Qt 6.4.2 headers, which reproduces those two CI jobs locally in one pass. * [Client] Complete Release and QMenu for Qt 6.4 moc and connect Continuing the Qt 6.4 complete-type sweep: - window_main.cpp connects ClientUpdateChecker::finishedCheck to MainWindow::checkClientUpdatesFinished, whose Release * parameter made moc 6.4 instantiate the metatype. GameReplay turned out to be a protobuf message, so Release likewise needed release_channel.h in the three headers declaring those signals: window_main.h, dlg_update.h and client_update_checker.h. - moc 6.4 also needs sizeof(QMenu) for the QList<QMenu *> carried by TabSupervisor::setMenu and MainWindow::updateTabMenu. Verified by regenerating moc output with the Debian moc 6.4.2 for all 434 Q_OBJECT/Q_GADGET classes and compiling it, plus recompiling all 1612 source TUs, against the Qt 6.4.2 headers: no remaining failures. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
91 lines
2.7 KiB
C++
91 lines
2.7 KiB
C++
/** @file server_counter_test.cpp
|
|
* @brief Tests for Server_Counter operations.
|
|
* @ingroup Tests
|
|
*/
|
|
|
|
#include "libcockatrice/protocol/pb/color.pb.h"
|
|
|
|
#include <QString>
|
|
#include <gtest/gtest.h>
|
|
#include <libcockatrice/network/server/remote/game/server_counter.h>
|
|
#include <limits>
|
|
#include <string>
|
|
|
|
TEST(ServerCounter, IncrementDoesNotOverflow)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::max());
|
|
bool changed = c.incrementCount(1);
|
|
EXPECT_FALSE(changed);
|
|
EXPECT_EQ(c.getCount(), std::numeric_limits<int>::max());
|
|
}
|
|
|
|
TEST(ServerCounter, DecrementDoesNotUnderflow)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::min());
|
|
bool changed = c.incrementCount(-1);
|
|
EXPECT_FALSE(changed);
|
|
EXPECT_EQ(c.getCount(), std::numeric_limits<int>::min());
|
|
}
|
|
|
|
TEST(ServerCounter, SetCountReturnsFalseWhenUnchanged)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, 50);
|
|
bool changed = c.setCount(50);
|
|
EXPECT_FALSE(changed);
|
|
}
|
|
|
|
TEST(ServerCounter, IncrementReturnsChangeStatus)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, 50);
|
|
EXPECT_TRUE(c.incrementCount(10));
|
|
EXPECT_EQ(c.getCount(), 60);
|
|
EXPECT_FALSE(c.incrementCount(0));
|
|
EXPECT_EQ(c.getCount(), 60);
|
|
}
|
|
|
|
TEST(ServerCounter, LargePositiveDeltaDoesNotOverflow)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::max() - 10);
|
|
bool changed = c.incrementCount(std::numeric_limits<int>::max());
|
|
EXPECT_TRUE(changed); // Value changes from INT_MAX-10 to INT_MAX (clamped)
|
|
EXPECT_EQ(c.getCount(), std::numeric_limits<int>::max());
|
|
}
|
|
|
|
TEST(ServerCounter, LargeNegativeDeltaDoesNotUnderflow)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::min() + 10);
|
|
bool changed = c.incrementCount(std::numeric_limits<int>::min());
|
|
EXPECT_TRUE(changed); // Value changes from INT_MIN+10 to INT_MIN (clamped)
|
|
EXPECT_EQ(c.getCount(), std::numeric_limits<int>::min());
|
|
}
|
|
|
|
TEST(ServerCounter, SetCountReturnsTrueWhenChanged)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, 50);
|
|
EXPECT_TRUE(c.setCount(100));
|
|
EXPECT_EQ(c.getCount(), 100);
|
|
}
|
|
|
|
TEST(ServerCounter, BasicIncrementWorks)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, 50);
|
|
EXPECT_TRUE(c.incrementCount(10));
|
|
EXPECT_EQ(c.getCount(), 60);
|
|
EXPECT_TRUE(c.incrementCount(-20));
|
|
EXPECT_EQ(c.getCount(), 40);
|
|
}
|
|
|
|
TEST(ServerCounter, MixedExtremesDoNotClamp)
|
|
{
|
|
Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::max());
|
|
bool changed = c.incrementCount(std::numeric_limits<int>::min());
|
|
EXPECT_TRUE(changed);
|
|
EXPECT_EQ(c.getCount(), -1);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
::testing::InitGoogleTest(&argc, argv);
|
|
return RUN_ALL_TESTS();
|
|
}
|