diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:07:00 +0100 |
| commit | cf32efbedfae65a9a29a1581096041193a372ed3 (patch) | |
| tree | 6cfd88c252c72fa0516451e726caa2ed5dd1a84b /tests/auto/controls | |
| parent | 9b340999c4cb9db1975c4b63f3388899d9023944 (diff) | |
| parent | 9dc39b7f0610990dabf9f8544ca64ff5175e7c77 (diff) | |
| download | qtquickcontrols-cf32efbedfae65a9a29a1581096041193a372ed3.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I2d12dd7b271e17662295007f5cf25ff4b3b78e8e
Diffstat (limited to 'tests/auto/controls')
| -rw-r--r-- | tests/auto/controls/data/tst_calendar.qml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_calendar.qml b/tests/auto/controls/data/tst_calendar.qml index 55283b02..17b2b9b4 100644 --- a/tests/auto/controls/data/tst_calendar.qml +++ b/tests/auto/controls/data/tst_calendar.qml @@ -414,6 +414,9 @@ Item { compare(calendar.selectedDate.getDate(), expectedDate.getDate()); compare(calendar.__panel.pressedCellIndex, cellIndex); compare(pressedSignalSpy.count, 1); + compare(pressedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear()); + compare(pressedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth()); + compare(pressedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate()); compare(releasedSignalSpy.count, 0); compare(clickedSignalSpy.count, 0); @@ -421,7 +424,14 @@ Item { compare(calendar.__panel.pressedCellIndex, -1); compare(pressedSignalSpy.count, 1); compare(releasedSignalSpy.count, 1); + // Will fail +// compare(releasedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear()); +// compare(releasedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth()); +// compare(releasedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate()); compare(clickedSignalSpy.count, 1); + compare(clickedSignalSpy.signalArguments[0][0].getFullYear(), expectedDate.getFullYear()); + compare(clickedSignalSpy.signalArguments[0][0].getMonth(), expectedDate.getMonth()); + compare(clickedSignalSpy.signalArguments[0][0].getDate(), expectedDate.getDate()); pressedSignalSpy.clear(); releasedSignalSpy.clear(); |