diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-19 17:19:54 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-08 17:06:37 +0000 |
commit | 7473a43beff891c93a245620b6307f3a073dba28 (patch) | |
tree | 0dcf61d2cca0ee495a73f4f85f5df83b110e423c /tests/auto/core/qwebenginecookiestore | |
parent | 8ef9f9faf09b7bae9ba548443434eb84b07c883c (diff) |
Cleanup core API tests
Use in-memory profile and do not use qwebengineviews when all we need
are qwebenginepages.
Change-Id: I5798c761bccfc0b4bf2cf623e7db35f033bdfd84
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tests/auto/core/qwebenginecookiestore')
-rw-r--r-- | tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp index 65d4ec295..930c208ee 100644 --- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp +++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. @@ -32,7 +32,6 @@ #include <QtWebEngineCore/qwebenginecookiestore.h> #include <QtWebEngineWidgets/qwebenginepage.h> #include <QtWebEngineWidgets/qwebengineprofile.h> -#include <QtWebEngineWidgets/qwebengineview.h> class tst_QWebEngineCookieStore : public QObject { @@ -52,6 +51,9 @@ private Q_SLOTS: void cookieSignals(); void setAndDeleteCookie(); void batchCookieTasks(); + +private: + QWebEngineProfile m_profile; }; tst_QWebEngineCookieStore::tst_QWebEngineCookieStore() @@ -68,6 +70,7 @@ void tst_QWebEngineCookieStore::init() void tst_QWebEngineCookieStore::cleanup() { + m_profile.cookieStore()->deleteAllCookies(); } void tst_QWebEngineCookieStore::initTestCase() @@ -80,15 +83,15 @@ void tst_QWebEngineCookieStore::cleanupTestCase() void tst_QWebEngineCookieStore::cookieSignals() { - QWebEngineView view; - QWebEngineCookieStore *client = view.page()->profile()->cookieStore(); - client->deleteAllCookies(); + QWebEnginePage page(&m_profile); + + QWebEngineCookieStore *client = m_profile.cookieStore(); - QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool))); + QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool))); QSignalSpy cookieAddedSpy(client, SIGNAL(cookieAdded(const QNetworkCookie &))); QSignalSpy cookieRemovedSpy(client, SIGNAL(cookieRemoved(const QNetworkCookie &))); - view.load(QUrl("qrc:///resources/index.html")); + page.load(QUrl("qrc:///resources/index.html")); QTRY_COMPARE(loadSpy.count(), 1); QVariant success = loadSpy.takeFirst().takeFirst(); @@ -110,11 +113,10 @@ void tst_QWebEngineCookieStore::cookieSignals() void tst_QWebEngineCookieStore::setAndDeleteCookie() { - QWebEngineView view; - QWebEngineCookieStore *client = view.page()->profile()->cookieStore(); - client->deleteAllCookies(); + QWebEnginePage page(&m_profile); + QWebEngineCookieStore *client = m_profile.cookieStore(); - QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool))); + QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool))); QSignalSpy cookieAddedSpy(client, SIGNAL(cookieAdded(const QNetworkCookie &))); QSignalSpy cookieRemovedSpy(client, SIGNAL(cookieRemoved(const QNetworkCookie &))); @@ -130,7 +132,7 @@ void tst_QWebEngineCookieStore::setAndDeleteCookie() QTRY_COMPARE(cookieAddedSpy.count(),2); client->deleteCookie(cookie1); - view.load(QUrl("qrc:///resources/content.html")); + page.load(QUrl("qrc:///resources/content.html")); QTRY_COMPARE(loadSpy.count(), 1); QVariant success = loadSpy.takeFirst().takeFirst(); @@ -151,11 +153,10 @@ void tst_QWebEngineCookieStore::setAndDeleteCookie() void tst_QWebEngineCookieStore::batchCookieTasks() { - QWebEngineView view; - QWebEngineCookieStore *client = view.page()->profile()->cookieStore(); - client->deleteAllCookies(); + QWebEnginePage page(&m_profile); + QWebEngineCookieStore *client = m_profile.cookieStore(); - QSignalSpy loadSpy(&view, SIGNAL(loadFinished(bool))); + QSignalSpy loadSpy(&page, SIGNAL(loadFinished(bool))); QSignalSpy cookieAddedSpy(client, SIGNAL(cookieAdded(const QNetworkCookie &))); QSignalSpy cookieRemovedSpy(client, SIGNAL(cookieRemoved(const QNetworkCookie &))); @@ -167,7 +168,7 @@ void tst_QWebEngineCookieStore::batchCookieTasks() client->setCookie(cookie2); QTRY_COMPARE(cookieAddedSpy.count(), 2); - view.load(QUrl("qrc:///resources/index.html")); + page.load(QUrl("qrc:///resources/index.html")); QTRY_COMPARE(loadSpy.count(), 1); QVariant success = loadSpy.takeFirst().takeFirst(); |