From c3a81005a3bae6cc40e6c2421cabf0137ff8ff00 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Mon, 22 Mar 2021 13:10:41 +0100
Subject: Remove obsolete loadSignals test
 secondLoadForError_WhenErrorPageEnabled

Was added as is in 89bc70bf13, and was already blacklisted. Mostly
duplicates logic of 'loadFinishedAfterNotFoundError' (which was added
much earlier in aa8b11d3a5), but with a different expectations for the
number of signals emitted. And that was never realized.

Change-Id: I97bb539b936361089733dc6f26985c09c7bbc3d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 tests/auto/widgets/loadsignals/BLACKLIST           |  3 --
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp | 37 ----------------------
 2 files changed, 40 deletions(-)

(limited to 'tests/auto/widgets/loadsignals')

diff --git a/tests/auto/widgets/loadsignals/BLACKLIST b/tests/auto/widgets/loadsignals/BLACKLIST
index e5c625bd6..ffe1f71fe 100644
--- a/tests/auto/widgets/loadsignals/BLACKLIST
+++ b/tests/auto/widgets/loadsignals/BLACKLIST
@@ -1,6 +1,3 @@
-[secondLoadForError_WhenErrorPageEnabled:ErrorPageEnabled]
-*
-
 # QTBUG-65223
 [loadStartedAndFinishedCount:WithAnchorClickedFromJS]
 *
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 2dfe341d0..8112a274c 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -48,8 +48,6 @@ private Q_SLOTS:
     void monotonicity();
     void loadStartedAndFinishedCount_data();
     void loadStartedAndFinishedCount();
-    void secondLoadForError_WhenErrorPageEnabled_data();
-    void secondLoadForError_WhenErrorPageEnabled();
     void loadAfterInPageNavigation_qtbug66869();
     void fileDownloadDoesNotTriggerLoadSignals_qtbug66661();
     void numberOfStartedAndFinishedSignalsIsSame();
@@ -149,41 +147,6 @@ void tst_LoadSignals::monotonicity()
     QCOMPARE(loadProgressSpy.last()[0].toInt(), 100);
 }
 
