From 300dd3ee677ce8c59d29317217d041996f92632f Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Fri, 17 Mar 2017 13:58:34 +0100
Subject: [PATCH] Add back tst_QWebEngineView::horizontalScrollbarTest auto
test
Change-Id: Iebe5ed3e93b5b39866910ad9b63d02b88d64c3b2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
.../qwebengineview/tst_qwebengineview.cpp | 37 ++++++++++---------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 42dd23a9c..a6138c59d 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -418,31 +418,32 @@ void tst_QWebEngineView::unhandledKeyEventPropagation()
void tst_QWebEngineView::horizontalScrollbarTest()
{
-#if !defined(QWEBENGINEPAGE_SCROLL)
- QSKIP("QWEBENGINEPAGE_SCROLL");
-#else
- QWebEngineView webView;
- webView.resize(600, 600);
- webView.show();
- QTest::qWaitForWindowExposed(&webView);
+ QString html("<html><body>"
+ "<div style='width: 1000px; height: 1000px; background-color: green' />"
+ "</body></html>");
- QUrl url("qrc:///resources/scrolltest_page.html");
- webView.page()->load(url);
- webView.page()->setFocus();
+ QWebEngineView view;
+ view.setFixedSize(600, 600);
+ view.show();
- QSignalSpy spyFinished(webView, &QWebEngineView::loadFinished);
- QVERIFY(spyFinished.wait());
+ QTest::qWaitForWindowExposed(&view);
- QVERIFY(webView.page()->scrollPosition() == QPoint(0, 0));
+ QSignalSpy loadSpy(view.page(), SIGNAL(loadFinished(bool)));
+ view.setHtml(html);
+ QTRY_COMPARE(loadSpy.count(), 1);
+
+ QVERIFY(view.page()->scrollPosition() == QPoint(0, 0));
+ QSignalSpy scrollSpy(view.page(), SIGNAL(scrollPositionChanged(QPointF)));
// Note: The test below assumes that the layout direction is Qt::LeftToRight.
- QTest::mouseClick(&webView, Qt::LeftButton, 0, QPoint(550, 595));
- QVERIFY(webView.page()->scrollPosition().x() > 0);
+ QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, QPoint(550, 595));
+ scrollSpy.wait();
+ QVERIFY(view.page()->scrollPosition().x() > 0);
// Note: The test below assumes that the layout direction is Qt::LeftToRight.
- QTest::mouseClick(&webView, Qt::LeftButton, 0, QPoint(20, 595));
- QVERIFY(webView.page()->scrollPosition() == QPoint(0, 0));
-#endif
+ QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, QPoint(20, 595));
+ scrollSpy.wait();
+ QVERIFY(view.page()->scrollPosition() == QPoint(0, 0));
}
--
GitLab