summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-27 18:41:24 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-27 18:41:24 +0100
commitf74c888ae8d0c04d9b1d944fe61dc9a7e86b5420 (patch)
tree3bd16bce5d4ae8bc4bf185742cf21af890b7bbdf /tests/auto
parenta01f770f1d64770f8a81a53b812d1e086916fff2 (diff)
parent949884153ae14724c30f17c75656aa0c6f072559 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/controls/data/tst_calendar.qml10
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 55283b021..17b2b9b41 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();