From 8ae55a3484c0811cb975572dea396b978a54836b Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Thu, 5 Jan 2012 18:03:49 +0200 Subject: Input direction/locale to come from platform input context Change-Id: Ib049693211a08dcffc9dbe49add54e7feab38978 Reviewed-by: Lars Knoll Reviewed-by: Joona Petrell --- .../gui/kernel/qinputpanel/tst_qinputpanel.cpp | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'tests') diff --git a/tests/auto/gui/kernel/qinputpanel/tst_qinputpanel.cpp b/tests/auto/gui/kernel/qinputpanel/tst_qinputpanel.cpp index dfce0828da..b46899a84d 100644 --- a/tests/auto/gui/kernel/qinputpanel/tst_qinputpanel.cpp +++ b/tests/auto/gui/kernel/qinputpanel/tst_qinputpanel.cpp @@ -54,6 +54,8 @@ public: m_updateCallCount(0), m_resetCallCount(0), m_commitCallCount(0), + m_localeCallCount(0), + m_inputDirectionCallCount(0), m_lastQueries(Qt::ImhNone), m_action(QInputPanel::Click), m_cursorPosition(0), @@ -91,12 +93,24 @@ public: { return m_visible; } + virtual QLocale locale() const + { + m_localeCallCount++; + return QLocale::c(); + } + virtual Qt::LayoutDirection inputDirection() const + { + m_inputDirectionCallCount++; + return Qt::LeftToRight; + } bool m_animating; bool m_visible; int m_updateCallCount; int m_resetCallCount; int m_commitCallCount; + mutable int m_localeCallCount; + mutable int m_inputDirectionCallCount; Qt::InputMethodQueries m_lastQueries; QInputPanel::Action m_action; int m_cursorPosition; @@ -144,6 +158,7 @@ private slots: void commit(); void update(); void query(); + void inputDirection(); private: InputItem m_inputItem; PlatformInputContext m_platformInputContext; @@ -312,5 +327,16 @@ void tst_qinputpanel::query() QCOMPARE(cursorRectangle, QRect(1,2,3,4)); } +void tst_qinputpanel::inputDirection() +{ + QCOMPARE(m_platformInputContext.m_inputDirectionCallCount, 0); + qApp->inputPanel()->inputDirection(); + QCOMPARE(m_platformInputContext.m_inputDirectionCallCount, 1); + + QCOMPARE(m_platformInputContext.m_localeCallCount, 0); + qApp->inputPanel()->locale(); + QCOMPARE(m_platformInputContext.m_localeCallCount, 1); +} + QTEST_MAIN(tst_qinputpanel) #include "tst_qinputpanel.moc" -- cgit v1.2.3