summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2012-02-02 13:35:42 +1000
committerAndrew den Exter <andrew.den-exter@nokia.com>2012-02-02 09:59:26 +0100
commita1344cd4e94179ba4f893117b93266baa39d2a67 (patch)
treefd5091339a074bae6c3e906ff809701bdf6fac0b /tests
parent27de55b498f995241cb5fa59673d86b6a565d461 (diff)
Add expected failures for failing TextEdit and TextInput tests.
Change-Id: Ib51b244f0e1a3e58ab06ddf5bdd0e244c8d09004 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp1
-rw-r--r--tests/auto/declarative/shared/platforminputcontext.h2
3 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 6a54414d..afd5dd4e 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -2535,6 +2535,7 @@ void tst_qdeclarativetextedit::inputContextMouseHandler()
QTest::mouseRelease(view.viewport(), Qt::RightButton, Qt::ControlModifier, position2);
QApplication::processEvents();
+ QEXPECT_FAIL("", "QTBUG-24035", Abort);
QCOMPARE(ic.m_action, QInputPanel::Click);
QCOMPARE(ic.m_invokeActionCallCount, 1);
QCOMPARE(ic.m_cursorPosition, 2);
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index b41da2ef..29f24164 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -2632,6 +2632,7 @@ void tst_qdeclarativetextinput::inputContextMouseHandler()
QTest::mouseRelease(view.viewport(), Qt::LeftButton, Qt::NoModifier, position2);
QApplication::processEvents();
+ QEXPECT_FAIL("", "QTBUG-24035", Abort);
QCOMPARE(platformInputContext.m_action, QInputPanel::Click);
QCOMPARE(platformInputContext.m_invokeActionCallCount, 1);
QCOMPARE(platformInputContext.m_cursorPosition, 2);
diff --git a/tests/auto/declarative/shared/platforminputcontext.h b/tests/auto/declarative/shared/platforminputcontext.h
index 041f15b2..4ef1144d 100644
--- a/tests/auto/declarative/shared/platforminputcontext.h
+++ b/tests/auto/declarative/shared/platforminputcontext.h
@@ -48,7 +48,7 @@ class PlatformInputContext : public QPlatformInputContext
{
public:
PlatformInputContext()
- : m_visible(false), m_action(QInputPanel::Click), m_cursorPosition(0),
+ : m_visible(false), m_action(QInputPanel::Action(-1)), m_cursorPosition(0),
m_invokeActionCallCount(0), m_showInputPanelCallCount(0), m_hideInputPanelCallCount(0),
m_updateCallCount(0), m_direction(Qt::LeftToRight)
{