1 files changed, 93 insertions, 80 deletions

diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 38f3b04e7..095d4c8f2 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <util.h>
 #include <QtCore/qbuffer.h>
@@ -57,15 +32,16 @@ class tst_QWebEngineProfile : public QObject
 
 private Q_SLOTS:
     void initTestCase();
-    void userDefaultProfile();
+    void defaultProfile_data();
     void defaultProfile();
-    void testProfile();
+    void userDefinedProfile();
     void clearDataFromCache();
     void disableCache();
     void urlSchemeHandlers();
     void urlSchemeHandlerFailRequest();
     void urlSchemeHandlerFailOnRead();
     void urlSchemeHandlerStreaming();
+    void urlSchemeHandlerStreaming2();
     void urlSchemeHandlerRequestHeaders();
     void urlSchemeHandlerInstallation();
     void urlSchemeHandlerXhrStatus();
@@ -103,32 +79,28 @@ void tst_QWebEngineProfile::initTestCase()
     QWebEngineUrlScheme::registerScheme(myscheme);
 }
 
-void tst_QWebEngineProfile::userDefaultProfile()
+static QString StandardCacheLocation() { static auto p = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); return p; }
+static QString StandardAppDataLocation() { static auto p = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); return p; }
+
+void tst_QWebEngineProfile::defaultProfile_data()
 {
-    QWebEngineProfile profile("Default");
-    QVERIFY(!profile.isOffTheRecord());
-    QCOMPARE(profile.storageName(), QStringLiteral("Default"));
-    QCOMPARE(profile.httpCacheType(), QWebEngineProfile::DiskHttpCache);
-    QCOMPARE(profile.persistentCookiesPolicy(), QWebEngineProfile::AllowPersistentCookies);
-    QCOMPARE(profile.cachePath(),
-             QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
-                     + QStringLiteral("/QtWebEngine/Default"));
-    QCOMPARE(profile.persistentStoragePath(),
-             QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
-                     + QStringLiteral("/QtWebEngine/Default"));
+    QTest::addColumn<bool>("userCreated");
+    QTest::addRow("global") << false;
+    QTest::addRow("user") << true;
 }
 
 void tst_QWebEngineProfile::defaultProfile()
 {
-    QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
+    QFETCH(bool, userCreated);
+    QScopedPointer<QWebEngineProfile> p(userCreated ? new QWebEngineProfile : nullptr);
+    QWebEngineProfile *profile = userCreated ? p.get() : QWebEngineProfile::defaultProfile();
     QVERIFY(profile);
     QVERIFY(profile->isOffTheRecord());
+    QCOMPARE(profile->storageName(), QString());
     QCOMPARE(profile->httpCacheType(), QWebEngineProfile::MemoryHttpCache);
     QCOMPARE(profile->persistentCookiesPolicy(), QWebEngineProfile::NoPersistentCookies);
     QCOMPARE(profile->cachePath(), QString());
-    QCOMPARE(profile->persistentStoragePath(),
-             QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
-                     + QStringLiteral("/QtWebEngine/OffTheRecord"));
+    QCOMPARE(profile->persistentStoragePath(), StandardAppDataLocation() + QStringLiteral("/QtWebEngine/OffTheRecord"));
     // TBD: setters do not really work
     profile->setCachePath(QStringLiteral("/home/foo/bar"));
     QCOMPARE(profile->cachePath(), QString());
@@ -140,18 +112,15 @@ void tst_QWebEngineProfile::defaultProfile()
     QCOMPARE(profile->persistentCookiesPolicy(), QWebEngineProfile::NoPersistentCookies);
 }
 
