Changeset 82517 in webkit
- Timestamp:
- Mar 30, 2011 4:19:26 PM (13 years ago)
- Location:
- trunk/Source/WebKit/qt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/qt/ChangeLog
r82489 r82517 1 2011-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 1 13 2011-03-30 Robert Hogan <robert@webkit.org> 2 14 -
trunk/Source/WebKit/qt/tests/qwebview/tst_qwebview.cpp
r82074 r82517 31 31 #include <qwebelement.h> 32 32 #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 33 43 34 44 class tst_QWebView : public QObject … … 254 264 inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]")); 255 265 QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center()); 256 QVERIFY(webView.inputMethodHints() ==Qt::ImhHiddenText);266 VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText); 257 267 QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled)); 258 268 … … 260 270 inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=tel]")); 261 271 QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center()); 262 QVERIFY(webView.inputMethodHints() ==Qt::ImhDialableCharactersOnly);272 VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhDialableCharactersOnly); 263 273 QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled)); 264 274 … … 266 276 inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=number]")); 267 277 QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center()); 268 QVERIFY(webView.inputMethodHints() ==Qt::ImhDigitsOnly);278 VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhDigitsOnly); 269 279 QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled)); 270 280 … … 272 282 inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=email]")); 273 283 QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center()); 274 QVERIFY(webView.inputMethodHints() ==Qt::ImhEmailCharactersOnly);284 VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhEmailCharactersOnly); 275 285 QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled)); 276 286 … … 278 288 inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=url]")); 279 289 QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center()); 280 QVERIFY(webView.inputMethodHints() ==Qt::ImhUrlCharactersOnly);290 VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhUrlCharactersOnly); 281 291 QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled)); 282 292 … … 284 294 inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]")); 285 295 QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center()); 286 QVERIFY(webView.inputMethodHints() ==Qt::ImhHiddenText);296 VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText); 287 297 QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled)); 288 298 … … 301 311 inputElement = mainFrame->documentElement().findFirst(QLatin1String("input[type=password]")); 302 312 QTest::mouseClick(&webView, Qt::LeftButton, 0, inputElement.geometry().center()); 303 QVERIFY(webView.inputMethodHints() ==Qt::ImhHiddenText);313 VERIFY_INPUTMETHOD_HINTS(webView.inputMethodHints(), Qt::ImhHiddenText); 304 314 QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled)); 305 315 … … 307 317 inputElement = mainFrame->documentElement().findFirst(QLatin1String("textarea")); 308 318 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 309 323 QVERIFY(webView.inputMethodHints() == Qt::ImhNone); 324 #endif 310 325 QVERIFY(webView.testAttribute(Qt::WA_InputMethodEnabled)); 311 326 }
Note: See TracChangeset
for help on using the changeset viewer.