-/**
-  * Test that we get a second loadStarted and loadFinished signal
-  * for error-pages (unless error-pages are disabled)
-  */
-void tst_LoadSignals::secondLoadForError_WhenErrorPageEnabled_data()
-{
-    QTest::addColumn<bool>("enabled");
-    // in this case, we get no second loadStarted and loadFinished, although we had
-    // agreed on making the navigation to an error page an individual load
-    QTest::newRow("ErrorPageEnabled") << true;
-    QTest::newRow("ErrorPageDisabled") << false;
-}
-
-void tst_LoadSignals::secondLoadForError_WhenErrorPageEnabled()
-{
-    QFETCH(bool, enabled);
-    view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, enabled);
-    int expectedLoadCount = (enabled ? 2 : 1);
-
-    // RFC 2606 guarantees that this will never become a valid domain
-    view.load(QUrl("http://nonexistent.invalid"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), expectedLoadCount, 10000);
-    QVERIFY(!loadFinishedSpy[0][0].toBool());
-    if (enabled)
-        QVERIFY(loadFinishedSpy[1][0].toBool());
-
-    // Wait for 10 seconds (abort waiting if another loadStarted or loadFinished occurs)
-    QTRY_LOOP_IMPL((loadStartedSpy.size() != expectedLoadCount)
-                || (loadFinishedSpy.size() != expectedLoadCount), 10000, 100);
-
-    // No further loadStarted should have occurred within this time
-    QCOMPARE(loadStartedSpy.size(), expectedLoadCount);
-    QCOMPARE(loadFinishedSpy.size(), expectedLoadCount);
-}
-
 /**
   * Test that a second load after an in-page navigation receives its expected loadStarted and
   * loadFinished signal.
-- 
cgit v1.2.3


From aa3b04de39c35eef8eecf9d1e512965516815e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
Date: Wed, 16 Sep 2020 14:54:39 +0200
Subject: Add more tests to tst_loadsignals

Add new cases for non-same-page navigations, for navigations triggered
from the DOMContentLoaded event handler, for navigations triggered
by user action (clicks), and for navigation rejected by the
acceptNavigationRequest API.

Drop the 'no more signals' waiting time from 10 to 1 seconds.

Task-number: QTBUG-65223
Change-Id: Ic074eaf5aa58f779e31927296ae84d9e4faeaaae
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 tests/auto/widgets/loadsignals/BLACKLIST           |  16 +-
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp | 212 ++++++++++++++++++---
 tests/auto/widgets/loadsignals/tst_loadsignals.qrc |   4 +
 3 files changed, 200 insertions(+), 32 deletions(-)

(limited to 'tests/auto/widgets/loadsignals')

diff --git a/tests/auto/widgets/loadsignals/BLACKLIST b/tests/auto/widgets/loadsignals/BLACKLIST
index ffe1f71fe..71bb71b9e 100644
--- a/tests/auto/widgets/loadsignals/BLACKLIST
+++ b/tests/auto/widgets/loadsignals/BLACKLIST
@@ -1,5 +1,19 @@
 # QTBUG-65223
-[loadStartedAndFinishedCount:WithAnchorClickedFromJS]
+[loadStartedAndFinishedCount:SamePageImmediate]
+*
+[loadStartedAndFinishedCount:SamePageDeferred]
+*
+[loadStartedAndFinishedCount:OtherPageImmediate]
+*
+[loadStartedAndFinishedCount:SamePageImmediateJS]
+*
+[loadStartedAndFinishedCountClick:SamePage]
+*
+[rejectNavigationRequest:SamePageDeferred]
+*
+[rejectNavigationRequest:SamePageImmediate]
+*
+[rejectNavigationRequest:OtherPageImmediate]
 *
 
 # QTBUG-66869 (https://codereview.qt-project.org/#/c/222112/ is only a workaround)
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 8112a274c..3f5d975c0 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -36,6 +36,43 @@
 #include "qwebenginesettings.h"
 #include "qwebengineview.h"
 
+enum { LoadStarted, LoadSucceeded, LoadFailed };
+static const QList<int> SignalsOrderOnce({ LoadStarted, LoadSucceeded});
+static const QList<int> SignalsOrderTwice({ LoadStarted, LoadSucceeded, LoadStarted, LoadSucceeded });
+static const QList<int> SignalsOrderOnceFailure({ LoadStarted, LoadFailed });
+static const QList<int> SignalsOrderTwiceWithFailure({ LoadStarted, LoadSucceeded, LoadStarted, LoadFailed });
+
+class TestPage : public QWebEnginePage
+{
+public:
+    QSet<QUrl> blacklist;
+    int navigationRequestCount = 0;
+    QList<int> signalsOrder;
+    QList<int> loadProgress;
+
+    explicit TestPage(QObject *parent = nullptr) : TestPage(nullptr, parent) { }
+    TestPage(QWebEngineProfile *profile, QObject *parent = nullptr) : QWebEnginePage(profile, parent) {
+        connect(this, &QWebEnginePage::loadStarted, [this] () { signalsOrder.append(LoadStarted); });
+        connect(this, &QWebEnginePage::loadProgress, [this] (int p) { loadProgress.append(p); });
+        connect(this, &QWebEnginePage::loadFinished, [this] (bool r) { signalsOrder.append(r ? LoadSucceeded : LoadFailed); });
+    }
+
+    void reset()
+    {
+        blacklist.clear();
+        navigationRequestCount = 0;
+        signalsOrder.clear();
+        loadProgress.clear();
+    }
+
+protected:
+    bool acceptNavigationRequest(const QUrl &url, NavigationType, bool) override
+    {
+        ++navigationRequestCount;
+        return !blacklist.contains(url);
+    }
+};
+
 class tst_LoadSignals : public QObject
 {
     Q_OBJECT
@@ -48,6 +85,10 @@ private Q_SLOTS:
     void monotonicity();
     void loadStartedAndFinishedCount_data();
     void loadStartedAndFinishedCount();
+    void loadStartedAndFinishedCountClick_data();
+    void loadStartedAndFinishedCountClick();
+    void rejectNavigationRequest_data();
+    void rejectNavigationRequest();
     void loadAfterInPageNavigation_qtbug66869();
     void fileDownloadDoesNotTriggerLoadSignals_qtbug66661();
     void numberOfStartedAndFinishedSignalsIsSame();
@@ -57,31 +98,45 @@ private Q_SLOTS:
     void errorPageTriggered();
 
 private:
+    void clickLink(QPoint linkPos);
+
     QWebEngineProfile profile;
-    QWebEnginePage page{&profile};
+    TestPage page{&profile};
     QWebEngineView view;
     QSignalSpy loadStartedSpy{&page, &QWebEnginePage::loadStarted};
-    QSignalSpy loadProgressSpy{&page, &QWebEnginePage::loadProgress};
     QSignalSpy loadFinishedSpy{&page, &QWebEnginePage::loadFinished};
+    void resetSpies() {
+        loadStartedSpy.clear();
+        loadFinishedSpy.clear();
+    }
 };
 
 void tst_LoadSignals::initTestCase()
 {
     view.setPage(&page);
-    view.resize(1024,768);
+    view.resize(640, 480);
     view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 }
 
 void tst_LoadSignals::init()
 {
     // Reset content
-    loadFinishedSpy.clear();
-    view.load(QUrl("about:blank"));
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    if (!view.url().isEmpty()) {
+        loadFinishedSpy.clear();
+        view.load(QUrl("about:blank"));
+        QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    }
+    resetSpies();
+    page.reset();
+}
 
-    loadStartedSpy.clear();
-    loadProgressSpy.clear();
-    loadFinishedSpy.clear();
+void tst_LoadSignals::clickLink(QPoint linkPos)
+{
+    // Simulate left-clicking on link.
+    QTRY_VERIFY(view.focusWidget());
+    QWidget *renderWidget = view.focusWidget();
+    QTest::mouseClick(renderWidget, Qt::LeftButton, {}, linkPos);
 }
 
 /**
@@ -90,27 +145,124 @@ void tst_LoadSignals::init()
 void tst_LoadSignals::loadStartedAndFinishedCount_data()
 {
     QTest::addColumn<QUrl>("url");
-    QTest::addColumn<int>("expectedLoadCount");
-    QTest::newRow("Normal") << QUrl("qrc:///resources/page1.html") << 1;
-    QTest::newRow("WithAnchor") << QUrl("qrc:///resources/page2.html#anchor") << 1;
-
-    // In this case, we get an unexpected additional loadStarted, but no corresponding
-    // loadFinished, so expectedLoadCount=2 would also not work. See also QTBUG-65223
-    QTest::newRow("WithAnchorClickedFromJS") << QUrl("qrc:///resources/page3.html") << 1;
+    QTest::addColumn<QList<int>>("expectedSignals");
+    QTest::newRow("Simple") << QUrl("qrc:///resources/page1.html") << SignalsOrderOnce;
+    QTest::newRow("SimpleWithAnchor") << QUrl("qrc:///resources/page2.html#anchor") << SignalsOrderOnce;
+    QTest::newRow("SamePageImmediate") << QUrl("qrc:///resources/page5.html") << SignalsOrderOnce;
+    QTest::newRow("SamePageDeferred") << QUrl("qrc:///resources/page3.html") << SignalsOrderOnce;
+    QTest::newRow("OtherPageImmediate") << QUrl("qrc:///resources/page6.html") << SignalsOrderOnce;
+    QTest::newRow("OtherPageDeferred") << QUrl("qrc:///resources/page7.html") << SignalsOrderTwice;
+    QTest::newRow("SamePageImmediateJS") << QUrl("qrc:///resources/page8.html") << SignalsOrderOnce;
 }
 
 void tst_LoadSignals::loadStartedAndFinishedCount()
 {
     QFETCH(QUrl, url);
-    QFETCH(int, expectedLoadCount);
+    QFETCH(QList<int>, expectedSignals);
 
     view.load(url);
+
+    int expectedLoadCount = expectedSignals.size() / 2;
+    QTRY_COMPARE(loadStartedSpy.size(), expectedLoadCount);
     QTRY_COMPARE(loadFinishedSpy.size(), expectedLoadCount);
+
+    // verify no more signals is emitted by waiting for another loadStarted or loadFinished
+    QTRY_LOOP_IMPL(loadStartedSpy.size() != expectedLoadCount || loadFinishedSpy.size() != expectedLoadCount, 1000, 100);
+
+    // No further signals should have occurred within this time and expected number of signals is preserved
+    QCOMPARE(loadStartedSpy.size(), expectedLoadCount);
+    QCOMPARE(loadFinishedSpy.size(), expectedLoadCount);
+    QCOMPARE(page.signalsOrder, expectedSignals);
+}
+
+/**
+ * Load a URL, then simulate a click to load a different URL.
+ */
+void tst_LoadSignals::loadStartedAndFinishedCountClick_data()
+{
+    QTest::addColumn<QUrl>("url");
+    QTest::addColumn<int>("numberOfSignals");
+    QTest::newRow("SamePage") << QUrl("qrc:///resources/page2.html") << 0; // in-page navigation to anchor shouldn't emit anything
+    QTest::newRow("OtherPage") << QUrl("qrc:///resources/page1.html") << 1;
+}
+
+void tst_LoadSignals::loadStartedAndFinishedCountClick()
+{
+    QFETCH(QUrl, url);
+    QFETCH(int, numberOfSignals);
+
+    view.load(url);
+    QTRY_COMPARE(loadStartedSpy.size(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QVERIFY(loadFinishedSpy[0][0].toBool());
+    resetSpies();
+
+    clickLink(QPoint(10, 10));
+    if (numberOfSignals > 0) {
+        QTRY_COMPARE(loadStartedSpy.size(), numberOfSignals);
+        QTRY_COMPARE(loadFinishedSpy.size(), numberOfSignals);
+        QVERIFY(loadFinishedSpy[0][0].toBool());
+    }
 
-    // Wait for 10 seconds (abort waiting if another loadStarted or loadFinished occurs)
-    QTRY_LOOP_IMPL((loadStartedSpy.size() != expectedLoadCount)
-                || (loadFinishedSpy.size() != expectedLoadCount), 10000, 100);
+    // verify no more signals is emitted by waiting for another loadStarted or loadFinished
+    QTRY_LOOP_IMPL(loadStartedSpy.size() != numberOfSignals || loadFinishedSpy.size() != numberOfSignals, 1000, 100);
+
+    // No further loadStarted should have occurred within this time
+    QCOMPARE(loadStartedSpy.size(), numberOfSignals);
+    QCOMPARE(loadFinishedSpy.size(), numberOfSignals);
+    QCOMPARE(page.signalsOrder, numberOfSignals > 0 ? SignalsOrderTwice : SignalsOrderOnce);
+}
+
+void tst_LoadSignals::rejectNavigationRequest_data()
+{
+    QTest::addColumn<QUrl>("initialUrl");
+    QTest::addColumn<QUrl>("rejectedUrl");
+    QTest::addColumn<int>("expectedNavigations");
+    QTest::addColumn<QList<int>>("expectedSignals");
+    QTest::newRow("Simple")
+            << QUrl("qrc:///resources/page1.html")
+            << QUrl("qrc:///resources/page1.html")
+            << 1 << SignalsOrderOnceFailure;
+    QTest::newRow("SamePageImmediate")
+            << QUrl("qrc:///resources/page5.html")
+            << QUrl("qrc:///resources/page5.html#anchor")
+            << 1 << SignalsOrderOnce;
+    QTest::newRow("SamePageDeferred")
+            << QUrl("qrc:///resources/page3.html")
+            << QUrl("qrc:///resources/page3.html#anchor")
+            << 1 << SignalsOrderOnce;
+    QTest::newRow("OtherPageImmediate")
+            << QUrl("qrc:///resources/page6.html")
+            << QUrl("qrc:///resources/page2.html#anchor")
+            << 2 << SignalsOrderOnceFailure;
+    QTest::newRow("OtherPageDeferred")
+            << QUrl("qrc:///resources/page7.html")
+            << QUrl("qrc:///resources/page2.html#anchor")
+            << 2 << SignalsOrderTwiceWithFailure;
+}
+
+/**
+ * Returning false from acceptNavigationRequest means that the load
+ * fails, not that the load never starts.
+ *
+ * See QTBUG-75185.
+ */
+void tst_LoadSignals::rejectNavigationRequest()
+{
+    QFETCH(QUrl, initialUrl);
+    QFETCH(QUrl, rejectedUrl);
+    QFETCH(int, expectedNavigations);
+    QFETCH(QList<int>, expectedSignals);
+
+    page.blacklist.insert(rejectedUrl);
+    page.load(initialUrl);
+    QTRY_COMPARE(page.navigationRequestCount, expectedNavigations);
+    int expectedLoadCount = expectedSignals.size() / 2;
+    QTRY_COMPARE(loadFinishedSpy.size(), expectedLoadCount);
+    QCOMPARE(page.signalsOrder, expectedSignals);
+
+    // verify no more signals is emitted by waiting for another loadStarted or loadFinished
+    QTRY_LOOP_IMPL(loadStartedSpy.size() != expectedLoadCount || loadFinishedSpy.size() != expectedLoadCount, 1000, 100);
 
     // No further loadStarted should have occurred within this time
     QCOMPARE(loadStartedSpy.size(), expectedLoadCount);
@@ -133,18 +285,19 @@ void tst_LoadSignals::monotonicity()
     QTRY_COMPARE(loadFinishedSpy.size(), 1);
     QVERIFY(loadFinishedSpy[0][0].toBool());
 
+    QVERIFY(page.loadProgress.size() >= 3);
     // first loadProgress should have 0% progress
-    QCOMPARE(loadProgressSpy.takeFirst()[0].toInt(), 0);
+    QCOMPARE(page.loadProgress.first(), 0);
 
     // every loadProgress should have more progress than the one before
-    int progress = 0;
-    for (const auto &item : loadProgressSpy) {
-        QVERIFY(progress < item[0].toInt());
-        progress = item[0].toInt();
+    int progress = -1;
+    for (int p : page.loadProgress) {
+        QVERIFY(progress < p);
+        progress = p;
     }
 
     // last loadProgress should have 100% progress
-    QCOMPARE(loadProgressSpy.last()[0].toInt(), 100);
+    QCOMPARE(page.loadProgress.last(), 100);
 }
 
 /**
@@ -160,7 +313,6 @@ void tst_LoadSignals::loadAfterInPageNavigation_qtbug66869()
     // page3 does an in-page navigation after 500ms
     QTest::qWait(2000);
     loadFinishedSpy.clear();
-    loadProgressSpy.clear();
     loadStartedSpy.clear();
 
     // second load
@@ -204,9 +356,9 @@ void tst_LoadSignals::fileDownloadDoesNotTriggerLoadSignals_qtbug66661()
     QTest::sendKeyEvent(QTest::Press, view.focusProxy(), Qt::Key_Return, QString("\r"), Qt::NoModifier);
     QTest::sendKeyEvent(QTest::Release, view.focusProxy(), Qt::Key_Return, QString("\r"), Qt::NoModifier);
 
-    // Wait for 10 seconds (abort waiting if another loadStarted or loadFinished occurs)
+    // Wait for 5 seconds (abort waiting if another loadStarted or loadFinished occurs)
     QTRY_LOOP_IMPL((loadStartedSpy.size() != 1)
-                || (loadFinishedSpy.size() != 1), 10000, 100);
+                || (loadFinishedSpy.size() != 1), 5000, 100);
 
     // Download must have occurred
     QTRY_COMPARE(downloadState, QWebEngineDownloadItem::DownloadCompleted);
@@ -231,7 +383,6 @@ void tst_LoadSignals::numberOfStartedAndFinishedSignalsIsSame() {
 
     loadStartedSpy.clear();
     loadFinishedSpy.clear();
-    loadProgressSpy.clear();
 
     view.page()->setHtml("<html><body>"
                          "<img src=\"" + server.url("/hedgehog.png").toEncoded() + "\">"
@@ -351,6 +502,5 @@ void tst_LoadSignals::errorPageTriggered()
     loadFinishedSpy.clear();
 }
 
-
 QTEST_MAIN(tst_LoadSignals)
 #include "tst_loadsignals.moc"
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.qrc b/tests/auto/widgets/loadsignals/tst_loadsignals.qrc
index 21c517154..b4ee36676 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.qrc
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.qrc
@@ -4,6 +4,10 @@
         <file alias="page2.html">../../shared/data/loadprogress/page2.html</file>
         <file alias="page3.html">../../shared/data/loadprogress/page3.html</file>
         <file alias="page4.html">../../shared/data/loadprogress/page4.html</file>
+        <file alias="page5.html">../../shared/data/loadprogress/page5.html</file>
+        <file alias="page6.html">../../shared/data/loadprogress/page6.html</file>
+        <file alias="page7.html">../../shared/data/loadprogress/page7.html</file>
+        <file alias="page8.html">../../shared/data/loadprogress/page8.html</file>
         <file alias="downloadable.tar.gz">../../shared/data/loadprogress/downloadable.tar.gz</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3


From ba57bbb0f8443a964e771fc65a3de807923bb71e Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Fri, 30 Apr 2021 21:30:16 +0200
Subject: Unblacklist and fix load signals test for file download

Since it's a expected and valid behavior, and it's how chromium sees it.
First, after link click, load to different document is started, then
navigation is initiated, and only later it's resolved to download and
aborted (hence load result is false) with page's state staying the same.

Fixes: QTBUG-75185
Change-Id: I8b81ba00609649d9d0318f085ff1749a02a6e3cf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 tests/auto/widgets/loadsignals/BLACKLIST           |  4 ----
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp | 21 +++++++--------------
 2 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'tests/auto/widgets/loadsignals')

diff --git a/tests/auto/widgets/loadsignals/BLACKLIST b/tests/auto/widgets/loadsignals/BLACKLIST
index 71bb71b9e..d72d35d98 100644
--- a/tests/auto/widgets/loadsignals/BLACKLIST
+++ b/tests/auto/widgets/loadsignals/BLACKLIST
@@ -20,9 +20,5 @@
 [loadAfterInPageNavigation_qtbug66869]
 *
 
-# QTBUG-66661
-[fileDownloadDoesNotTriggerLoadSignals_qtbug66661]
-*
-
 [numberOfStartedAndFinishedSignalsIsSame]
 b2qt
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 3f5d975c0..e7dc77e95 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -90,7 +90,7 @@ private Q_SLOTS:
     void rejectNavigationRequest_data();
     void rejectNavigationRequest();
     void loadAfterInPageNavigation_qtbug66869();
-    void fileDownloadDoesNotTriggerLoadSignals_qtbug66661();
+    void fileDownload();
     void numberOfStartedAndFinishedSignalsIsSame();
     void loadFinishedAfterNotFoundError_data();
     void loadFinishedAfterNotFoundError();
@@ -326,11 +326,7 @@ void tst_LoadSignals::loadAfterInPageNavigation_qtbug66869()
     QFAIL("https://codereview.qt-project.org/#/c/222112/ only hides the symptom, the core issue still needs to be solved");
 }
 
-/**
-  * Test that file-downloads don't trigger loadStarted or loadFinished signals.
-  * See QTBUG-66661
-  */
-void tst_LoadSignals::fileDownloadDoesNotTriggerLoadSignals_qtbug66661()
+void tst_LoadSignals::fileDownload()
 {
     view.load(QUrl("qrc:///resources/page4.html"));
     QTRY_COMPARE(loadFinishedSpy.size(), 1);
@@ -352,20 +348,17 @@ void tst_LoadSignals::fileDownloadDoesNotTriggerLoadSignals_qtbug66661()
                     });
 
     // trigger the download link that becomes focused on page4
-    QTest::qWait(1000);
     QTest::sendKeyEvent(QTest::Press, view.focusProxy(), Qt::Key_Return, QString("\r"), Qt::NoModifier);
     QTest::sendKeyEvent(QTest::Release, view.focusProxy(), Qt::Key_Return, QString("\r"), Qt::NoModifier);
 
-    // Wait for 5 seconds (abort waiting if another loadStarted or loadFinished occurs)
-    QTRY_LOOP_IMPL((loadStartedSpy.size() != 1)
-                || (loadFinishedSpy.size() != 1), 5000, 100);
-
     // Download must have occurred
     QTRY_COMPARE(downloadState, QWebEngineDownloadItem::DownloadCompleted);
+    QTRY_COMPARE(loadFinishedSpy.size() + loadStartedSpy.size(), 4);
 
-    // No further loadStarted should have occurred within this time
-    QCOMPARE(loadStartedSpy.size(), 1);
-    QCOMPARE(loadFinishedSpy.size(), 1);
+    // verify no more signals is emitted by waiting for another loadStarted or loadFinished
+    QTRY_LOOP_IMPL(loadStartedSpy.size() != 2 || loadFinishedSpy.size() != 2, 1000, 100);
+
+    QCOMPARE(page.signalsOrder, SignalsOrderTwiceWithFailure);
 }
 
 void tst_LoadSignals::numberOfStartedAndFinishedSignalsIsSame() {
-- 
cgit v1.2.3


From 4d4fc9cd120376f30ce0630b1e8c7bf174d44fae Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Fri, 30 Apr 2021 21:30:16 +0200
Subject: Fix inconsistent number of load signals and their order

This change tries to match how chromium treats one single load. Before
the pair of loadStarted/loadFinished methods for api classes was called
on delegate's DidStartNavigation/DidFinishNavigation, which might be many
within one single logical load. This is true for multiple usecases (like
multiple redirects on load, immediate form submit on DOM load, page's
subresource load, or just an error page load on failure). Tracking these
methods and deciding when to emit signals based on states are error-prone
and complicates logic for no benefits. Also it somewhat lies about when
real load is done, which is only started and finished on outer methods
DidStartLoading/DidStopLoading, which are conveniently called only once
for all mentioned usecases. So, this change uses these methods to issue
signals for load start/finish, and only makes exception for error page,
which is needed for quick's private test support.

Fixes: QTBUG-65223
Fixes: QTBUG-76802
Fixes: QTBUG-87089
Fixes: QTBUG-90342
Fixes: QTBUG-91773
Fixes: QTBUG-92063
Change-Id: I9cc99b639030fedd8cf6a9dc04d0869d6be6357d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 tests/auto/widgets/loadsignals/BLACKLIST           | 24 -------
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp | 73 +++++++++++-----------
 2 files changed, 36 insertions(+), 61 deletions(-)
 delete mode 100644 tests/auto/widgets/loadsignals/BLACKLIST

(limited to 'tests/auto/widgets/loadsignals')

diff --git a/tests/auto/widgets/loadsignals/BLACKLIST b/tests/auto/widgets/loadsignals/BLACKLIST
deleted file mode 100644
index d72d35d98..000000000
--- a/tests/auto/widgets/loadsignals/BLACKLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-# QTBUG-65223
-[loadStartedAndFinishedCount:SamePageImmediate]
-*
-[loadStartedAndFinishedCount:SamePageDeferred]
-*
-[loadStartedAndFinishedCount:OtherPageImmediate]
-*
-[loadStartedAndFinishedCount:SamePageImmediateJS]
-*
-[loadStartedAndFinishedCountClick:SamePage]
-*
-[rejectNavigationRequest:SamePageDeferred]
-*
-[rejectNavigationRequest:SamePageImmediate]
-*
-[rejectNavigationRequest:OtherPageImmediate]
-*
-
-# QTBUG-66869 (https://codereview.qt-project.org/#/c/222112/ is only a workaround)
-[loadAfterInPageNavigation_qtbug66869]
-*
-
-[numberOfStartedAndFinishedSignalsIsSame]
-b2qt
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index e7dc77e95..bee6df486 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -91,6 +91,7 @@ private Q_SLOTS:
     void rejectNavigationRequest();
     void loadAfterInPageNavigation_qtbug66869();
     void fileDownload();
+    void numberOfStartedAndFinishedSignalsIsSame_data();
     void numberOfStartedAndFinishedSignalsIsSame();
     void loadFinishedAfterNotFoundError_data();
     void loadFinishedAfterNotFoundError();
@@ -311,19 +312,14 @@ void tst_LoadSignals::loadAfterInPageNavigation_qtbug66869()
     QVERIFY(loadFinishedSpy[0][0].toBool());
 
     // page3 does an in-page navigation after 500ms
-    QTest::qWait(2000);
-    loadFinishedSpy.clear();
-    loadStartedSpy.clear();
+    QTRY_COMPARE(view.url(), QUrl("qrc:///resources/page3.html#anchor"));
 
     // second load
     view.load(QUrl("qrc:///resources/page1.html"));
-    QTRY_COMPARE(loadFinishedSpy.size(), 1);
+    QTRY_COMPARE(loadFinishedSpy.size(), 2);
     QVERIFY(loadFinishedSpy[0][0].toBool());
     // loadStarted and loadFinished should have been signalled
-    QCOMPARE(loadStartedSpy.size(), 1);
-
-    // reminder that we still need to solve the core issue
-    QFAIL("https://codereview.qt-project.org/#/c/222112/ only hides the symptom, the core issue still needs to be solved");
+    QCOMPARE(loadStartedSpy.size(), 2);
 }
 
 void tst_LoadSignals::fileDownload()
@@ -361,42 +357,42 @@ void tst_LoadSignals::fileDownload()
     QCOMPARE(page.signalsOrder, SignalsOrderTwiceWithFailure);
 }
 
