diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:24 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-27 18:41:24 +0100 |
commit | f74c888ae8d0c04d9b1d944fe61dc9a7e86b5420 (patch) | |
tree | 3bd16bce5d4ae8bc4bf185742cf21af890b7bbdf /tests/auto/controls | |
parent | a01f770f1d64770f8a81a53b812d1e086916fff2 (diff) | |
parent | 949884153ae14724c30f17c75656aa0c6f072559 (diff) | |
download | qtquickcontrols-f74c888ae8d0c04d9b1d944fe61dc9a7e86b5420.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I4b1a4ebf258c9d31e537f42c8d0219c4294628bb
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(); |