diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
| commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
| tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /tests | |
| parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) | |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'tests')
3 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_viewSource.qml b/tests/auto/quick/qmltests/data/tst_viewSource.qml index d0bc0529d..b21d72eb2 100644 --- a/tests/auto/quick/qmltests/data/tst_viewSource.qml +++ b/tests/auto/quick/qmltests/data/tst_viewSource.qml @@ -63,8 +63,10 @@ TestWebEngineView { name: "WebEngineViewSource" function init() { + webEngineView.loadStatus = null; webEngineView.url = Qt.resolvedUrl("test1.html"); - verify(webEngineView.waitForLoadSucceeded(20000)); + tryCompare(webEngineView, "loadStatus", WebEngineView.LoadSucceededStatus); + webEngineView.loadStatus = null; newViewRequestedSpy.clear(); titleChangedSpy.clear(); @@ -113,9 +115,9 @@ TestWebEngineView { webEngineView.url = row.userInputUrl; if (row.loadSucceed) { - verify(webEngineView.waitForLoadSucceeded(15000)); + tryCompare(webEngineView, "loadStatus", WebEngineView.LoadSucceededStatus); } else { - verify(webEngineView.waitForLoadFailed(15000)); + tryCompare(webEngineView, "loadStatus", WebEngineView.LoadFailedStatus, 15000); } tryVerify(function() { return titleChangedSpy.count == 1; }); diff --git a/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp b/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp index e6db114b1..e8ac9676f 100644 --- a/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp +++ b/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp @@ -190,7 +190,7 @@ void tst_QWebEngineDownloads::downloadLink_data() /* fileMimeTypeDeclared */ << QByteArrayLiteral("text/plain") /* fileMimeTypeDetected */ << QByteArrayLiteral("text/plain") /* fileDisposition */ << QByteArrayLiteral("") - /* fileHasReferer */ << false // crbug.com/455987 + /* fileHasReferer */ << true /* fileAction */ << FileIsDownloaded /* downloadType */ << QWebEngineDownloadItem::DownloadAttribute; @@ -216,7 +216,7 @@ void tst_QWebEngineDownloads::downloadLink_data() /* fileMimeTypeDeclared */ << QByteArrayLiteral("text/plain") /* fileMimeTypeDetected */ << QByteArrayLiteral("text/plain") /* fileDisposition */ << QByteArrayLiteral("attachment") - /* fileHasReferer */ << false // crbug.com/455987 + /* fileHasReferer */ << true /* fileAction */ << FileIsDownloaded /* downloadType */ << QWebEngineDownloadItem::Attachment; diff --git a/tests/auto/widgets/qwebenginespellcheck/tst_qwebenginespellcheck.cpp b/tests/auto/widgets/qwebenginespellcheck/tst_qwebenginespellcheck.cpp index 4f14f29f9..0dec6d72f 100644 --- a/tests/auto/widgets/qwebenginespellcheck/tst_qwebenginespellcheck.cpp +++ b/tests/auto/widgets/qwebenginespellcheck/tst_qwebenginespellcheck.cpp @@ -200,7 +200,7 @@ void tst_QWebEngineSpellcheck::spellcheck_data() QTest::addColumn<QStringList>("languages"); QTest::addColumn<QStringList>("suggestions"); QTest::newRow("en-US") << QStringList({"en-US"}) << QStringList({"low", "love"}); - QTest::newRow("en-US,de-DE") << QStringList({"en-US", "de-DE"}) << QStringList({"low", "löwe", "love"}); + QTest::newRow("en-US,de-DE") << QStringList({"en-US", "de-DE"}) << QStringList({"löwe", "low", "love"}); } QTEST_MAIN(tst_QWebEngineSpellcheck) |