-void tst_LoadSignals::numberOfStartedAndFinishedSignalsIsSame() {
+void tst_LoadSignals::numberOfStartedAndFinishedSignalsIsSame_data()
+{
+    QTest::addColumn<bool>("imageFromServer");
+    QTest::addColumn<QString>("imageResourceUrl");
+    // triggers these calls in delegate internally:
+    // just two ordered triples DidStartNavigation/DidFinishNavigation/DidFinishLoad
+    QTest::newRow("no_image_resource") << false << "";
+    // out of order: DidStartNavigation/DidFinishNavigation/DidStartNavigation/DidFailLoad/DidFinishNavigation/DidFinishLoad
+    QTest::newRow("with_invalid_image") << false << "https://non.existent.locahost/image.png";
+    // out of order: DidStartNavigation/DidFinishNavigation/DidStartNavigation/DidFinishLoad/DidFinishNavigation/DidFinishLoad
+    QTest::newRow("with_server_image") << true << "";
+}
+
+void tst_LoadSignals::numberOfStartedAndFinishedSignalsIsSame()
+{
+    QFETCH(bool, imageFromServer);
+    QFETCH(QString, imageResourceUrl);
 
     HttpServer server;
     server.setResourceDirs({ TESTS_SOURCE_DIR "/qwebengineprofile/resources" });
-    connect(&server, &HttpServer::newRequest, [] (HttpReqRep *) {
-         QTest::qWait(250); // just add delay to trigger some progress for every sub resource
-    });
     QVERIFY(server.start());
 
-    view.load(server.url("/hedgehog.png"));
-    QTRY_COMPARE(loadFinishedSpy.size(), 1);
-    QVERIFY(loadFinishedSpy[0][0].toBool());
-
-    loadStartedSpy.clear();
-    loadFinishedSpy.clear();
+    QUrl serverImage = server.url("/hedgehog.png");
+    QString imageUrl(!imageFromServer && imageResourceUrl.isEmpty()
+                     ? "" : (imageFromServer ? serverImage.toEncoded() : imageResourceUrl));
 
-    view.page()->setHtml("<html><body>"
-                         "<img src=\"" + server.url("/hedgehog.png").toEncoded() + "\">"
-                         "<form method='GET' name='hiddenform' action='qrc:///resources/page1.html' />"
-                         "<script language='javascript'>document.forms[0].submit();</script>"
-                         "</body></html>");
-
-    QTRY_COMPARE(loadStartedSpy.size(), 2);
-    QTRY_COMPARE(loadFinishedSpy.size(), 2);
+    auto html = "<html><head><link rel='icon' href='data:,'></head><body>"
+                "%1" "<form method='GET' name='hiddenform' action='qrc:///resources/page1.html' />"
+                "<script language='javascript'>document.forms[0].submit();</script>"
+                "</body></html>";
+    view.page()->setHtml(QString(html).arg(imageUrl.isEmpty() ? "" : "<img src='" + imageUrl + "'>"));
+    QTRY_COMPARE(loadFinishedSpy.size(), 1);
 
-    QTRY_VERIFY(!loadFinishedSpy[0][0].toBool());
-    QTRY_VERIFY(loadFinishedSpy[1][0].toBool());
-
-    view.page()->setHtml("<html><body>"
-                         "<form method='GET' name='hiddenform' action='qrc:///resources/page1.html' />"
-                         "<script language='javascript'>document.forms[0].submit();</script>"
-                         "</body></html>");
-    QTRY_COMPARE(loadStartedSpy.size(), 4);
-    QTRY_COMPARE(loadFinishedSpy.size(), 4);
-    QVERIFY(loadFinishedSpy[2][0].toBool());
-    QVERIFY(loadFinishedSpy[3][0].toBool());
+    resetSpies();
+    QTRY_LOOP_IMPL(loadStartedSpy.size() || loadFinishedSpy.size(), 1000, 100);
+    QCOMPARE(page.signalsOrder, SignalsOrderOnce);
 }
 
 void tst_LoadSignals::loadFinishedAfterNotFoundError_data()
@@ -428,6 +424,7 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
     QVERIFY(!loadFinishedSpy.at(0).at(0).toBool());
     QCOMPARE(toPlainTextSync(view.page()), QString());
     QCOMPARE(loadFinishedSpy.count(), 1);
+    QCOMPARE(loadStartedSpy.count(), 1);
 
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, true);
     url = server
