From 8b848e4aee238edb58dba0ded8d773c8b70392f6 Mon Sep 17 00:00:00 2001 From: Tamas Zakor Date: Tue, 28 May 2019 10:20:36 +0200 Subject: Refactor tst_QWebEngineDownloadItem::downloadPathValidation() Set temporary download path with new API. Change-Id: Ie448b14c9b063db45c99406bc491d92f3d61cb15 Reviewed-by: Allan Sandfeld Jensen --- .../tst_qwebenginedownloaditem.cpp | 31 +++++++++------------- 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp index bc474457a..3566c2216 100644 --- a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp +++ b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp @@ -1124,6 +1124,7 @@ void tst_QWebEngineDownloadItem::downloadPathValidation() QTemporaryDir tmpDir; QVERIFY(tmpDir.isValid()); + m_profile->setDownloadPath(tmpDir.path()); // Set up HTTP server ScopedConnection sc1 = connect(m_server, &HttpServer::newRequest, [&](HttpReqRep *rr) { @@ -1145,12 +1146,7 @@ void tst_QWebEngineDownloadItem::downloadPathValidation() originalDownloadPath = item->path(); item->setPath(downloadPath); - // TODO: Do not cancel download from 5.13. This is for not messing up system download path. - // Use m_profile->setDownloadPath(tmpDir.path()) at initialization. - if (item->path() != downloadPath) - item->cancel(); - else - item->accept(); + item->accept(); connect(item, &QWebEngineDownloadItem::stateChanged, [&, item](QWebEngineDownloadItem::DownloadState downloadState) { if (downloadState == QWebEngineDownloadItem::DownloadInterrupted) { @@ -1185,8 +1181,8 @@ void tst_QWebEngineDownloadItem::downloadPathValidation() downloadPath = tmpDir.path(); m_page->setUrl(m_server->url("/" + fileName)); QTRY_VERIFY(downloadItem); - QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled); - QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::UserCanceled); + QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted); + QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason); QCOMPARE(downloadItem->path(), originalDownloadPath); // Set only the directory path with separator. @@ -1195,8 +1191,8 @@ void tst_QWebEngineDownloadItem::downloadPathValidation() downloadPath = tmpDir.path() + QDir::separator(); m_page->setUrl(m_server->url("/" + fileName)); QTRY_VERIFY(downloadItem); - QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled); - QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::UserCanceled); + QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted); + QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason); QCOMPARE(downloadItem->path(), originalDownloadPath); // Set only the directory with the current directory path without ending separator. @@ -1205,8 +1201,8 @@ void tst_QWebEngineDownloadItem::downloadPathValidation() downloadPath = "."; m_page->setUrl(m_server->url("/" + fileName)); QTRY_VERIFY(downloadItem); - QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled); - QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::UserCanceled); + QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted); + QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason); QCOMPARE(downloadItem->path(), originalDownloadPath); // Set only the directory with the current directory path with ending separator. @@ -1215,24 +1211,23 @@ void tst_QWebEngineDownloadItem::downloadPathValidation() downloadPath = "./"; m_page->setUrl(m_server->url("/" + fileName)); QTRY_VERIFY(downloadItem); - QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled); - QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::UserCanceled); + QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted); + QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason); QCOMPARE(downloadItem->path(), originalDownloadPath); - - downloadItem.clear(); originalDownloadPath = ""; downloadPath = "..."; m_page->setUrl(m_server->url("/" + fileName)); QTRY_VERIFY(downloadItem); - QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled); #if !defined(Q_OS_WIN) + QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled); QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::FileFailed); QCOMPARE(downloadItem->path(), downloadPath); #else // Windows interprets the "..." path as a valid path. It will be the current path. - QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::UserCanceled); + QTRY_COMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCompleted); + QCOMPARE(downloadItem->interruptReason(), QWebEngineDownloadItem::NoReason); QCOMPARE(downloadItem->path(), originalDownloadPath); #endif // !defined(Q_OS_WIN) QDir::setCurrent(oldPath); -- cgit v1.2.3