1 files changed, 44 insertions, 12 deletions
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index a7a5ba62a..1dd8a38c8 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -67,6 +67,7 @@ private Q_SLOTS:
     void urlSchemeHandlerInstallation();
     void urlSchemeHandlerXhrStatus();
     void urlSchemeHandlerScriptModule();
+    void urlSchemeHandlerLongReply();
     void customUserAgent();
     void httpAcceptLanguage();
     void downloadItem();
@@ -153,17 +154,17 @@ void tst_QWebEngineProfile::testProfile()
 
 void tst_QWebEngineProfile::clearDataFromCache()
 {
-    QWebEnginePage page;
-
     QDir cacheDir("./tst_QWebEngineProfile_cacheDir");
     cacheDir.makeAbsolute();
     if (cacheDir.exists())
         cacheDir.removeRecursively();
     cacheDir.mkpath(cacheDir.path());
 
-    QWebEngineProfile *profile = page.profile();
-    profile->setCachePath(cacheDir.path());
-    profile->setHttpCacheType(QWebEngineProfile::DiskHttpCache);
+    QWebEngineProfile profile(QStringLiteral("Test"));
+    profile.setCachePath(cacheDir.path());
+    profile.setHttpCacheType(QWebEngineProfile::DiskHttpCache);
+
+    QWebEnginePage page(&profile, nullptr);
 
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
     page.load(QUrl("http://qt-project.org"));
@@ -180,7 +181,7 @@ void tst_QWebEngineProfile::clearDataFromCache()
     QSignalSpy directoryChangedSpy(&fileSystemWatcher, SIGNAL(directoryChanged(const QString &)));
 
     // It deletes most of the files, but not all of them.
-    profile->clearHttpCache();
+    profile.clearHttpCache();
     QTest::qWait(1000);
     QTRY_VERIFY(directoryChangedSpy.count() > 0);
 
@@ -294,7 +295,7 @@ protected:
             memcpy(data, m_data.constData() + m_bytesRead, len);
             m_bytesAvailable -= len;
             m_bytesRead += len;
-        } else if (m_data.size() > 0)
+        } else if (atEnd())
             return -1;
 
         return len;
@@ -714,6 +715,31 @@ void tst_QWebEngineProfile::urlSchemeHandlerScriptModule()
     QCOMPARE(evaluateJavaScriptSync(&page, QStringLiteral("test")).toString(), QStringLiteral("SUCCESS"));
 }
 
+class LongReplyUrlSchemeHandler : public QWebEngineUrlSchemeHandler
+{
+public:
+    LongReplyUrlSchemeHandler(QObject *parent = nullptr) : QWebEngineUrlSchemeHandler(parent) {}
+    ~LongReplyUrlSchemeHandler() {}
+
+    void requestStarted(QWebEngineUrlRequestJob *job)
+    {
+        QBuffer *buffer = new QBuffer(job);
+        buffer->setData(QByteArray(128 * 1024, ' ') +
+                        "<html><head><title>Minify this!</title></head></html>");
+        job->reply("text/html", buffer);
+    }
+};
+
+void tst_QWebEngineProfile::urlSchemeHandlerLongReply()
+{
+    LongReplyUrlSchemeHandler handler;
+    QWebEngineProfile profile;
+    profile.installUrlSchemeHandler("aviancarrier", &handler);
+    QWebEnginePage page(&profile);
+    page.load(QUrl("aviancarrier:/"));
+    QTRY_COMPARE(page.title(), QString("Minify this!"));
+}
+
 void tst_QWebEngineProfile::customUserAgent()
 {
     QString defaultUserAgent = QWebEngineProfile::defaultProfile()->httpUserAgent();
@@ -815,26 +841,32 @@ void tst_QWebEngineProfile::initiator()
     InitiatorSpy handler;
     QWebEngineProfile profile;
     profile.installUrlSchemeHandler("foo", &handler);
-    QWebEnginePage page(&profile);
+    QWebEnginePage page(&profile, nullptr);
     QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool)));
+    page.load(QUrl("about:blank"));
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    loadFinishedSpy.clear();
 
     // about:blank has a unique origin, so initiator should be QUrl("null")
     evaluateJavaScriptSync(&page, "window.location = 'foo:bar'");
-    QVERIFY(loadFinishedSpy.wait());
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    loadFinishedSpy.clear();
     QCOMPARE(handler.initiator, QUrl("null"));
 
     page.setHtml("", QUrl("http://test:123/foo%20bar"));
-    QVERIFY(loadFinishedSpy.wait());
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    loadFinishedSpy.clear();
 
     // baseUrl determines the origin, so QUrl("http://test:123")
     evaluateJavaScriptSync(&page, "window.location = 'foo:bar'");
-    QVERIFY(loadFinishedSpy.wait());
+    QTRY_COMPARE(loadFinishedSpy.count(), 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"));
-    QVERIFY(loadFinishedSpy.wait());
+    QTRY_COMPARE(loadFinishedSpy.count(), 1);
     QCOMPARE(handler.initiator, QUrl());
 }