From ca222646ff7890cf6e2d0363ab547947055284f6 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 23 Jan 2020 18:01:24 +0100 Subject: Purge from Q(Date|Time)+ most things marked to go at Qt 6 Change-Id: Ib3f48c74132b47649dc7b4cbacf2cefed5a57687 Reviewed-by: Qt CI Bot Reviewed-by: Thiago Macieira --- tests/auto/corelib/time/qdate/tst_qdate.cpp | 154 --------------------- .../auto/corelib/time/qdatetime/tst_qdatetime.cpp | 37 ----- .../corelib/time/qdatetime/tst_qdatetime_mac.mm | 6 +- 3 files changed, 3 insertions(+), 194 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/time/qdate/tst_qdate.cpp b/tests/auto/corelib/time/qdate/tst_qdate.cpp index 402c2c74d4..cc0c9fb894 100644 --- a/tests/auto/corelib/time/qdate/tst_qdate.cpp +++ b/tests/auto/corelib/time/qdate/tst_qdate.cpp @@ -91,16 +91,6 @@ private slots: void printNegativeYear_data() const; void printNegativeYear() const; void roundtripGermanLocale() const; -#if QT_CONFIG(textdate) && QT_DEPRECATED_SINCE(5, 10) - void shortDayName() const; - void standaloneShortDayName() const; - void longDayName() const; - void standaloneLongDayName() const; - void shortMonthName() const; - void standaloneShortMonthName() const; - void longMonthName() const; - void standaloneLongMonthName() const; -#endif // textdate void roundtrip() const; void qdebug() const; private: @@ -1436,16 +1426,6 @@ void tst_QDate::yearsZeroToNinetyNine() QVERIFY(QDate::isValid(1, 2, 3)); QVERIFY(QDate::isValid(-1, 2, 3)); -#if QT_DEPRECATED_SINCE(5,0) - { - QDate dt; - dt.setYMD(1, 2, 3); - QCOMPARE(dt.year(), 1901); - QCOMPARE(dt.month(), 2); - QCOMPARE(dt.day(), 3); - } -#endif - { QDate dt; dt.setDate(1, 2, 3); @@ -1492,140 +1472,6 @@ void tst_QDate::roundtripGermanLocale() const theDateTime.fromString(theDateTime.toString(Qt::TextDate), Qt::TextDate); } -#if QT_CONFIG(textdate) && QT_DEPRECATED_SINCE(5, 10) -QT_WARNING_PUSH // the methods tested here are all deprecated -QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") - -void tst_QDate::shortDayName() const -{ - QCOMPARE(QDate::shortDayName(0), QString()); - QCOMPARE(QDate::shortDayName(8), QString()); - - if (QLocale::system().language() == QLocale::C) { - QCOMPARE(QDate::shortDayName(1), QLatin1String("Mon")); - QCOMPARE(QDate::shortDayName(7), QLatin1String("Sun")); - } - - QLocale locale = QLocale::system(); - for(int i = 1; i <= 7; ++i) { - QCOMPARE(QDate::shortDayName(i), locale.dayName(i, QLocale::ShortFormat)); - } -} - -void tst_QDate::standaloneShortDayName() const -{ - QCOMPARE(QDate::shortDayName(0, QDate::StandaloneFormat), QString()); - QCOMPARE(QDate::shortDayName(8, QDate::StandaloneFormat), QString()); - - if (QLocale::system().language() == QLocale::C) { - QCOMPARE(QDate::shortDayName(1, QDate::StandaloneFormat), QLatin1String("Mon")); - QCOMPARE(QDate::shortDayName(7, QDate::StandaloneFormat), QLatin1String("Sun")); - } - - QLocale locale = QLocale::system(); - for(int i = 1; i <= 7; ++i) { - QCOMPARE(QDate::shortDayName(i, QDate::StandaloneFormat), locale.standaloneDayName(i, QLocale::ShortFormat)); - } -} - -void tst_QDate::longDayName() const -{ - QCOMPARE(QDate::longDayName(0), QString()); - QCOMPARE(QDate::longDayName(8), QString()); - - if (QLocale::system().language() == QLocale::C) { - QCOMPARE(QDate::longDayName(1), QLatin1String("Monday")); - QCOMPARE(QDate::longDayName(7), QLatin1String("Sunday")); - } - - QLocale locale = QLocale::system(); - for(int i = 1; i <= 7; ++i) { - QCOMPARE(QDate::longDayName(i), locale.dayName(i, QLocale::LongFormat)); - } -} - -void tst_QDate::standaloneLongDayName() const -{ - QCOMPARE(QDate::longDayName(0, QDate::StandaloneFormat), QString()); - QCOMPARE(QDate::longDayName(8, QDate::StandaloneFormat), QString()); - - if (QLocale::system().language() == QLocale::C) { - QCOMPARE(QDate::longDayName(1, QDate::StandaloneFormat), QLatin1String("Monday")); - QCOMPARE(QDate::longDayName(7, QDate::StandaloneFormat), QLatin1String("Sunday")); - } - - QLocale locale = QLocale::system(); - for(int i = 1; i <= 7; ++i) { - QCOMPARE(QDate::longDayName(i, QDate::StandaloneFormat), locale.standaloneDayName(i, QLocale::LongFormat)); - } -} - -void tst_QDate::shortMonthName() const -{ - QCOMPARE(QDate::shortMonthName(0), QString()); - QCOMPARE(QDate::shortMonthName(13), QString()); - - if (QLocale::system().language() == QLocale::C) { - QCOMPARE(QDate::shortMonthName(1), QLatin1String("Jan")); - QCOMPARE(QDate::shortMonthName(8), QLatin1String("Aug")); - } - - QLocale locale = QLocale::system(); - for(int i = 1; i <= 12; ++i) { - QCOMPARE(QDate::shortMonthName(i), locale.monthName(i, QLocale::ShortFormat)); - } -} - -void tst_QDate::standaloneShortMonthName() const -{ - QCOMPARE(QDate::shortMonthName(0, QDate::StandaloneFormat), QString()); - QCOMPARE(QDate::shortMonthName(13, QDate::StandaloneFormat), QString()); - - if (QLocale::system().language() == QLocale::C) { - QCOMPARE(QDate::shortMonthName(1, QDate::StandaloneFormat), QLatin1String("Jan")); - QCOMPARE(QDate::shortMonthName(8, QDate::StandaloneFormat), QLatin1String("Aug")); - } - - QLocale locale = QLocale::system(); - for(int i = 1; i <= 12; ++i) { - QCOMPARE(QDate::shortMonthName(i, QDate::StandaloneFormat), locale.standaloneMonthName(i, QLocale::ShortFormat)); - } -} - -void tst_QDate::longMonthName() const -{ - QCOMPARE(QDate::longMonthName(0), QString()); - QCOMPARE(QDate::longMonthName(13), QString()); - - if (QLocale::system().language() == QLocale::C) { - QCOMPARE(QDate::longMonthName(1), QLatin1String("January")); - QCOMPARE(QDate::longMonthName(8), QLatin1String("August")); - } - - QLocale locale = QLocale::system(); - for(int i = 1; i <= 12; ++i) { - QCOMPARE(QDate::longMonthName(i), locale.monthName(i, QLocale::LongFormat)); - } -} - -void tst_QDate::standaloneLongMonthName() const -{ - QCOMPARE(QDate::longMonthName(0, QDate::StandaloneFormat), QString()); - QCOMPARE(QDate::longMonthName(13, QDate::StandaloneFormat), QString()); - - if (QLocale::system().language() == QLocale::C) { - QCOMPARE(QDate::longMonthName(1, QDate::StandaloneFormat), QLatin1String("January")); - QCOMPARE(QDate::longMonthName(8, QDate::StandaloneFormat), QLatin1String("August")); - } - - QLocale locale = QLocale::system(); - for(int i = 1; i <= 12; ++i) { - QCOMPARE(QDate::longMonthName(i, QDate::StandaloneFormat), locale.standaloneMonthName(i, QLocale::LongFormat)); - } -} -QT_WARNING_POP -#endif // textdate - void tst_QDate::roundtrip() const { // Test round trip, this exercises setDate(), isValid(), isLeapYear(), diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp index 07f83d1a63..65e12c1171 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp @@ -61,10 +61,6 @@ 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(); @@ -1710,39 +1706,6 @@ void tst_QDateTime::toSecsSinceEpoch() } } -#if QT_DEPRECATED_SINCE(5, 8) -void tst_QDateTime::toTime_t_data() -{ - QTest::addColumn("dateTimeStr"); - QTest::addColumn("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) { - QVERIFY(asTime_t != uint(-1)); - QCOMPARE(QDateTime::fromTime_t(asTime_t), datetime); - } else { - QCOMPARE(asTime_t, uint(-1)); - } -} -#endif - void tst_QDateTime::daylightSavingsTimeChange_data() { QTest::addColumn("inDST"); diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm b/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm index f73c7b9d5d..4af199b4f8 100644 --- a/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm +++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime_mac.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2014 Petroules Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -49,7 +49,7 @@ void tst_QDateTime_macTypes() QDateTime qtDateTime = QDateTime::fromMSecsSinceEpoch(0); const CFDateRef cfDate = qtDateTime.toCFDate(); QDateTime qtDateTimeCopy(qtDateTime); - qtDateTime.setTime_t(10000); // modify + qtDateTime.setSecsSinceEpoch(10000); // modify QCOMPARE(QDateTime::fromCFDate(cfDate), qtDateTimeCopy); } // QDateTime <-> NSDate @@ -64,7 +64,7 @@ void tst_QDateTime_macTypes() QDateTime qtDateTime = QDateTime::fromMSecsSinceEpoch(0); const NSDate *nsDate = qtDateTime.toNSDate(); QDateTime qtDateTimeCopy(qtDateTime); - qtDateTime.setTime_t(10000); // modify + qtDateTime.setSecsSinceEpoch(10000); // modify QCOMPARE(QDateTime::fromNSDate(nsDate), qtDateTimeCopy); } } -- cgit v1.2.3