summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-02-11 10:03:24 +0100
committerMichal Klocek <michal.klocek@qt.io>2021-05-22 14:10:10 +0200
commit97dcbd4019456b9a1c567faddb0521b7505d80fc (patch)
tree9c77c5640b1563d853c79898cd64d87252fe8c41 /tests/auto/widgets/loadsignals/tst_loadsignals.cpp
parentdd523573f2981cc58d4da0ec6e2b061a6172a8eb (diff)
Add tests to the cmake build
Use QT_TESTCASE_SOURCEDIR instead of TESTS_SOURCE_DIR. Introduce Test::HttpServer and Test::Util targets. Query shared data location from server. Clean up "shared" resources. Note QT_TESTCASE_SOURCEDIR must be turned into the canonical form since the user can call on windows: "cmake \path\to\foo" instead of "cmake c:\path\to\foo" which will break all file:// urls. Note this patch breaks qmake builds. Task-number: QTBUG-91760 Change-Id: Ibc1f904ac9acd375d1ff70ff80f0c533497e3f20 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'tests/auto/widgets/loadsignals/tst_loadsignals.cpp')
-rw-r--r--tests/auto/widgets/loadsignals/tst_loadsignals.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index fe01bede4..12a497dd9 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -29,7 +29,7 @@
#include <QtTest/QtTest>
#include "httpserver.h"
-#include "../util.h"
+#include <util.h>
#include "qdebug.h"
#include "qwebenginepage.h"
#include "qwebengineprofile.h"
@@ -276,7 +276,7 @@ void tst_LoadSignals::rejectNavigationRequest()
void tst_LoadSignals::monotonicity()
{
HttpServer server;
- server.setResourceDirs({ TESTS_SHARED_DATA_DIR });
+ server.setResourceDirs({ server.sharedDataDir() });
connect(&server, &HttpServer::newRequest, [] (HttpReqRep *) {
QTest::qWait(250); // just add delay to trigger some progress for every sub resource
});
@@ -376,7 +376,7 @@ void tst_LoadSignals::numberOfStartedAndFinishedSignalsIsSame()
QFETCH(QString, imageResourceUrl);
HttpServer server;
- server.setResourceDirs({ TESTS_SOURCE_DIR "/qwebengineprofile/resources" });
+ server.setResourceDirs({ server.sharedDataDir() });
QVERIFY(server.start());
QUrl serverImage = server.url("/hedgehog.png");