diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-06-29 17:20:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-02 04:23:20 +0200 |
commit | 6ede3b0138bed45f91dfa6b84b662b7f342b45a3 (patch) | |
tree | fc355226512092eec0d5c6c7bccce073ecba96bc /tests | |
parent | 2b7207fadb2de06a693220cbc76e5f3759718545 (diff) |
Use the convential form for the selectedText notify signal name.
Rename selectionChanged to selectedTextChanged to address an apparent
difference to API between TextInput and TextEdit.
Task-number: QTBUG-19732
Change-Id: Ibc589c8b43567cb8d2f8c13f7366e2859c7f09d7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index f893385bd2..50a660b0fe 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -1365,7 +1365,7 @@ void tst_qquicktextedit::keySelection() QVERIFY(input != 0); QTRY_VERIFY(input->hasActiveFocus() == true); - QSignalSpy spy(input, SIGNAL(selectionChanged())); + QSignalSpy spy(input, SIGNAL(selectedTextChanged())); simulateKey(&canvas, Qt::Key_Right, Qt::ShiftModifier); QVERIFY(input->hasActiveFocus() == true); @@ -3511,7 +3511,7 @@ void tst_qquicktextedit::insert() textEdit->setTextFormat(textFormat); textEdit->select(selectionStart, selectionEnd); - QSignalSpy selectionSpy(textEdit, SIGNAL(selectionChanged())); + QSignalSpy selectionSpy(textEdit, SIGNAL(selectedTextChanged())); QSignalSpy selectionStartSpy(textEdit, SIGNAL(selectionStartChanged())); QSignalSpy selectionEndSpy(textEdit, SIGNAL(selectionEndChanged())); QSignalSpy textSpy(textEdit, SIGNAL(textChanged())); @@ -3535,8 +3535,8 @@ void tst_qquicktextedit::insert() if (selectionStart > selectionEnd) qSwap(selectionStart, selectionEnd); - QEXPECT_FAIL("into selection", "selectionChanged signal isn't emitted on edits within selection", Continue); - QEXPECT_FAIL("into reversed selection", "selectionChanged signal isn't emitted on edits within selection", Continue); + QEXPECT_FAIL("into selection", "selectedTextChanged signal isn't emitted on edits within selection", Continue); + QEXPECT_FAIL("into reversed selection", "selectedTextChanged signal isn't emitted on edits within selection", Continue); QCOMPARE(selectionSpy.count() > 0, selectionChanged); QCOMPARE(selectionStartSpy.count() > 0, selectionStart != expectedSelectionStart); QEXPECT_FAIL("into reversed selection", "selectionEndChanged signal not emitted", Continue); @@ -3756,7 +3756,7 @@ void tst_qquicktextedit::remove() textEdit->setTextFormat(textFormat); textEdit->select(selectionStart, selectionEnd); - QSignalSpy selectionSpy(textEdit, SIGNAL(selectionChanged())); + QSignalSpy selectionSpy(textEdit, SIGNAL(seletedTextChanged())); QSignalSpy selectionStartSpy(textEdit, SIGNAL(selectionStartChanged())); QSignalSpy selectionEndSpy(textEdit, SIGNAL(selectionEndChanged())); QSignalSpy textSpy(textEdit, SIGNAL(textChanged())); @@ -3779,8 +3779,8 @@ void tst_qquicktextedit::remove() QCOMPARE(textEdit->selectionEnd(), expectedSelectionEnd); QCOMPARE(textEdit->cursorPosition(), expectedCursorPosition); - QEXPECT_FAIL("from selection", "selectionChanged signal isn't emitted on edits within selection", Continue); - QEXPECT_FAIL("from reversed selection", "selectionChanged signal isn't emitted on edits within selection", Continue); + QEXPECT_FAIL("from selection", "selectedTextChanged signal isn't emitted on edits within selection", Continue); + QEXPECT_FAIL("from reversed selection", "selectedTextChanged signal isn't emitted on edits within selection", Continue); QCOMPARE(selectionSpy.count() > 0, selectionChanged); QCOMPARE(selectionStartSpy.count() > 0, selectionStart != expectedSelectionStart); QEXPECT_FAIL("from reversed selection", "selectionEndChanged signal not emitted", Continue); |