1 files changed, 68 insertions, 4 deletions

diff --git a/tests/auto/widgets/util.h b/tests/auto/widgets/util.h
index eba974f33..461baf9ac 100644
--- a/tests/auto/widgets/util.h
+++ b/tests/auto/widgets/util.h
@@ -36,11 +36,23 @@
 #include <QSignalSpy>
 #include <QTimer>
 #include <qwebenginepage.h>
+#include <qwebengineview.h>
 
 #if !defined(TESTS_SOURCE_DIR)
 #define TESTS_SOURCE_DIR ""
 #endif
 
+// Disconnect signal on destruction.
+class ScopedConnection
+{
+public:
+    ScopedConnection(QMetaObject::Connection connection) : m_connection(std::move(connection)) { }
+    ~ScopedConnection() { QObject::disconnect(m_connection); }
+
+private:
+    QMetaObject::Connection m_connection;
+};
+
 /**
  * Just like QSignalSpy but facilitates sync and async
  * signal emission. For example if you want to verify that
@@ -83,10 +95,13 @@ public:
         QObject::connect(&timeoutTimer, SIGNAL(timeout()), &eventLoop, SLOT(quit()));
     }
 
-    T waitForResult() {
-        if (!called) {
-            timeoutTimer.start(20000);
+    T waitForResult(int timeout = 20000) {
+        const int step = 1000;
+        int elapsed = 0;
+        while (elapsed < timeout && !called) {
+            timeoutTimer.start(step);
             eventLoop.exec();
+            elapsed += step;
         }
         return result;
     }
@@ -132,7 +147,7 @@ static inline QString toHtmlSync(QWebEnginePage *page)
 static inline bool findTextSync(QWebEnginePage *page, const QString &subString)
 {
     CallbackSpy<bool> spy;
-    page->findText(subString, 0, spy.ref());
+    page->findText(subString, {}, spy.ref());
     return spy.waitForResult();
 }
 
@@ -157,6 +172,55 @@ static inline QUrl baseUrlSync(QWebEnginePage *page)
     return spy.waitForResult().toUrl();
 }
 
+static inline bool loadSync(QWebEnginePage *page, const QUrl &url, bool ok = true)
+{
+    QSignalSpy spy(page, &QWebEnginePage::loadFinished);
+    page->load(url);
+    return (!spy.empty() || spy.wait(20000)) && (spy.front().value(0).toBool() == ok);
+}
+
+static inline bool loadSync(QWebEngineView *view, const QUrl &url, bool ok = true)
+{
+    return loadSync(view->page(), url, ok);
+}
+
+static inline QPoint elementCenter(QWebEnginePage *page, const QString &id)
+{
+    const QString jsCode(
+            "(function(){"
+            "   var elem = document.getElementById('" + id + "');"
+            "   var rect = elem.getBoundingClientRect();"
+            "   return [(rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2];"
+            "})()");
+    QVariantList rectList = evaluateJavaScriptSync(page, jsCode).toList();
+
+    if (rectList.count() != 2) {
+        qWarning("elementCenter failed.");
+        return QPoint();
+    }
+
+    return QPoint(rectList.at(0).toInt(), rectList.at(1).toInt());
+}
+
+static inline QRect elementGeometry(QWebEnginePage *page, const QString &id)
+{
+    const QString jsCode(
+                "(function() {"
+                "   var elem = document.getElementById('" + id + "');"
+                "   var rect = elem.getBoundingClientRect();"
+                "   return [rect.left, rect.top, rect.right, rect.bottom];"
+                "})()");
+    QVariantList coords = evaluateJavaScriptSync(page, jsCode).toList();
+
+    if (coords.count() != 4) {
+        qWarning("elementGeometry faield.");
+        return QRect();
+    }
+
+    return QRect(coords[0].toInt(), coords[1].toInt(), coords[2].toInt(), coords[3].toInt());
+}
+
+
 #define W_QSKIP(a, b) QSKIP(a)
 
 #define W_QTEST_MAIN(TestObject, params) \