Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dropQuestionableColorTestsFromTstTextarea11Qml into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Tim Peeters
Approved revision: 2137
Merged at revision: 2142
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dropQuestionableColorTestsFromTstTextarea11Qml
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 30 lines (+0/-13)
1 file modified
tests/unit/visual/tst_textarea.11.qml (+0/-13)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/dropQuestionableColorTestsFromTstTextarea11Qml
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+308106@code.launchpad.net

Commit message

Drop questionable color tests from tst_textarea.11.qml

Description of the change

The color-related tests that seemingly¹ now started failing don't make sense - the default colors can't possibly match because the upstream component has no Ubuntu theming.

¹Colors used to always compare equal, that bug was fixed in Qt 5.6.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

Seems good, but jenkins failed (on missing device?). Let's see if it'll pass autolanding.

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'tests/unit/visual/FIXME-QT56_textarea.11.qml' => 'tests/unit/visual/tst_textarea.11.qml'
--- tests/unit/visual/FIXME-QT56_textarea.11.qml 2016-09-16 11:20:57 +0000
+++ tests/unit/visual/tst_textarea.11.qml 2016-10-11 11:01:31 +0000
@@ -137,11 +137,6 @@
137 compare(textArea.canUndo,textEdit.canUndo,"TextArea.canUndo is same as TextEdit.canUndo")137 compare(textArea.canUndo,textEdit.canUndo,"TextArea.canUndo is same as TextEdit.canUndo")
138 }138 }
139139
140 // FIXME: Fails with Qt 5.6. See bug #1624342.
141 function test_0_color() {
142 compare(textArea.color,textEdit.color,"TextArea.color is same as TextEdit.canUndo")
143 }
144
145 function test_0_cursorDelegate() {140 function test_0_cursorDelegate() {
146 verify(textArea.cursorDelegate === null, "TextArea.cursorDelegate is not null")141 verify(textArea.cursorDelegate === null, "TextArea.cursorDelegate is not null")
147 }142 }
@@ -220,14 +215,6 @@
220 compare(textArea.selectedText,textEdit.selectedText,"TextArea.selectedText is same as TextEdit.selectedText")215 compare(textArea.selectedText,textEdit.selectedText,"TextArea.selectedText is same as TextEdit.selectedText")
221 }216 }
222217
223 function test_0_selectedTextColor() {
224 compare(textArea.selectedTextColor,textEdit.selectedTextColor,"TextArea.selectedTextColor is same as TextEdit.selectedTextColor")
225 }
226
227 function test_0_selectionColor() {
228 compare(textArea.selectionColor,textEdit.selectionColor,"TextArea.selectionColor is same as TextEdit.selectionColor")
229 }
230
231 function test_0_selectionEnd() {218 function test_0_selectionEnd() {
232 compare(textArea.selectionEnd,textEdit.selectionEnd,"TextArea.selectionEnd is same as TextEdit.selectionEnd")219 compare(textArea.selectionEnd,textEdit.selectionEnd,"TextArea.selectionEnd is same as TextEdit.selectionEnd")
233 }220 }

Subscribers

People subscribed via source and target branches