diff options
author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-22 08:14:34 +0900 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 08:14:17 +0200 |
commit | 197b145a23564910f6316ca0b2f9a1b39efaf9ef (patch) | |
tree | 9d0e9fb68a1247b3007ecfd4b99004a9bff6a71f /tests | |
parent | 0a6dc44f248c05bf179069e8cb3c2aebbeee7ac6 (diff) |
Fixed inputMethodQuery() for Qt::ImHints
to return QWidget::inputMethodHints()
Change-Id: I46735c553e0cb4689cd0c53a69d07ed61ba56bf6
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp | 20 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp | 21 |
2 files changed, 41 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index 1052bb2103..79f5a1a3a3 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -148,6 +148,8 @@ private slots: void selectionChanged(); void blockCountChanged(); void insertAndScrollToBottom(); + void inputMethodQueryImHints_data(); + void inputMethodQueryImHints(); private: void createSelection(); @@ -1516,6 +1518,24 @@ void tst_QPlainTextEdit::insertAndScrollToBottom() QCOMPARE(ed->verticalScrollBar()->value(), ed->verticalScrollBar()->maximum()); } +Q_DECLARE_METATYPE(Qt::InputMethodHints) +void tst_QPlainTextEdit::inputMethodQueryImHints_data() +{ + QTest::addColumn<Qt::InputMethodHints>("hints"); + + QTest::newRow("None") << static_cast<Qt::InputMethodHints>(Qt::ImhNone); + QTest::newRow("Password") << static_cast<Qt::InputMethodHints>(Qt::ImhHiddenText); + QTest::newRow("Normal") << static_cast<Qt::InputMethodHints>(Qt::ImhNoAutoUppercase | Qt::ImhNoPredictiveText | Qt::ImhSensitiveData); +} + +void tst_QPlainTextEdit::inputMethodQueryImHints() +{ + QFETCH(Qt::InputMethodHints, hints); + ed->setInputMethodHints(hints); + + QVariant value = ed->inputMethodQuery(Qt::ImHints); + QCOMPARE(static_cast<Qt::InputMethodHints>(value.toInt()), hints); +} QTEST_MAIN(tst_QPlainTextEdit) #include "tst_qplaintextedit.moc" diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index 88489f4328..6b6882e0cf 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -209,6 +209,8 @@ private slots: void inputMethodEvent(); void inputMethodSelection(); void inputMethodQuery(); + void inputMethodQueryImHints_data(); + void inputMethodQueryImHints(); private: void createSelection(); @@ -2462,5 +2464,24 @@ void tst_QTextEdit::inputMethodQuery() QCOMPARE(event.value(Qt::ImEnabled).toBool(), false); } +Q_DECLARE_METATYPE(Qt::InputMethodHints) +void tst_QTextEdit::inputMethodQueryImHints_data() +{ + QTest::addColumn<Qt::InputMethodHints>("hints"); + + QTest::newRow("None") << static_cast<Qt::InputMethodHints>(Qt::ImhNone); + QTest::newRow("Password") << static_cast<Qt::InputMethodHints>(Qt::ImhHiddenText); + QTest::newRow("Normal") << static_cast<Qt::InputMethodHints>(Qt::ImhNoAutoUppercase | Qt::ImhNoPredictiveText | Qt::ImhSensitiveData); +} + +void tst_QTextEdit::inputMethodQueryImHints() +{ + QFETCH(Qt::InputMethodHints, hints); + ed->setInputMethodHints(hints); + + QVariant value = ed->inputMethodQuery(Qt::ImHints); + QCOMPARE(static_cast<Qt::InputMethodHints>(value.toInt()), hints); +} + QTEST_MAIN(tst_QTextEdit) #include "tst_qtextedit.moc" |