From eebf1d8bfde9cf8261487e9cef88ffbe7451cb61 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Tue, 7 Apr 2015 08:39:01 -0700 Subject: Remove tst_setUrlWithFragment test case This test is flaky, we don't have proper signals for in-page navigations and this case tests the behavior of the browser engine, not the QtWebEngine API. Change-Id: Ia94219df3501126bf1ab00a400a57d589b651589 Reviewed-by: Andras Becsi --- .../qwebengineframe/tst_qwebengineframe.cpp | 41 ---------------------- 1 file changed, 41 deletions(-) diff --git a/tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp b/tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp index 9901bcd76..00e1b1123 100644 --- a/tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp +++ b/tests/auto/widgets/qwebengineframe/tst_qwebengineframe.cpp @@ -87,8 +87,6 @@ private Q_SLOTS: void setContent(); void setCacheLoadControlAttribute(); void setUrlWithPendingLoads(); - void setUrlWithFragment_data(); - void setUrlWithFragment(); void setUrlToEmpty(); void setUrlToInvalid(); void setUrlHistory(); @@ -1227,45 +1225,6 @@ void tst_QWebEngineFrame::setUrlWithPendingLoads() page.setUrl(QUrl("about:blank")); } -void tst_QWebEngineFrame::setUrlWithFragment_data() -{ - QTest::addColumn("previousUrl"); - QTest::newRow("empty") << QUrl(); - QTest::newRow("same URL no fragment") << QUrl("qrc:/test1.html"); - // See comments in setUrlSameUrl about using setUrl() with the same url(). - QTest::newRow("same URL with same fragment") << QUrl("qrc:/test1.html#"); - QTest::newRow("same URL with different fragment") << QUrl("qrc:/test1.html#anotherFragment"); - QTest::newRow("another URL") << QUrl("qrc:/test2.html"); -} - -// Based on bug report https://bugs.webkit.org/show_bug.cgi?id=32723 -void tst_QWebEngineFrame::setUrlWithFragment() -{ - QSKIP("FIXME: https://trello.com/c/3L7F8VZJ/217-take-care-about-the-in-page-navigations-in-the-tests"); - QFETCH(QUrl, previousUrl); - - QWebEnginePage page; - - if (!previousUrl.isEmpty()) { - page.load(previousUrl); - ::waitForSignal(&page, SIGNAL(loadFinished(bool))); - QCOMPARE(page.url(), previousUrl); - } - - QSignalSpy spy(&page, SIGNAL(urlChanged(QUrl))); - const QUrl url("qrc:/test1.html#"); - QVERIFY(!url.fragment().isNull()); - - page.setUrl(url); - ::waitForSignal(&page, SIGNAL(urlChanged(QUrl))); - - QCOMPARE(spy.count(), 1); - QVERIFY(!toPlainTextSync(&page).isEmpty()); - // Slight change: This information now comes from Chromium and the behavior of requestedUrl changed in this case. - // QCOMPARE(page.requestedUrl(), url); - QCOMPARE(page.url(), url); -} - void tst_QWebEngineFrame::setUrlToEmpty() { int expectedLoadFinishedCount = 0; -- cgit v1.2.3