Changeset 66298 in webkit

Timestamp:

Aug 27, 2010 10:18:29 PM (14 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2010-08-27 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Antonio Gomes.

[Qt] tst_QWebView::focusInputTypes() fails on MeeGo Handset with WebKit 2.1
​https://bugs.webkit.org/show_bug.cgi?id=44761

Make the test more robust to changes in the execution environment. The click
are now correctly simulated, and the position are determined from the content.

The test also create the view and page on the stack to avoid the leak when the
test is failing.

• tests/qwebview/tst_qwebview.cpp: (tst_QWebView::focusInputTypes):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/qwebview/tst_qwebview.cpp (modified) (3 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-08-27  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] tst_QWebView::focusInputTypes() fails on MeeGo Handset with WebKit 2.1
+        https://bugs.webkit.org/show_bug.cgi?id=44761
+
+        Make the test more robust to changes in the execution environment. The click
+        are now correctly simulated, and the position are determined from the content.
+
+        The test also create the view and page on the stack to avoid the leak when the
+        test is failing.
+
+        * tests/qwebview/tst_qwebview.cpp:
+        (tst_QWebView::focusInputTypes):
+
 2010-08-27  Kimmo Kinnunen  <kimmo.t.kinnunen@nokia.com>
 

trunk/WebKit/qt/tests/qwebview/tst_qwebview.cpp

@@ -29 +29 @@
 #include <qdiriterator.h>
 #include <qwebkitversion.h>
+#include <qwebelement.h>
 #include <qwebframe.h>
 
@@ -51 +52 @@
 
     void crashTests();
-};
-
-class WebView : public QWebView
-{
-    Q_OBJECT
-
-public:
-    void fireMouseClick(QPoint point) {
-        QMouseEvent presEv(QEvent::MouseButtonPress, point, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-        QMouseEvent relEv(QEvent::MouseButtonRelease, point, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-        QWebView::mousePressEvent(&presEv);
-        QWebView::mousePressEvent(&relEv);
-    }
-
 };
 
@@ -246 +233 @@
 void tst_QWebView::focusInputTypes()
 {
-    QWebPage* page = new QWebPage;
-    WebView* webView = new WebView;
-    webView->setPage( page );
-
-    QCoreApplication::processEvents();
+    QWebView webView;
+    webView.show();
+    QTest::qWaitForWindowShown(&webView);
+
     QUrl url("qrc:///resources/input_types.html");
-    page->mainFrame()->load(url);
-    page->mainFrame()->setFocus();
-
-    QVERIFY(waitForSignal(page, SIGNAL(loadFinished(bool))));
+    QWebFrame* const mainFrame = webView.page()->mainFrame();
+    mainFrame->load(url);
+    mainFrame->setFocus();
+
+    QVERIFY(waitForSignal(&webView, SIGNAL(loadFinished(bool))));
 
     // 'text' type
-    webView->fireMouseClick(QPoint(20, 10));
+    QWebElement inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=text]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
-    QVERIFY(webView->inputMethodHints() & Qt::ImhNoAutoUppercase);
-    QVERIFY(webView->inputMethodHints() & Qt::ImhNoPredictiveText);
+    QVERIFY(webView.inputMethodHints() & Qt::ImhNoAutoUppercase);
+    QVERIFY(webView.inputMethodHints() & Qt::ImhNoPredictiveText);
 #else
-    QVERIFY(webView->inputMethodHints() == Qt::ImhNone);
+    QVERIFY(webView.inputMethodHints() == Qt::ImhNone);
 #endif
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'password' field
-    webView->fireMouseClick(QPoint(20, 60));
-    QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText);
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
+    QVERIFY(webView.inputMethodHints() == Qt::ImhHiddenText);
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'tel' field
-    webView->fireMouseClick(QPoint(20, 110));
-    QVERIFY(webView->inputMethodHints() == Qt::ImhDialableCharactersOnly);
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=tel]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
+    QVERIFY(webView.inputMethodHints() == Qt::ImhDialableCharactersOnly);
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'number' field
-    webView->fireMouseClick(QPoint(20, 160));
-    QVERIFY(webView->inputMethodHints() == Qt::ImhDigitsOnly);
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=number]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
+    QVERIFY(webView.inputMethodHints() == Qt::ImhDigitsOnly);
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'email' field
-    webView->fireMouseClick(QPoint(20, 210));
-    QVERIFY(webView->inputMethodHints() == Qt::ImhEmailCharactersOnly);
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=email]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
+    QVERIFY(webView.inputMethodHints() == Qt::ImhEmailCharactersOnly);
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'url' field
-    webView->fireMouseClick(QPoint(20, 260));
-    QVERIFY(webView->inputMethodHints() == Qt::ImhUrlCharactersOnly);
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=url]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
+    QVERIFY(webView.inputMethodHints() == Qt::ImhUrlCharactersOnly);
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'password' field
-    webView->fireMouseClick(QPoint(20, 60));
-    QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText);
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
+    QVERIFY(webView.inputMethodHints() == Qt::ImhHiddenText);
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'text' type
-    webView->fireMouseClick(QPoint(20, 10));
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=text]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
-    QVERIFY(webView->inputMethodHints() & Qt::ImhNoAutoUppercase);
-    QVERIFY(webView->inputMethodHints() & Qt::ImhNoPredictiveText);
+    QVERIFY(webView.inputMethodHints() & Qt::ImhNoAutoUppercase);
+    QVERIFY(webView.inputMethodHints() & Qt::ImhNoPredictiveText);
 #else
-    QVERIFY(webView->inputMethodHints() == Qt::ImhNone);
+    QVERIFY(webView.inputMethodHints() == Qt::ImhNone);
 #endif
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'password' field
-    webView->fireMouseClick(QPoint(20, 60));
-    QVERIFY(webView->inputMethodHints() == Qt::ImhHiddenText);
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
+    QVERIFY(webView.inputMethodHints() == Qt::ImhHiddenText);
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 
     // 'text area' field
-    webView->fireMouseClick(QPoint(20, 320));
-    QVERIFY(webView->inputMethodHints() == Qt::ImhNone);
-    QVERIFY(webView->testAttribute(Qt::WA_InputMethodEnabled));
-
-    delete webView;
-
+    inputElement = mainFrame->documentElement().findFirst(QLatin1String("textarea"));
+    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
+    QVERIFY(webView.inputMethodHints() == Qt::ImhNone);
+    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
 }