diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-02-11 10:03:24 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-05-22 14:10:10 +0200 |
| commit | 97dcbd4019456b9a1c567faddb0521b7505d80fc (patch) | |
| tree | 9c77c5640b1563d853c79898cd64d87252fe8c41 /tests/auto/quick/inspectorserver | |
| parent | dd523573f2981cc58d4da0ec6e2b061a6172a8eb (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/quick/inspectorserver')
| -rw-r--r-- | tests/auto/quick/inspectorserver/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/auto/quick/inspectorserver/html/basic_page.html | 6 | ||||
| -rw-r--r-- | tests/auto/quick/inspectorserver/tst_inspectorserver.cpp | 11 |
3 files changed, 21 insertions, 5 deletions
diff --git a/tests/auto/quick/inspectorserver/CMakeLists.txt b/tests/auto/quick/inspectorserver/CMakeLists.txt new file mode 100644 index 000000000..e2c3bb2ab --- /dev/null +++ b/tests/auto/quick/inspectorserver/CMakeLists.txt @@ -0,0 +1,9 @@ +qt_internal_add_test(tst_inspectorserver + SOURCES + tst_inspectorserver.cpp + LIBRARIES + Qt::CorePrivate + Qt::WebEngineQuickPrivate +) + + diff --git a/tests/auto/quick/inspectorserver/html/basic_page.html b/tests/auto/quick/inspectorserver/html/basic_page.html new file mode 100644 index 000000000..53726e4a6 --- /dev/null +++ b/tests/auto/quick/inspectorserver/html/basic_page.html @@ -0,0 +1,6 @@ +<html> +<head> +<title> Basic Page </title> +</head> +<h1>Basic page</h1> +</html> diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp index bc5aed9ef..de49f143c 100644 --- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp +++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp @@ -70,8 +70,6 @@ tst_InspectorServer::tst_InspectorServer() void tst_InspectorServer::prepareWebViewComponent() { static QQmlEngine* engine = new QQmlEngine(this); - engine->addImportPath(QString::fromUtf8(IMPORT_DIR)); - m_component.reset(new QQmlComponent(engine, this)); m_component->setData(QByteArrayLiteral("import QtQuick 2.0\n" @@ -119,7 +117,8 @@ QJsonArray tst_InspectorServer::fetchPageList() const void tst_InspectorServer::testPageList() { - const QUrl testPageUrl = QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html")); + const QUrl testPageUrl = QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() + + QLatin1String("/html/basic_page.html")); QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest))); webView()->setUrl(testPageUrl); QTRY_VERIFY(loadSpy.size() && !webView()->isLoading()); @@ -132,7 +131,8 @@ void tst_InspectorServer::testPageList() void tst_InspectorServer::testRemoteDebuggingMessage() { - const QUrl testPageUrl = QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html")); + const QUrl testPageUrl = QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() + + QLatin1String("/html/basic_page.html")); QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest))); webView()->setUrl(testPageUrl); QTRY_VERIFY(loadSpy.size() && !webView()->isLoading()); @@ -166,7 +166,8 @@ void tst_InspectorServer::testRemoteDebuggingMessage() void tst_InspectorServer::openRemoteDebuggingSession() { - const QUrl testPageUrl = QUrl::fromLocalFile(QLatin1String(TESTS_SOURCE_DIR "/html/basic_page.html")); + const QUrl testPageUrl = QUrl::fromLocalFile(QDir(QT_TESTCASE_SOURCEDIR).canonicalPath() + + QLatin1String("/html/basic_page.html")); QSignalSpy loadSpy(webView(), SIGNAL(loadingChanged(QWebEngineLoadRequest))); webView()->setUrl(testPageUrl); QTRY_VERIFY(loadSpy.size() && !webView()->isLoading()); |