summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-06-07 03:03:05 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-06-07 03:03:30 (GMT)
commit22126ec530d07c7ba80f90812c9d6128b2d4a56f (patch)
tree982ccc7a0222476d8bd2c8d59cd5f03ab4560ff5 /tests/auto/declarative
parent2613a33d957ae2b274364672ee5280b6317b71b0 (diff)
downloadQt-22126ec530d07c7ba80f90812c9d6128b2d4a56f.zip
Qt-22126ec530d07c7ba80f90812c9d6128b2d4a56f.tar.gz
Qt-22126ec530d07c7ba80f90812c9d6128b2d4a56f.tar.bz2
Fix regression in input panel autotests
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp7
-rw-r--r--tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp7
2 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 474eb3f..9e5285f 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -956,7 +956,12 @@ void tst_qdeclarativetextedit::openInputPanelOnFocus()
edit.setFocusOnPress(true);
QCOMPARE(focusOnPressSpy.count(),2);
- // and input panel should not open if focus has already been set
+ edit.setFocus(true);
+ QCOMPARE(ic.openInputPanelReceived, true);
+ QCOMPARE(ic.closeInputPanelReceived, false);
+ ic.openInputPanelReceived = false;
+
+ // input panel should not open if focus has already been set
edit.setFocus(true);
QCOMPARE(ic.openInputPanelReceived, false);
QCOMPARE(ic.closeInputPanelReceived, false);
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index c1c6634..370ecfb 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -902,7 +902,12 @@ void tst_qdeclarativetextinput::openInputPanelOnFocus()
input.setFocusOnPress(true);
QCOMPARE(focusOnPressSpy.count(),2);
- // and input panel should not open if focus has already been set
+ input.setFocus(true);
+ QCOMPARE(ic.openInputPanelReceived, true);
+ QCOMPARE(ic.closeInputPanelReceived, false);
+ ic.openInputPanelReceived = false;
+
+ // input panel should not open if focus has already been set
input.setFocus(true);
QCOMPARE(ic.openInputPanelReceived, false);
QCOMPARE(ic.closeInputPanelReceived, false);