Explain the cases where we must exclude some QDTE test cases

The stepIntoDSTGap() hour cases were already conditioned on hour > 0,
explain why. The month and year tests need similar checks for kindred
reasons; add and document those checks.

Pick-to: 6.5
Change-Id: Ibcb69449fcd572ee94306a805fd680e9b5155322
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 24 insertions, 21 deletions

diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index ddebea0e82..63b0e9c318 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -4713,7 +4713,7 @@ void tst_QDateTimeEdit::stepIntoDSTGap_data()
     const QTime springGap = springTransition.time().addSecs(-gapWidth);
     const QByteArray springTime = springGap.toString("hh:mm").toLocal8Bit();
 
-    // change hour
+    // change hour (can't change day):
     if (springGap.hour() != 0) {
         QTest::addRow("hour up into %s gap", springTime.data())
             << QDateTime(spring, springGap.addSecs(-3600))
@@ -4748,28 +4748,31 @@ void tst_QDateTimeEdit::stepIntoDSTGap_data()
     }
 
     // change month
-    QTest::addRow("month up into %s gap", springTime.data())
-        << QDateTime(spring.addMonths(-1), springGap)
-        << QDateTimeEdit::MonthSection
-        << +1
-        << springTransition;
-    QTest::addRow("month down into %s gap", springTime.data())
-        << QDateTime(spring.addMonths(1), springGap)
-        << QDateTimeEdit::MonthSection
-        << -1
-        << springTransition;
+    // Previous month may well be February, so lack the day-of-month that
+    // matches spring (e.g. Asia/Jerusalem, March 30).
+    if (QDate prior = spring.addMonths(-1); prior.day() == spring.day()) {
+        QTest::addRow("month up into %s gap", springTime.data())
+            << QDateTime(prior, springGap) << QDateTimeEdit::MonthSection << +1 << springTransition;
+    }
+    // America/{Jujuy,Cordoba,Catamarca} did a 2007 Dec 30th 00:00 spring
+    // forward; and QDTE month steps won't change the year.
+    if (QDate prior = spring.addMonths(1);
+        prior.year() == spring.year() && prior.day() == spring.day()) {
+        QTest::addRow("month down into %s gap", springTime.data())
+            << QDateTime(prior, springGap) << QDateTimeEdit::MonthSection << -1 << springTransition;
+    }
 
     // change year
-    QTest::addRow("year up into %s gap", springTime.data())
-        << QDateTime(spring.addYears(-1), springGap)
-        << QDateTimeEdit::YearSection
-        << +1
-        << springTransition;
-    QTest::addRow("year down into %s gap", springTime.data())
-        << QDateTime(spring.addYears(1), springGap)
-        << QDateTimeEdit::YearSection
-        << -1
-        << springTransition;
+    // Some zones (e.g. Asia/Baghdad) do transitions on a fixed date; for these,
+    // the springGap moment is invalid every year, so skip this test.
+    if (QDateTime prior = QDateTime(spring.addYears(-1), springGap); prior.isValid()) {
+        QTest::addRow("year up into %s gap", springTime.data())
+            << prior << QDateTimeEdit::YearSection << +1 << springTransition;
+    }
+    if (QDateTime later(spring.addYears(1), springGap); later.isValid()) {
+        QTest::addRow("year down into %s gap", springTime.data())
+            << later << QDateTimeEdit::YearSection << -1 << springTransition;
+    }
 #else
     QSKIP("Needs timezone feature enabled");
 #endif