diff options
| author | Charles Yin <charles.yin@nokia.com> | 2012-03-22 12:27:30 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-01 06:06:55 +0200 |
| commit | 7cecad76b6a8beb31c74111b986be0e67bb2e15c (patch) | |
| tree | 3db17684e3b0b29a11e75c206878a6b1fef708a1 /tests/auto/qmltest | |
| parent | 0949071f13e7bcbc16a0f07f496e0b6a23b04edd (diff) | |
Consolidate SignalSpy item
1. Add signalArguments to track emitted signal parameters
2. Add valid property to track signal connection status
3. Make count, valid, signalArguments read only properties
Task-number: QTBUG-18531
Change-Id: I08e99c1086786a0e5095bf0d04750dec33153fde
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/buttonclick/Button.qml | 4 | ||||
| -rw-r--r-- | tests/auto/qmltest/buttonclick/tst_buttonclick.qml | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tests/auto/qmltest/buttonclick/Button.qml b/tests/auto/qmltest/buttonclick/Button.qml index e5adb9dfd9..723f1c6bee 100644 --- a/tests/auto/qmltest/buttonclick/Button.qml +++ b/tests/auto/qmltest/buttonclick/Button.qml @@ -46,7 +46,7 @@ Rectangle { property string text: "Button" - signal clicked + signal clicked(int x, int y) width: buttonLabel.width + 20; height: buttonLabel.height + 5 border { width: 1; color: "black" } @@ -62,7 +62,7 @@ Rectangle { MouseArea { id: mouseArea anchors.fill: parent - onClicked: container.clicked(); + onClicked: container.clicked(mouse.x, mouse.y); } Text { diff --git a/tests/auto/qmltest/buttonclick/tst_buttonclick.qml b/tests/auto/qmltest/buttonclick/tst_buttonclick.qml index 6ecbfea450..840a7fd927 100644 --- a/tests/auto/qmltest/buttonclick/tst_buttonclick.qml +++ b/tests/auto/qmltest/buttonclick/tst_buttonclick.qml @@ -58,9 +58,19 @@ Button { function test_click() { compare(spy.count, 0) - button.clicked(); + button.clicked(1, 2); compare(button.text, "Clicked"); compare(spy.count, 1) + compare(spy.signalArguments.length, 1) + compare(spy.signalArguments[0][0], 1) + compare(spy.signalArguments[0][1], 2) + verify(spy.valid) + spy.clear() + compare(spy.count, 0) + verify(spy.valid) + compare(spy.signalArguments.length, 0) + spy.signalName = "" + verify(!spy.valid) } } } |