diff options
| author | Dan Cape <dcape@qnx.com> | 2015-08-21 15:00:07 -0400 |
|---|---|---|
| committer | Dan Cape <dcape@qnx.com> | 2016-01-28 14:52:16 +0000 |
| commit | f4788a13e98aa4e5438327094524d7b8239893ec (patch) | |
| tree | 987022c73c0c224d45e3b2df5649fae417290785 | |
| parent | fa4863d13b118e2a2e6f15d786386765bd3a0c70 (diff) | |
QTextEdit/QQuickTextEdit undo issue - Part #1
This change to the qquicktextedit testcase will match updated
functionality for undo (made in qtbase) in the following scenario:
If a user selected the text "foo" and typed "bar", upon pressing undo,
the text would change to "b". This is incorrect and does not match the
functionality of QTextEdit or the default behaviours of
Windows/OSX/Ubuntu. When pressing undo on QTextEdit, the text would
change back to "foo".
The changes to the testcase is basically removing one step in the undo
test data that does not happen anymore. Since the change to undo was
made in qtbase, I need to disable the undo test cases using the
BLACKLIST until the qtbase change is in. Then there will be another
review to re-enable it.
Task-number: QTBUG-38825
Change-Id: I60e799d546945aac89634b49b2e1dc60a2a68935
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | tests/auto/quick/qquicktextedit/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/quick/qquicktextedit/BLACKLIST b/tests/auto/quick/qquicktextedit/BLACKLIST index 492d81531a..297146195b 100644 --- a/tests/auto/quick/qquicktextedit/BLACKLIST +++ b/tests/auto/quick/qquicktextedit/BLACKLIST @@ -1,2 +1,6 @@ [mouseSelection] * +[undo] +* +[undo_keypressevents] +* diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 50ca81785e..50e06e5663 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -4889,7 +4889,6 @@ void tst_qquicktextedit::undo_data() insertString << " unique instance."; expectedString << "Ensuring a unique instance."; - expectedString << "Ensuring a "; // ### Not present in TextEdit. expectedString << "Ensuring an instan"; expectedString << "Ensuring instan"; expectedString << ""; @@ -5177,8 +5176,6 @@ void tst_qquicktextedit::undo_keypressevents_data() << "ABC"; expectedString << "ABC"; - // ### One operation in TextEdit. - expectedString << "A"; expectedString << "123"; QTest::newRow("Inserts,moving,selection and overwriting") << keys << expectedString; @@ -5210,7 +5207,6 @@ void tst_qquicktextedit::undo_keypressevents_data() QStringList expectedString = QStringList() << "ABC123" << "ABC" - << "A" << "123"; QTest::newRow("Copy,paste") << keys << expectedString; } |