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>

2 files changed, 63 insertions, 3 deletions

diff --git a/tests/auto/widgets/loadsignals/CMakeLists.txt b/tests/auto/widgets/loadsignals/CMakeLists.txt
new file mode 100644
index 000000000..f648cf6d3
--- /dev/null
+++ b/tests/auto/widgets/loadsignals/CMakeLists.txt
@@ -0,0 +1,60 @@
+include(../../httpserver/httpserver.cmake)
+include(../../util/util.cmake)
+
+qt_internal_add_test(tst_loadsignals
+    SOURCES
+        tst_loadsignals.cpp
+    LIBRARIES
+        Qt::WebEngineWidgets
+        Test::HttpServer
+        Test::Util
+)
+
+get_target_property(sharedData Test::HttpServer SHARED_DATA)
+
+set_source_files_properties("${sharedData}/loadprogress/downloadable.tar.gz"
+    PROPERTIES QT_RESOURCE_ALIAS "downloadable.tar.gz"
+)
+set_source_files_properties("${sharedData}/loadprogress/page1.html"
+    PROPERTIES QT_RESOURCE_ALIAS "page1.html"
+)
+set_source_files_properties("${sharedData}/loadprogress/page2.html"
+    PROPERTIES QT_RESOURCE_ALIAS "page2.html"
+)
+set_source_files_properties("${sharedData}/loadprogress/page3.html"
+    PROPERTIES QT_RESOURCE_ALIAS "page3.html"
+)
+set_source_files_properties("${sharedData}/loadprogress/page4.html"
+    PROPERTIES QT_RESOURCE_ALIAS "page4.html"
+)
+set_source_files_properties("${sharedData}/loadprogress/page5.html"
+    PROPERTIES QT_RESOURCE_ALIAS "page5.html"
+)
+set_source_files_properties("${sharedData}/loadprogress/page6.html"
+    PROPERTIES QT_RESOURCE_ALIAS "page6.html"
+)
+set_source_files_properties("${sharedData}/loadprogress/page7.html"
+    PROPERTIES QT_RESOURCE_ALIAS "page7.html"
+)
+set_source_files_properties("${sharedData}/loadprogress/page8.html"
+    PROPERTIES QT_RESOURCE_ALIAS "page8.html"
+)
+
+set(tst_loadsignals_resource_files
+    "${sharedData}/loadprogress/downloadable.tar.gz"
+    "${sharedData}/loadprogress/page1.html"
+    "${sharedData}/loadprogress/page2.html"
+    "${sharedData}/loadprogress/page3.html"
+    "${sharedData}/loadprogress/page4.html"
+    "${sharedData}/loadprogress/page5.html"
+    "${sharedData}/loadprogress/page6.html"
+    "${sharedData}/loadprogress/page7.html"
+    "${sharedData}/loadprogress/page8.html"
+)
+
+qt_add_resource(tst_loadsignals "tst_loadsignals"
+    PREFIX
+        "/resources"
+    FILES
+        ${tst_loadsignals_resource_files}
+)
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");