-
-void tst_QWebEngineProfile::testProfile()
+void tst_QWebEngineProfile::userDefinedProfile()
 {
     QWebEngineProfile profile(QStringLiteral("Test"));
     QVERIFY(!profile.isOffTheRecord());
     QCOMPARE(profile.storageName(), QStringLiteral("Test"));
     QCOMPARE(profile.httpCacheType(), QWebEngineProfile::DiskHttpCache);
     QCOMPARE(profile.persistentCookiesPolicy(), QWebEngineProfile::AllowPersistentCookies);
-    QCOMPARE(profile.cachePath(),  QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
-             + QStringLiteral("/QtWebEngine/Test"));
-    QCOMPARE(profile.persistentStoragePath(),  QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
-             + QStringLiteral("/QtWebEngine/Test"));
+    QCOMPARE(profile.cachePath(), StandardCacheLocation() + QStringLiteral("/QtWebEngine/Test"));
+    QCOMPARE(profile.persistentStoragePath(), StandardAppDataLocation() + QStringLiteral("/QtWebEngine/Test"));
 }
 
 class AutoDir : public QDir
@@ -221,6 +190,7 @@ void tst_QWebEngineProfile::clearDataFromCache()
     AutoDir cacheDir("./tst_QWebEngineProfile_clearDataFromCache");
 
     QWebEngineProfile profile(QStringLiteral("clearDataFromCache"));
+    QSignalSpy cacheSpy(&profile, &QWebEngineProfile::clearHttpCacheCompleted);
     profile.setCachePath(cacheDir.path());
     profile.setHttpCacheType(QWebEngineProfile::DiskHttpCache);
 
@@ -232,8 +202,7 @@ void tst_QWebEngineProfile::clearDataFromCache()
     QVERIFY(cacheDir.exists("Cache"));
     qint64 sizeBeforeClear = totalSize(cacheDir);
     profile.clearHttpCache();
-    // Wait for cache to be cleared.
-    QTest::qWait(1000);
+    QTRY_COMPARE(cacheSpy.size(), 1);
     QVERIFY(sizeBeforeClear > totalSize(cacheDir));
 
     (void)server.stop();
@@ -296,10 +265,12 @@ public:
     QList<QPointer<QBuffer>> m_buffers;
 };
 
-class StreamingIODevice : public QIODevice {
+// an evil version constantly claiming to be at end, similar to QNetworkReply
+class StreamingIODeviceBasic : public QIODevice
+{
     Q_OBJECT
 public:
-    StreamingIODevice(QObject *parent) : QIODevice(parent), m_bytesRead(0), m_bytesAvailable(0)
+    StreamingIODeviceBasic(QObject *parent) : QIODevice(parent), m_bytesRead(0), m_bytesAvailable(0)
     {
         setOpenMode(QIODevice::ReadOnly);
         m_timer.start(100, this);
@@ -310,12 +281,11 @@ public:
         const std::lock_guard<QRecursiveMutex> lock(m_mutex);
         return m_bytesAvailable;
     }
-    bool atEnd() const override
+protected:
+    bool internalAtEnd() const
     {
-        const std::lock_guard<QRecursiveMutex> lock(m_mutex);
         return (m_data.size() >= 1000 && m_bytesRead >= 1000);
     }
-protected:
     void timerEvent(QTimerEvent *) override
     {
         const std::lock_guard<QRecursiveMutex> lock(m_mutex);
@@ -336,7 +306,7 @@ protected:
             memcpy(data, m_data.constData() + m_bytesRead, len);
             m_bytesAvailable -= len;
             m_bytesRead += len;
-        } else if (atEnd())
+        } else if (internalAtEnd())
             return -1;
 
         return len;
@@ -346,14 +316,26 @@ protected:
         return 0;
     }
 
-private:
     mutable QRecursiveMutex m_mutex;
+private:
     QByteArray m_data;
     QBasicTimer m_timer;
     int m_bytesRead;
     int m_bytesAvailable;
 };
 
+// A nicer version implementing atEnd
+class StreamingIODevice : public StreamingIODeviceBasic
+{
+public:
+    StreamingIODevice(QObject *parent) : StreamingIODeviceBasic(parent) {}
+    bool atEnd() const override
+    {
+        const std::lock_guard<QRecursiveMutex> lock(m_mutex);
+        return internalAtEnd();
+    }
+};
+
 class StreamingUrlSchemeHandler : public QWebEngineUrlSchemeHandler
 {
 public:
@@ -368,6 +350,20 @@ public:
     }
 };
 
