diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-22 20:59:07 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-22 20:59:07 +0200 |
commit | a31a5ade38ad13b699039239343f154dc1504f50 (patch) | |
tree | b36e6b8c6d79209ac0f165a4cb1e52edaf8ce7e1 /tests | |
parent | 6d9d5d41151e790f26ba59bd88d6515485326a57 (diff) | |
parent | c11ef4ffa905ac9ba5e5af89ed03b1786b5187a8 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/quicktemplates2/qquickspinbox.cpp
tests/auto/controls/data/tst_scrollbar.qml
Change-Id: Ief9481cb648076a951db0aeffaeb11aeaf392677
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/controls/data/tst_scrollbar.qml | 40 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_spinbox.qml | 103 |
2 files changed, 68 insertions, 75 deletions
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index ec0be3f8..bc424a27 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -750,4 +750,44 @@ TestCase { compare(control.horizontal, true) compare(control.vertical, false) } + + function test_flashing() { + var control = createTemporaryObject(scrollBar, testCase, {size: 0.2}) + verify(control) + + var activeSpy = signalSpy.createObject(control, {target: control, signalName: "activeChanged"}) + verify(activeSpy.valid) + + compare(control.active, false) + if (control.contentItem) + compare(control.contentItem.opacity, 0) + if (control.background) + compare(control.background.opacity, 0) + + control.increase() + compare(control.position, 0.1) + compare(control.active, false) + compare(activeSpy.count, 2) + if (control.contentItem) + verify(control.contentItem.opacity > 0) + if (control.background) + verify(control.background.opacity > 0) + if (control.contentItem) + tryCompare(control.contentItem, "opacity", 0) + if (control.background) + tryCompare(control.background, "opacity", 0) + + control.decrease() + compare(control.position, 0.0) + compare(control.active, false) + compare(activeSpy.count, 4) + if (control.contentItem) + verify(control.contentItem.opacity > 0) + if (control.background) + verify(control.background.opacity > 0) + if (control.contentItem) + tryCompare(control.contentItem, "opacity", 0) + if (control.background) + tryCompare(control.background, "opacity", 0) + } } diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 17e4b592..54b81453 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -197,91 +197,44 @@ TestCase { compare(control.down.indicator.enabled, true) } - function test_mouse() { - var control = createTemporaryObject(spinBox, testCase, {stepSize: 50}) + function test_mouse_data() { + return [ + { tag: "up", button: "up", value: 50, enabled: true, hold: false, modified: 1, expected: 51 }, + { tag: "down", button: "down", value: 50, enabled: true, hold: false, modified: 1, expected: 49 }, + { tag: "up:disabled", button: "up", value: 99, enabled: false, hold: false, modified: 0, expected: 99 }, + { tag: "down:disabled", button: "down", value: 0, enabled: false, hold: false, modified: 0, expected: 0 }, + { tag: "up:hold", button: "up", value: 95, enabled: true, hold: true, modified: 4, expected: 99 }, + { tag: "down:hold", button: "down", value: 5, enabled: true, hold: true, modified: 5, expected: 0 } + ] + } + + function test_mouse(data) { + var control = createTemporaryObject(spinBox, testCase, {value: data.value}) verify(control) - var upPressedSpy = signalSpy.createObject(control, {target: control.up, signalName: "pressedChanged"}) - verify(upPressedSpy.valid) + var button = control[data.button] + verify(button) - var downPressedSpy = signalSpy.createObject(control, {target: control.down, signalName: "pressedChanged"}) - verify(downPressedSpy.valid) + var pressedSpy = signalSpy.createObject(control, {target: button, signalName: "pressedChanged"}) + verify(pressedSpy.valid) var valueModifiedSpy = signalSpy.createObject(control, {target: control, signalName: "valueModified"}) verify(valueModifiedSpy.valid) - mousePress(control.up.indicator) - compare(upPressedSpy.count, 1) - compare(control.up.pressed, true) - compare(downPressedSpy.count, 0) - compare(control.down.pressed, false) - compare(control.value, 0) + mousePress(button.indicator) + compare(pressedSpy.count, data.enabled ? 1 : 0) + compare(button.pressed, data.enabled) + compare(control.value, data.value) compare(valueModifiedSpy.count, 0) - mouseRelease(control.up.indicator) - compare(upPressedSpy.count, 2) - compare(control.up.pressed, false) - compare(downPressedSpy.count, 0) - compare(control.down.pressed, false) - compare(control.value, 50) - compare(valueModifiedSpy.count, 1) - - // Disable the up button and try again. - control.value = control.to - compare(control.up.indicator.enabled, false) - - mousePress(control.up.indicator) - compare(upPressedSpy.count, 2) - compare(control.up.pressed, false) - compare(downPressedSpy.count, 0) - compare(control.down.pressed, false) - compare(control.value, control.to) - compare(valueModifiedSpy.count, 1) - - mouseRelease(control.up.indicator) - compare(upPressedSpy.count, 2) - compare(control.up.pressed, false) - compare(downPressedSpy.count, 0) - compare(control.down.pressed, false) - compare(control.value, control.to) - compare(valueModifiedSpy.count, 1) - - control.value = 50; - mousePress(control.down.indicator) - compare(downPressedSpy.count, 1) - compare(control.down.pressed, true) - compare(upPressedSpy.count, 2) - compare(control.up.pressed, false) - compare(control.value, 50) - compare(valueModifiedSpy.count, 1) - - mouseRelease(control.down.indicator) - compare(downPressedSpy.count, 2) - compare(control.down.pressed, false) - compare(upPressedSpy.count, 2) - compare(control.up.pressed, false) - compare(control.value, 0) - compare(valueModifiedSpy.count, 2) - - // Disable the down button and try again. - control.value = control.from - compare(control.down.indicator.enabled, false) + if (data.hold) + tryCompare(control, "value", data.expected) - mousePress(control.down.indicator) - compare(downPressedSpy.count, 2) - compare(control.down.pressed, false) - compare(upPressedSpy.count, 2) - compare(control.up.pressed, false) - compare(control.value, control.from) - compare(valueModifiedSpy.count, 2) - - mouseRelease(control.down.indicator) - compare(downPressedSpy.count, 2) - compare(control.down.pressed, false) - compare(upPressedSpy.count, 2) - compare(control.up.pressed, false) - compare(control.value, control.from) - compare(valueModifiedSpy.count, 2) + mouseRelease(button.indicator) + compare(pressedSpy.count, data.enabled ? 2 : 0) + compare(button.pressed, false) + compare(control.value, data.expected) + compare(valueModifiedSpy.count, data.modified) } function test_keys_data() { |