Replace QtTest headers with QTest

Complete search and replace of QtTest and QtTest/QtTest with QTest, as QtTest includes the whole module. Replace all such instances with correct header includes. See Jira task for more discussion. Fixes: QTBUG-88831 Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44 Pick-to: 6.0 Reviewed-by: Volker Hilsheimer <[email protected]>
chain78 · Dec 22, 2020 · 27d96b4 · 27d96b4
1 parent bbebfa0
commit 27d96b4
Show file tree

Hide file tree

Showing 636 changed files with 1,102 additions and 704 deletions.
diff --git a/examples/qtestlib/tutorial1/testqstring.cpp b/examples/qtestlib/tutorial1/testqstring.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 //! [0]
-#include <QtTest/QtTest>
+#include <QTest>
 
 class TestQString: public QObject
 {

diff --git a/examples/qtestlib/tutorial2/testqstring.cpp b/examples/qtestlib/tutorial2/testqstring.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 //! [0]
 class TestQString: public QObject

diff --git a/examples/qtestlib/tutorial3/testgui.cpp b/examples/qtestlib/tutorial3/testgui.cpp
@@ -50,7 +50,7 @@
 
 //! [0]
 #include <QtWidgets>
-#include <QtTest/QtTest>
+#include <QTest>
 
 class TestGui: public QObject
 {

diff --git a/examples/qtestlib/tutorial4/testgui.cpp b/examples/qtestlib/tutorial4/testgui.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 #include <QtWidgets>
-#include <QtTest/QtTest>
+#include <QTest>
 
 //! [0]
 class TestGui: public QObject

diff --git a/src/3rdparty/tinycbor/tests/encoder/data.cpp b/src/3rdparty/tinycbor/tests/encoder/data.cpp
@@ -22,7 +22,8 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
+#include <QFloat16>
 
 static float myNaNf()
 {

diff --git a/src/3rdparty/tinycbor/tests/encoder/tst_encoder.cpp b/src/3rdparty/tinycbor/tests/encoder/tst_encoder.cpp
@@ -22,7 +22,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 #include "cbor.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)

diff --git a/src/3rdparty/tinycbor/tests/parser/data.cpp b/src/3rdparty/tinycbor/tests/parser/data.cpp
@@ -1,4 +1,4 @@
-#include <QtTest>
+#include <QTest>
 #include <limits>
 #include <cbor.h>
 

diff --git a/src/3rdparty/tinycbor/tests/parser/tst_parser.cpp b/src/3rdparty/tinycbor/tests/parser/tst_parser.cpp
@@ -24,7 +24,7 @@
 
 #define _XOPEN_SOURCE 700
 #define  _DARWIN_C_SOURCE 1         /* need MAP_ANON */
-#include <QtTest>
+#include <QTest>
 #include "cbor.h"
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/src/testlib/doc/snippets/code/doc_src_qtestevent.cpp b/src/testlib/doc/snippets/code/doc_src_qtestevent.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QLineEdit>
 
 // dummy

diff --git a/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp b/src/testlib/doc/snippets/code/doc_src_qtestlib.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 #include "src_qtestlib_qtestcase.cpp"
 //! [0]
 class MyFirstTest: public QObject

diff --git a/src/testlib/doc/snippets/code/doc_src_qttest.cpp b/src/testlib/doc/snippets/code/doc_src_qttest.cpp
@@ -49,5 +49,5 @@
 ****************************************************************************/
 
 //! [0]
-#include <QtTest>
+#include <QTest>
 //! [0]
diff --git a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp
@@ -47,7 +47,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtTest>
+#include <QTest>
 
 // dummy class
 class MyObject

diff --git a/src/testlib/qabstractitemmodeltester.cpp b/src/testlib/qabstractitemmodeltester.cpp
@@ -44,7 +44,8 @@
 #include <QtCore/QPointer>
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QStack>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QLoggingCategory>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/tests/auto/cmake/test_testlib_definitions/main.cpp b/tests/auto/cmake/test_testlib_definitions/main.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 #include <QObject>
-#include <QtTest>
+#include <QTest>
 
 class TestObject : public QObject
 {

diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -28,7 +28,7 @@
 #include <qtconcurrentfilter.h>
 #include <QCoreApplication>
 #include <QList>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include "../testhelper_functions.h"
 

diff --git a/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.cpp b/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.cpp
@@ -29,7 +29,7 @@
 #include <qtconcurrentmap.h>
 #include <QCoreApplication>
 #include <QList>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include "../testhelper_functions.h"
 #include "generation_helpers.h"

diff --git a/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.h b/tests/auto/concurrent/qtconcurrentfiltermapgenerated/tst_qtconcurrentfiltermapgenerated.h
@@ -27,7 +27,7 @@
 ****************************************************************************/
 #include <qtconcurrentfilter.h>
 #include <qtconcurrentmap.h>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include "generation_helpers.h"
 

diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -67,7 +67,7 @@ int distance(TestIterator &a, TestIterator &b)
 }
 
 #include <qtconcurrentiteratekernel.h>
-#include <QtTest/QtTest>
+#include <QTest>
 
 using namespace QtConcurrent;
 

diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -27,12 +27,12 @@
 ****************************************************************************/
 #include <qtconcurrentmap.h>
 #include <qexception.h>
-
 #include <qdebug.h>
+
 #include <QThread>
 #include <QMutex>
-
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QRandomGenerator>
 
 #include "../testhelper_functions.h"
 

diff --git a/tests/auto/concurrent/qtconcurrentmedian/tst_qtconcurrentmedian.cpp b/tests/auto/concurrent/qtconcurrentmedian/tst_qtconcurrentmedian.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 #include <qtconcurrentmedian.h>
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 class tst_QtConcurrentMedian: public QObject
 {

diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -31,7 +31,9 @@
 #include <QMutexLocker>
 #include <QString>
 #include <QWaitCondition>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QTimer>
+#include <QFutureSynchronizer>
 
 using namespace QtConcurrent;
 

diff --git a/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp b/tests/auto/concurrent/qtconcurrenttask/tst_qtconcurrenttask.cpp
@@ -28,7 +28,10 @@
 
 #include <qtconcurrenttask.h>
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSemaphore>
+
+#include <random>
 
 class tst_QtConcurrentTask : public QObject
 {

diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@@ -29,7 +29,7 @@
 #include <qexception.h>
 #include <QThread>
 #include <QElapsedTimer>
-#include <QtTest/QtTest>
+#include <QTest>
 
 using namespace QtConcurrent;
 

diff --git a/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp b/tests/auto/corelib/animation/qabstractanimation/tst_qabstractanimation.cpp
@@ -29,7 +29,7 @@
 
 #include <QtCore/qabstractanimation.h>
 #include <QtCore/qanimationgroup.h>
-#include <QtTest>
+#include <QTest>
 
 class tst_QAbstractAnimation : public QObject
 {

diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
@@ -26,7 +26,11 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QPauseAnimation>
+#include <QVariantAnimation>
+#include <QPropertyAnimation>
+#include <QSignalSpy>
 
 #include <QtCore/qanimationgroup.h>
 #include <QtCore/qsequentialanimationgroup.h>

diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
@@ -26,7 +26,10 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QVariantAnimation>
+#include <QPropertyAnimation>
+#include <QSignalSpy>
 
 #include <QtCore/qparallelanimationgroup.h>
 

diff --git a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp
@@ -26,12 +26,14 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QtCore/qpauseanimation.h>
 #include <QtCore/qpropertyanimation.h>
 #include <QtCore/qsequentialanimationgroup.h>
 
+#include <QParallelAnimationGroup>
+
 #include <private/qabstractanimation_p.h>
 
 #if defined(Q_OS_WIN) || defined(Q_OS_ANDROID)

diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -26,7 +26,10 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QSignalSpy>
+#include <QAnimationGroup>
+#include <QSequentialAnimationGroup>
 #include <QtCore/qpropertyanimation.h>
 #include <QtCore/qvariantanimation.h>
 #include <private/qabstractanimation_p.h>

diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
@@ -26,7 +26,12 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QVariantAnimation>
+#include <QPropertyAnimation>
+#include <QSignalSpy>
+#include <QParallelAnimationGroup>
+
 #include <QtCore/qanimationgroup.h>
 #include <QtCore/qsequentialanimationgroup.h>
 

diff --git a/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp b/tests/auto/corelib/animation/qvariantanimation/tst_qvariantanimation.cpp
@@ -28,7 +28,7 @@
 
 
 #include <QtCore/qvariantanimation.h>
-#include <QtTest>
+#include <QTest>
 
 class tst_QVariantAnimation : public QObject
 {

diff --git a/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp
@@ -28,7 +28,7 @@
 
 
 #include <QString>
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtDebug>
 
 class tst_q_func_info : public QObject

diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp
@@ -25,7 +25,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtTest/QtTest>
+#include <QTest>
 
 QT_WARNING_DISABLE_DEPRECATED
 

diff --git a/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp b/tests/auto/corelib/global/qfloat16/tst_qfloat16.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QFloat16>
 
 #include <math.h>

diff --git a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include <qdebug.h>
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <qglobal.h>
 #ifdef Q_OS_WIN

diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 
 #include <QPair>
 #include <QSysInfo>

diff --git a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
@@ -28,7 +28,8 @@
 ****************************************************************************/
 
 #include <QtCore/QThread>
-#include <QtTest/QtTest>
+#include <QTest>
+#include <QReadWriteLock>
 
 #if defined(Q_OS_UNIX)
 #include <sys/resource.h>

diff --git a/tests/auto/corelib/global/qhooks/tst_qhooks.cpp b/tests/auto/corelib/global/qhooks/tst_qhooks.cpp
@@ -27,7 +27,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtCore/private/qhooks_p.h>
 
 class tst_QHooks: public QObject

diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <QtGlobal>
 #include "private/qnumeric_p.h"
 

diff --git a/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp b/tests/auto/corelib/global/qoperatingsystemversion/tst_qoperatingsystemversion.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest/QtTest>
+#include <QTest>
 #include <qoperatingsystemversion.h>
 
 class tst_QOperatingSystemVersion : public QObject

diff --git a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtTest>
+#include <QTest>
 #include <qlist.h>
 #include <qobject.h>
 #include <qrandom.h>