+class StreamingUrlSchemeHandler2 : public QWebEngineUrlSchemeHandler
+{
+public:
+    StreamingUrlSchemeHandler2(QObject *parent = nullptr)
+        : QWebEngineUrlSchemeHandler(parent)
+    {
+    }
+
+    void requestStarted(QWebEngineUrlRequestJob *job) override
+    {
+        job->reply("text/plain;charset=utf-8", new StreamingIODeviceBasic(job));
+    }
+};
+
 void tst_QWebEngineProfile::urlSchemeHandlers()
 {
     RedirectingUrlSchemeHandler lettertoHandler;
@@ -411,8 +407,8 @@ void tst_QWebEngineProfile::urlSchemeHandlers()
     QCOMPARE(toPlainTextSync(view.page()), url.toString());
 
     // Check that all buffers got deleted
-    QCOMPARE(gopherHandler.m_buffers.count(), 2);
-    for (int i = 0; i < gopherHandler.m_buffers.count(); ++i)
+    QCOMPARE(gopherHandler.m_buffers.size(), 2);
+    for (int i = 0; i < gopherHandler.m_buffers.size(); ++i)
         QVERIFY(gopherHandler.m_buffers.at(i).isNull());
 }
 
@@ -473,7 +469,7 @@ void tst_QWebEngineProfile::urlSchemeHandlerFailRequest()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     view.load(QUrl(QStringLiteral("foo://bar")));
     view.show();
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
     QCOMPARE(toPlainTextSync(view.page()), QString());
 }
 
@@ -488,7 +484,7 @@ void tst_QWebEngineProfile::urlSchemeHandlerFailOnRead()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     view.load(QUrl(QStringLiteral("foo://bar")));
     view.show();
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
     QCOMPARE(toPlainTextSync(view.page()), QString());
 }
 
@@ -503,7 +499,24 @@ void tst_QWebEngineProfile::urlSchemeHandlerStreaming()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     view.load(QUrl(QStringLiteral("stream://whatever")));
     view.show();
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
+    QByteArray result;
+    result.append(1000, 'c');
+    QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
+}
+
+void tst_QWebEngineProfile::urlSchemeHandlerStreaming2()
+{
+    StreamingUrlSchemeHandler2 handler;
+    QWebEngineProfile profile;
+    profile.installUrlSchemeHandler("stream", &handler);
+    QWebEngineView view;
+    QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
+    view.setPage(new QWebEnginePage(&profile, &view));
+    view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
+    view.load(QUrl(QStringLiteral("stream://whatever")));
+    view.show();
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
     QByteArray result;
     result.append(1000, 'c');
     QCOMPARE(toPlainTextSync(view.page()), QString::fromLatin1(result));
@@ -564,7 +577,7 @@ void tst_QWebEngineProfile::urlSchemeHandlerRequestHeaders()
     QWebEnginePage page(&profile);
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.load(QUrl(QStringLiteral("myscheme://whatever")));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 30000);
 }
 
 void tst_QWebEngineProfile::urlSchemeHandlerInstallation()
