diff options
Diffstat (limited to 'tests/auto/controls/data/tst_calendar.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_calendar.qml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tests/auto/controls/data/tst_calendar.qml b/tests/auto/controls/data/tst_calendar.qml index 17b2b9b4..1f8d9a8d 100644 --- a/tests/auto/controls/data/tst_calendar.qml +++ b/tests/auto/controls/data/tst_calendar.qml @@ -124,11 +124,19 @@ Item { } function test_defaultConstructed() { - calendar.minimumDate = new Date(1, 0, 1); - calendar.maximumDate = new Date(4000, 0, 1); - - compare(calendar.minimumDate, new Date(1, 0, 1)); - compare(calendar.maximumDate, new Date(4000, 0, 1)); + // Minimum date needs to be at least 1921-05-01 due to date problems in < JS7 which + // causes problems with the Finnish timezone in CI. So use 1922 to avoid those + // causing an invalid failure + + // The minimum and maximum are set with "different" times + // to confirm that they have no bearing from what it will + // return later on as we only care about the date part + // and not the specific time in the range. + calendar.minimumDate = new Date(22, 0, 1, 23, 59, 59, 999); + calendar.maximumDate = new Date(4000, 0, 1, 0, 0, 0, 0); + + compare(calendar.minimumDate, new Date(22, 0, 1)); + compare(calendar.maximumDate, new Date(4000, 0, 1, 23, 59, 59, 999)); var expectedDate = new Date(); compare(calendar.selectedDate.getFullYear(), expectedDate.getFullYear()); compare(calendar.selectedDate.getMonth(), expectedDate.getMonth()); @@ -139,15 +147,15 @@ Item { } function test_setAfterConstructed() { - calendar.minimumDate = new Date(1900, 0, 1); + calendar.minimumDate = new Date(1922, 0, 1); calendar.maximumDate = new Date(1999, 11, 31); calendar.selectedDate = new Date(1980, 0, 1); calendar.frameVisible = false; calendar.dayOfWeekFormat = Locale.NarrowFormat; calendar.locale = Qt.locale("de_DE"); - compare(calendar.minimumDate, new Date(1900, 0, 1)); - compare(calendar.maximumDate, new Date(1999, 11, 31)); + compare(calendar.minimumDate, new Date(1922, 0, 1)); + compare(calendar.maximumDate, new Date(1999, 11, 31, 23, 59, 59, 999)); compare(calendar.selectedDate, new Date(1980, 0, 1)); compare(calendar.frameVisible, false); compare(calendar.locale, Qt.locale("de_DE")); |