diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-01 17:28:25 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-01 16:44:34 +0000 |
| commit | b23a0dc60f72ad02475a234deb7137f7ab170d14 (patch) | |
| tree | ce0cbd9863be31e1e040da7db1c34b203fcc33ec | |
| parent | 19e7fb3911c2032d2bdf05e2d37da0a0967d419a (diff) | |
tst_combobox: remove bogus mouse highlight checks
ComboBox gained mouse hover support in Qt 5.9. The highlighted() signal
is now emitted during the test, because 4c46dce8f in qtdeclarative made
QuickTest use QTest::mouseXxx(), which in turn calls the window system
interface to deliver mouse events, and consequently, items in the combo
box receive hover events. Before, QuickTest was sending mouse events
directly, so there were no hover events involved. There is a separate
test_mouseHighlight() function for the mouse highlighting functionality,
so these tests can be simply removed.
Task-number: QTBUG-62926
Change-Id: I7e5e0df993a9c2f78bae641bdfa9189f3cd0cc67
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| -rw-r--r-- | tests/auto/controls/data/tst_combobox.qml | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index dc146ba3..2b5af81b 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -705,9 +705,6 @@ TestCase { var activatedSpy = signalSpy.createObject(control, {target: control, signalName: "activated"}) verify(activatedSpy.valid) - var highlightedSpy = signalSpy.createObject(control, {target: control, signalName: "highlighted"}) - verify(highlightedSpy.valid) - mouseClick(control) compare(control.popup.visible, true) @@ -717,28 +714,19 @@ TestCase { // press - move - release outside - not activated - not closed mousePress(content) compare(activatedSpy.count, 0) - compare(highlightedSpy.count, 0) mouseMove(content, content.width * 2) compare(activatedSpy.count, 0) - compare(highlightedSpy.count, 0) mouseRelease(content, content.width * 2) compare(activatedSpy.count, 0) - compare(highlightedSpy.count, 0) compare(control.popup.visible, true) // press - move - release inside - activated - closed mousePress(content) compare(activatedSpy.count, 0) - compare(highlightedSpy.count, 0) mouseMove(content, content.width / 2 + 1, content.height / 2 + 1) compare(activatedSpy.count, 0) - if ((Qt.platform.pluginName === "offscreen") - || (Qt.platform.pluginName === "minimal")) - expectFail("", "Mouse highlighting not functional on offscreen/minimal platforms") - compare(highlightedSpy.count, 1) mouseRelease(content) compare(activatedSpy.count, 1) - compare(highlightedSpy.count, 1) tryCompare(control.popup, "visible", false) } |