1 files changed, 48 insertions, 5 deletions

diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index 6f0aebb071..ac1b903aa1 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -61,6 +61,10 @@ private slots:
     void timeSpec();
     void toSecsSinceEpoch_data();
     void toSecsSinceEpoch();
+#if QT_DEPRECATED_SINCE(5, 8)
+    void toTime_t_data();
+    void toTime_t();
+#endif
     void daylightSavingsTimeChange_data();
     void daylightSavingsTimeChange();
     void springForward_data();
@@ -147,6 +151,7 @@ private slots:
     void systemTimeZoneChange() const;
 
     void invalid() const;
+    void range() const;
 
     void macTypes();
 
@@ -1689,6 +1694,34 @@ void tst_QDateTime::toSecsSinceEpoch()
     QDateTime datetime = dt( dateTimeStr );
 
     qint64 asSecsSinceEpoch = datetime.toSecsSinceEpoch();
+    QCOMPARE(asSecsSinceEpoch, datetime.toMSecsSinceEpoch() / 1000);
+
+    QDateTime datetime2 = QDateTime::fromSecsSinceEpoch(asSecsSinceEpoch);
+    QCOMPARE(datetime, datetime2);
+}
+
+#if QT_DEPRECATED_SINCE(5, 8)
+void tst_QDateTime::toTime_t_data()
+{
+    QTest::addColumn<QString>("dateTimeStr");
+    QTest::addColumn<bool>("res");
+
+    QTest::newRow( "data1" ) << str( 1800, 1, 1, 12, 0, 0 ) << false;
+    QTest::newRow( "data2" ) << str( 1969, 1, 1, 12, 0, 0 ) << false;
+    QTest::newRow( "data3" ) << str( 2002, 1, 1, 12, 0, 0 ) << true;
+    QTest::newRow( "data4" ) << str( 2002, 6, 1, 12, 0, 0 ) << true;
+    QTest::newRow( "data5" ) << QString("INVALID") << false;
+    QTest::newRow( "data6" ) << str( 2038, 1, 1, 12, 0, 0 ) << true;
+    QTest::newRow( "data7" ) << str( 2063, 4, 5, 12, 0, 0 ) << true; // the day of First Contact
+    QTest::newRow( "data8" ) << str( 2107, 1, 1, 12, 0, 0 )
+                             << bool( sizeof(uint) > 32 && sizeof(time_t) > 32 );
+}
+
+void tst_QDateTime::toTime_t()
+{
+    QFETCH( QString, dateTimeStr );
+    QDateTime datetime = dt( dateTimeStr );
+
     uint asTime_t = datetime.toTime_t();
     QFETCH( bool, res );
     if (res) {
@@ -1696,15 +1729,13 @@ void tst_QDateTime::toSecsSinceEpoch()
     } else {
         QVERIFY( asTime_t == (uint)-1 );
     }
-    QCOMPARE(asSecsSinceEpoch, datetime.toMSecsSinceEpoch() / 1000);
 
     if ( asTime_t != (uint) -1 ) {
         QDateTime datetime2 = QDateTime::fromTime_t( asTime_t );
         QCOMPARE(datetime, datetime2);
     }
-    QDateTime datetime2 = QDateTime::fromSecsSinceEpoch(asSecsSinceEpoch);
-    QCOMPARE(datetime, datetime2);
 }
+#endif
 
 void tst_QDateTime::daylightSavingsTimeChange_data()
 {
@@ -2489,17 +2520,20 @@ void tst_QDateTime::fromString_LOCALE_ILDATE()
 
 void tst_QDateTime::fromStringToStringLocale_data()
 {
+    QTest::addColumn<QLocale>("locale");
     QTest::addColumn<QDateTime>("dateTime");
 
-    QTest::newRow("data0") << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
+    QTest::newRow("frFR") << QLocale(QLocale::French, QLocale::France) << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
+    QTest::newRow("spCO") << QLocale(QLocale::Spanish, QLocale::Colombia) << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
 }
 
 void tst_QDateTime::fromStringToStringLocale()
 {
+    QFETCH(QLocale, locale);
     QFETCH(QDateTime, dateTime);
 
     QLocale def;
-    QLocale::setDefault(QLocale(QLocale::French, QLocale::France));
+    QLocale::setDefault(locale);
 #define ROUNDTRIP(format) \
     QCOMPARE(QDateTime::fromString(dateTime.toString(format), format), dateTime)
 
@@ -3472,6 +3506,15 @@ void tst_QDateTime::invalid() const
     QCOMPARE(tzDate.timeSpec(), Qt::TimeZone);
 }
 
+void tst_QDateTime::range() const
+{
+    using Bounds = std::numeric_limits<qint64>;
+    QCOMPARE(QDateTime::fromMSecsSinceEpoch(Bounds::min() + 1, Qt::UTC).date().year(),
+             int(QDateTime::YearRange::First));
+    QCOMPARE(QDateTime::fromMSecsSinceEpoch(Bounds::max() - 1, Qt::UTC).date().year(),
+             int(QDateTime::YearRange::Last));
+}
+
 void tst_QDateTime::macTypes()
 {
 #ifndef Q_OS_MAC