Tests: Do not depend on transitive includes

Change-Id: Ibc6a948480a904913a5427e6408d4d296784fb4f Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2022-02-08 12:15:24 +01:00 · 2022-02-08 12:15:24 +01:00 · 819e1bf91d
commit 819e1bf91d
parent 468e9c13a9
37 changed files with 55 additions and 0 deletions
--- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@ -29,6 +29,7 @@
 #include <QCoreApplication>
 #include <QList>
 #include <QTest>
+#include <QSet>

 #include "../testhelper_functions.h"

--- a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@ -26,6 +26,7 @@
 **
 ****************************************************************************/
 #include <QThread>
+#include <QSet>

 struct TestIterator
 {
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@ -32,6 +32,7 @@
 #include <QThread>
 #include <QMutex>
 #include <QTest>
+#include <QSet>
 #include <QRandomGenerator>

 #include "../testhelper_functions.h"
--- a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
+++ b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@ -30,6 +30,7 @@
 #include <QThread>
 #include <QElapsedTimer>
 #include <QTest>
+#include <QSet>

 using namespace QtConcurrent;

--- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
@ -34,6 +34,8 @@
 # include <QtCore/QProcess>
 #endif
 #include <QtTest/QTest>
+#include <QList>
+#include <QMap>

 class tst_qmessagehandler : public QObject
 {
--- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
@ -34,6 +34,8 @@
 #include <qdiriterator.h>
 #include <qfileinfo.h>
 #include <qstringlist.h>
+#include <QSet>
+#include <QString>

 #include <QtCore/private/qfsfileengine_p.h>

--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@ -33,6 +33,8 @@
 #include <QFileSystemWatcher>
 #include <QElapsedTimer>
 #include <QTextStream>
+#include <QMap>
+#include <QString>
 #include <QDir>
 #include <QSignalSpy>
 #include <QTimer>
--- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
+++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp
@ -29,6 +29,8 @@
 #include <QTest>
 #include <QMutexLocker>
 #include <QLoggingCategory>
+#include <QMap>
+#include <QStringList>

 Q_LOGGING_CATEGORY(TST_LOG, "tst.log")
 Q_LOGGING_CATEGORY(Digia_Oslo_Office_com, "Digia.Oslo.Office.com")
--- a/tests/auto/corelib/io/qurluts46/tst_qurluts46.cpp
+++ b/tests/auto/corelib/io/qurluts46/tst_qurluts46.cpp
@ -29,6 +29,8 @@
 #include <QtCore/QUrl>
 #include <QtCore/QFile>
 #include <QTest>
+#include <QSet>
+#include <QByteArray>
 #include <algorithm>

 class tst_QUrlUts46 : public QObject
--- a/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
+++ b/tests/auto/corelib/kernel/qmetacontainer/tst_qmetacontainer.cpp
@ -29,6 +29,8 @@
 #include <QtTest/qtest.h>
 #include <QtCore/qcontainerinfo.h>
 #include <QtCore/qmetacontainer.h>
+#include <QtCore/QMap>
+#include <QtCore/QHash>

 #include <QtCore/qvector.h>
 #include <QtCore/qset.h>
--- a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
+++ b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
@ -32,6 +32,8 @@

 #include <qobject.h>
 #include <qmetaobject.h>
+#include <QMap>
+#include <QString>

 struct CustomType
 {
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@ -31,6 +31,7 @@
 #include <QTest>
 #include <QQueue>
 #include <QStack>
+#include <QSet>

 #include <qvariant.h>
 #include <QtCore/private/qvariant_p.h>
@ -38,6 +39,7 @@
 #include <qbytearraylist.h>
 #include <qdatetime.h>
 #include <qmap.h>
+#include <QHash>
 #include <qiodevice.h>
 #include <qurl.h>
 #include <qlocale.h>
--- a/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp
+++ b/tests/auto/corelib/mimetypes/qmimetype/tst_qmimetype.cpp
@ -30,6 +30,7 @@

 #include <qmimetype.h>
 #include <qmimedatabase.h>
+#include <QVariantMap>

 #include <QTest>

--- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp
@ -28,6 +28,8 @@
 ****************************************************************************/

 #include <QTest>
+#include <QMap>
+#include <QVariantList>

 QT_WARNING_DISABLE_DEPRECATED

--- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp
@ -42,6 +42,9 @@
 #include <QJsonValue>
 #include <QJsonObject>
 #include <QJsonArray>
+#include <QVariant>
+#include <QVariantMap>
+#include <QVariantList>

 Q_DECLARE_METATYPE(QCborValue)

--- a/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp
+++ b/tests/auto/corelib/text/qbytearrayview/tst_qbytearrayview.cpp
@ -33,6 +33,7 @@
 // for negative testing (can't convert from)
 #include <deque>
 #include <list>
+#include <QVarLengthArray>

 template <typename T>
 constexpr bool CanConvert = std::is_convertible_v<T, QByteArrayView>;
--- a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
+++ b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp
@ -40,6 +40,7 @@
 #include <QStringTokenizer>
 #include <QStringView>
 #include <QTest>
+#include <QVarLengthArray>

 #include "../../../../shared/localechange.h"

--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@ -33,6 +33,9 @@
 #include <QTestEventLoop>
 #include <QTimer>
 #include <QSignalSpy>
+#include <QVarLengthArray>
+#include <QSet>
+#include <QList>

 #include <QTest>
 #include <qfuture.h>
--- a/tests/auto/corelib/time/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp
@ -32,6 +32,7 @@
 #include <QTimeZone>
 #include <qdatetime.h>
 #include <qlocale.h>
+#include <QMap>

 class tst_QDate : public QObject
 {
--- a/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
+++ b/tests/auto/corelib/tools/containerapisymmetry/tst_containerapisymmetry.cpp
@ -31,6 +31,8 @@
 #include "qbytearray.h"
 #include "qdebug.h"
 #include "qhash.h"
+#include "qmap.h"
+#include "qset.h"
 #include "qlist.h"
 #include "qstring.h"
 #include "qvarlengtharray.h"
--- a/tests/auto/corelib/tools/qarraydata/simplevector.h
+++ b/tests/auto/corelib/tools/qarraydata/simplevector.h
@ -32,6 +32,7 @@

 #include <QtCore/qarraydata.h>
 #include <QtCore/qarraydatapointer.h>
+#include <QtCore/qvarlengtharray.h>

 #include <algorithm>

--- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp
+++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
@ -30,6 +30,7 @@

 #include <qhash.h>
 #include <qmap.h>
+#include <qset.h>

 #include <algorithm>
 #include <vector>
--- a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
+++ b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
@ -27,6 +27,7 @@
 ****************************************************************************/

 #include <QTest>
+#include <QVarLengthArray>

 #include <qhash.h>

--- a/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
+++ b/tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
@ -28,6 +28,7 @@

 #include <QTest>
 #include <QBuffer>
+#include <QVarLengthArray>

 #include <private/qringbuffer_p.h>
 #include <qlist.h>
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@ -33,6 +33,7 @@
 #include <qimage.h>
 #include <qimagereader.h>
 #include <qlist.h>
+#include <qset.h>
 #include <qtransform.h>
 #include <qrandom.h>
 #include <stdio.h>
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@ -34,6 +34,8 @@
 #include <QtWidgets/QGraphicsWidget>
 #include <QtWidgets/QWidget>
 #include <QTest>
+#include <QSet>
+#include <QVarLengthArray>
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qwindowsysteminterface_p.h>
 #include <private/qevent_p.h>
--- a/tests/auto/gui/qvulkan/tst_qvulkan.cpp
+++ b/tests/auto/gui/qvulkan/tst_qvulkan.cpp
@ -29,6 +29,7 @@
 #include <QtGui/QVulkanInstance>
 #include <QtGui/QVulkanFunctions>
 #include <QtGui/QVulkanWindow>
+#include <QtCore/qvarlengtharray.h>

 #include <QTest>

--- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
@ -27,6 +27,7 @@
 ****************************************************************************/

 #include <QTest>
+#include <QtCore/QSet>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QPainter>
 #include <QtGui/QImage>
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@ -40,6 +40,8 @@
 #include <QScopeGuard>
 #include <QBuffer>

+#include <QtCore/qlist.h>
+#include <QtCore/qset.h>
 #include <QtCore/QCryptographicHash>
 #include <QtCore/QDataStream>
 #include <QtCore/QUrl>
--- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
@ -30,6 +30,7 @@

 #include <QTest>
 #include <QtEndian>
+#include <QSet>

 #include <qcoreapplication.h>
 #include <qnetworkinterface.h>
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@ -60,6 +60,8 @@
 #include <qnetworkinterface.h>

 #include <QNetworkProxy>
+#include <QSet>
+#include <QList>

 #include "../../../network-settings.h"

--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@ -53,6 +53,7 @@
 #include <QNetworkInterface>

 #include <qstringlist.h>
+#include <QSet>
 #include "../../../network-settings.h"
 #include <QtTest/private/qemulationdetector_p.h>

--- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
@ -30,6 +30,7 @@
 #include <QTest>

 #include <QtNetwork/qtnetworkglobal.h>
+#include <QtCore/qset.h>

 #include <qsslcertificate.h>
 #include <qsslkey.h>
--- a/tests/auto/network/ssl/shared/qopenssl_symbols.h
+++ b/tests/auto/network/ssl/shared/qopenssl_symbols.h
@ -71,6 +71,7 @@
 // reduced to the needs of our auto-tests, that have to mess with
 // OpenSSL calls directly.

+#include <QtCore/qset.h>
 #include <QtNetwork/private/qtnetworkglobal_p.h>

 QT_REQUIRE_CONFIG(openssl);
--- a/tests/auto/other/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
@ -31,6 +31,7 @@
 #include <QtTest/qtesttouch.h>

 #include <qevent.h>
+#include <QSet>
 #include <qpointingdevice.h>
 #include <qwidget.h>
 #include <qlayout.h>
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@ -31,6 +31,7 @@
 #include <QMessageBox>
 #include <QDebug>
 #include <QPair>
+#include <QSet>
 #include <QList>
 #include <QPointer>
 #include <QTimer>
--- a/tests/benchmarks/corelib/tools/containers-associative/tst_bench_containers_associative.cpp
+++ b/tests/benchmarks/corelib/tools/containers-associative/tst_bench_containers_associative.cpp
@ -26,6 +26,8 @@
 **
 ****************************************************************************/
 #include <QString>
+#include <QMap>
+#include <QHash>

 #include <qtest.h>