@@ -436,9 +433,11 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
     view.load(url);
     QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 2, 20000);
     QVERIFY(!loadFinishedSpy.at(1).at(0).toBool());
+    QCOMPARE(loadStartedSpy.count(), 2);
 
     QEXPECT_FAIL("", "No more loads (like separate load for error pages) are expected", Continue);
     QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 3, 1000);
+    QCOMPARE(loadStartedSpy.count(), 2);
 }
 
 void tst_LoadSignals::errorPageTriggered_data()
-- 
cgit v1.2.3


From 9f0f9981d5e7b720e0d6359d64f2f93f1e1e3afd Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Mon, 22 Mar 2021 13:53:03 +0100
Subject: Remove tracking of frame which load error page

It was added to suppress progress notification for error page load
after failure, but since error page load is reported as a new navigation
(which clears list of tracked frames), it was actually doing the
opposite thing. The only situation where it suppresses progress is when
navigation was not finished (due to invalid domain or network error),
but in this case it was real progress change for whole load which should
propagate further.

Change-Id: Ifd1d681fb5c6495fb3afdc4247364afb4472c959
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 tests/auto/widgets/loadsignals/tst_loadsignals.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/auto/widgets/loadsignals')

diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index bee6df486..4ff47d96e 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -414,7 +414,6 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
         server.reset(new HttpServer);
         QVERIFY(server->start());
     }
-
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     auto url = server
         ? server->url("/not-found-page.html")
@@ -425,6 +424,8 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
     QCOMPARE(toPlainTextSync(view.page()), QString());
     QCOMPARE(loadFinishedSpy.count(), 1);
     QCOMPARE(loadStartedSpy.count(), 1);
+    QVERIFY(std::is_sorted(page.loadProgress.begin(), page.loadProgress.end()));
+    page.loadProgress.clear();
 
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, true);
     url = server
@@ -438,6 +439,7 @@ void tst_LoadSignals::loadFinishedAfterNotFoundError()
     QEXPECT_FAIL("", "No more loads (like separate load for error pages) are expected", Continue);
     QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 3, 1000);
     QCOMPARE(loadStartedSpy.count(), 2);
+    QVERIFY(std::is_sorted(page.loadProgress.begin(), page.loadProgress.end()));
 }
 
 void tst_LoadSignals::errorPageTriggered_data()
-- 
cgit v1.2.3