@@ -730,12 +743,12 @@ void tst_QWebEngineProfile::urlSchemeHandlerScriptModule()
     QWebEnginePage page(&profile);
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(QStringLiteral("<html><head><script src=\"aviancarrier:///\"></script></head><body>Test1</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("test")).toString(), QStringLiteral("SUCCESS"));
 
     loadFinishedSpy.clear();
     page.setHtml(QStringLiteral("<html><head><script type=\"module\" src=\"aviancarrier:///\"></script></head><body>Test2</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("test")).toString(), QStringLiteral("SUCCESS"));
 }
 
@@ -770,7 +783,7 @@ void tst_QWebEngineProfile::customUserAgent()
     QWebEnginePage page;
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(QStringLiteral("<html><body>Hello world!</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     // First test the user-agent is default
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), defaultUserAgent);
@@ -783,7 +796,7 @@ void tst_QWebEngineProfile::customUserAgent()
     QWebEnginePage page2(&testProfile);
     QSignalSpy loadFinishedSpy2(&page2, SIGNAL(loadFinished(bool)));
     page2.setHtml(QStringLiteral("<html><body>Hello again!</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy2.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy2.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page2, QStringLiteral("navigator.userAgent")).toString(), testUserAgent);
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.userAgent")).toString(), defaultUserAgent);
 
@@ -797,7 +810,7 @@ void tst_QWebEngineProfile::httpAcceptLanguage()
     QWebEnginePage page;
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.setHtml(QStringLiteral("<html><body>Hello world!</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
     QStringList defaultLanguages = evaluateJavaScriptSync(&page, QStringLiteral("navigator.languages")).toStringList();
 
@@ -809,7 +822,7 @@ void tst_QWebEngineProfile::httpAcceptLanguage()
     QWebEnginePage page2(&testProfile);
     QSignalSpy loadFinishedSpy2(&page2, SIGNAL(loadFinished(bool)));
     page2.setHtml(QStringLiteral("<html><body>Hello again!</body></html>"));
-    QTRY_COMPARE(loadFinishedSpy2.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy2.size(), 1);
     QCOMPARE(evaluateJavaScriptSync(&page2, QStringLiteral("navigator.languages")).toStringList(), QStringList(testLang));
     // Test the old one wasn't affected
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("navigator.languages")).toStringList(), defaultLanguages);
@@ -826,7 +839,7 @@ void tst_QWebEngineProfile::downloadItem()
     QWebEnginePage page(&testProfile);
     QSignalSpy downloadSpy(&testProfile, SIGNAL(downloadRequested(QWebEngineDownloadRequest *)));
     page.load(QUrl::fromLocalFile(QCoreApplication::applicationFilePath()));
-    QTRY_COMPARE(downloadSpy.count(), 1);
+    QTRY_COMPARE(downloadSpy.size(), 1);
 }
 
 void tst_QWebEngineProfile::changePersistentPath()
@@ -952,29 +965,29 @@ void tst_QWebEngineProfile::initiator()
     QWebEnginePage page(&profile, nullptr);
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.load(QUrl("about:blank"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     loadFinishedSpy.clear();
 
     // about:blank has a unique origin, so initiator should be QUrl("null")
     evaluateJavaScriptSync(&page, "window.location = 'foo:bar'");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     loadFinishedSpy.clear();
     QCOMPARE(handler.initiator, QUrl("null"));
 
     page.setHtml("", QUrl("http://test:123/foo%20bar"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     loadFinishedSpy.clear();
 
     // baseUrl determines the origin, so QUrl("http://test:123")
     evaluateJavaScriptSync(&page, "window.location = 'foo:bar'");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     loadFinishedSpy.clear();
     QCOMPARE(handler.initiator, QUrl("http://test:123"));
 
     // Directly calling load/setUrl should have initiator QUrl(), meaning
     // browser-initiated, trusted.
     page.load(QUrl("foo:bar"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 10000);
     QCOMPARE(handler.initiator, QUrl());
 }
 
@@ -990,7 +1003,7 @@ void tst_QWebEngineProfile::badDeleteOrder()
 
     QSignalSpy spyLoadFinished(page, SIGNAL(loadFinished(bool)));
     page->setHtml(QStringLiteral("<html><body><h1>Badly handled page!</h1></body></html>"));
-    QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QTRY_COMPARE(spyLoadFinished.size(), 1);
 
     delete profile;
     delete view;
@@ -1006,7 +1019,7 @@ void tst_QWebEngineProfile::qtbug_71895()
     view.page()->profile()->setHttpCacheType(QWebEngineProfile::NoCache);
     view.page()->profile()->cookieStore()->deleteAllCookies();
     view.page()->profile()->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies);
-    bool gotSignal = loadSpy.count() || loadSpy.wait(20000);
+    bool gotSignal = loadSpy.size() || loadSpy.wait(20000);
     if (!gotSignal)
         QSKIP("Couldn't load page from network, skipping test.");
 }