Changeset 82517 in webkit


Ignore:
Timestamp:
Mar 30, 2011 4:19:26 PM (13 years ago)
Author:
yi.4.shen@nokia.com
Message:

2011-03-30 Yi Shen <yi.4.shen@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt][Symbian] Fix Api test failure -- tst_QWebView::focusInputTypes
https://bugs.webkit.org/show_bug.cgi?id=57020

Added a macro 'VERIFY_INPUTMETHOD_HINTS' to test inputmethodhints().

  • tests/qwebview/tst_qwebview.cpp: (tst_QWebView::focusInputTypes):
Location:
trunk/Source/WebKit/qt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/qt/ChangeLog

    r82489 r82517  
     12011-03-30  Yi Shen  <yi.4.shen@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt][Symbian] Fix Api test failure -- tst_QWebView::focusInputTypes
     6        https://bugs.webkit.org/show_bug.cgi?id=57020
     7
     8        Added a macro 'VERIFY_INPUTMETHOD_HINTS' to test inputmethodhints().
     9
     10        * tests/qwebview/tst_qwebview.cpp:
     11        (tst_QWebView::focusInputTypes):
     12
    1132011-03-30  Robert Hogan  <robert@webkit.org>
    214
  • trunk/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp

    r82074 r82517  
    3131#include <qwebelement.h>
    3232#include <qwebframe.h>
     33
     34#ifdef Q_OS_SYMBIAN
     35#define VERIFY_INPUTMETHOD_HINTS(actual, expect) \
     36    QVERIFY(actual & Qt::ImhNoAutoUppercase); \
     37    QVERIFY(actual & Qt::ImhNoPredictiveText); \
     38    QVERIFY(actual & expect);
     39#else
     40#define VERIFY_INPUTMETHOD_HINTS(actual, expect) \
     41    QVERIFY(actual == expect);
     42#endif
    3343
    3444class tst_QWebView : public QObject
     
    254264    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
    255265    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    256     QVERIFY(webView.inputMethodHints() == Qt::ImhHiddenText);
     266    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText);
    257267    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    258268
     
    260270    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=tel]"));
    261271    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    262     QVERIFY(webView.inputMethodHints() == Qt::ImhDialableCharactersOnly);
     272    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhDialableCharactersOnly);
    263273    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    264274
     
    266276    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=number]"));
    267277    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    268     QVERIFY(webView.inputMethodHints() == Qt::ImhDigitsOnly);
     278    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhDigitsOnly);
    269279    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    270280
     
    272282    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=email]"));
    273283    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    274     QVERIFY(webView.inputMethodHints() == Qt::ImhEmailCharactersOnly);
     284    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhEmailCharactersOnly);
    275285    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    276286
     
    278288    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=url]"));
    279289    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    280     QVERIFY(webView.inputMethodHints() == Qt::ImhUrlCharactersOnly);
     290    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhUrlCharactersOnly);
    281291    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    282292
     
    284294    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
    285295    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    286     QVERIFY(webView.inputMethodHints() == Qt::ImhHiddenText);
     296    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText);
    287297    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    288298
     
    301311    inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]"));
    302312    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
    303     QVERIFY(webView.inputMethodHints() == Qt::ImhHiddenText);
     313    VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText);
    304314    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    305315
     
    307317    inputElement = mainFrame->documentElement().findFirst(QLatin1String("textarea"));
    308318    QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center());
     319#if defined(Q_OS_SYMBIAN)
     320    QVERIFY(webView.inputMethodHints() & Qt::ImhNoAutoUppercase);
     321    QVERIFY(webView.inputMethodHints() & Qt::ImhNoPredictiveText);
     322#else
    309323    QVERIFY(webView.inputMethodHints() == Qt::ImhNone);
     324#endif
    310325    QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled));
    311326}
Note: See TracChangeset for help on using the changeset viewer.