diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 1582835fda..c670147920 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -1370,19 +1370,19 @@ void tst_QDateTimeEdit::editingRanged() QFETCH(QString, userInput); QFETCH(QDateTime, expected); - QDateTimeEdit *edit; + QScopedPointer<QDateTimeEdit> edit; if (minTime.isValid()) { - edit = new QDateTimeEdit; + edit.reset(new QDateTimeEdit); edit->setDisplayFormat("dd.MM.yyyy hh:mm"); edit->setDateTimeRange(QDateTime(minDate, minTime), QDateTime(maxDate, maxTime)); } else { - edit = new QDateEdit; + edit.reset(new QDateEdit); edit->setDisplayFormat("dd.MM.yyyy"); edit->setDateRange(minDate, maxDate); } int callCount = 0; - connect(edit, &QDateTimeEdit::dateTimeChanged, [&](const QDateTime &dateTime) { + connect(edit.get(), &QDateTimeEdit::dateTimeChanged, [&](const QDateTime &dateTime) { ++callCount; if (minTime.isValid()) { QVERIFY(dateTime >= QDateTime(minDate, minTime)); @@ -1394,15 +1394,15 @@ void tst_QDateTimeEdit::editingRanged() }); edit->show(); - QApplication::setActiveWindow(edit); - if (!QTest::qWaitForWindowActive(edit)) + QApplication::setActiveWindow(edit.get()); + if (!QTest::qWaitForWindowActive(edit.get())) QSKIP("Failed to make window active, aborting"); edit->setFocus(); // with keyboard tracking, never get a signal with an out-of-range value edit->setKeyboardTracking(true); - QTest::keyClicks(edit, userInput); - QTest::keyClick(edit, Qt::Key_Return); + QTest::keyClicks(edit.get(), userInput); + QTest::keyClick(edit.get(), Qt::Key_Return); QVERIFY(callCount > 0); // QDateTimeEdit blocks these dates from being entered - see QTBUG-65 @@ -1418,12 +1418,10 @@ void tst_QDateTimeEdit::editingRanged() callCount = 0; edit->setKeyboardTracking(false); - QTest::keyClicks(edit, userInput); - QTest::keyClick(edit, Qt::Key_Return); + QTest::keyClicks(edit.get(), userInput); + QTest::keyClick(edit.get(), Qt::Key_Return); QCOMPARE(edit->dateTime(), expected); QCOMPARE(callCount, 1); - - delete edit; } void tst_QDateTimeEdit::wrappingTime_data() @@ -3807,7 +3805,6 @@ void tst_QDateTimeEdit::deleteCalendarWidget() { { // setup - QCalendarWidget *cw = 0; QDateEdit edit; QVERIFY(!edit.calendarWidget()); edit.setCalendarPopup(true); @@ -3815,8 +3812,7 @@ void tst_QDateTimeEdit::deleteCalendarWidget() edit.calendarWidget()->setObjectName("cw1");; // delete - cw = edit.calendarWidget(); - delete cw; + delete edit.calendarWidget(); // it should create a new widget QVERIFY(edit.calendarWidget()); @@ -4475,7 +4471,7 @@ static QDateTime findSpring(int year, const QTimeZone &timeZone) return QDateTime(); // Southern hemisphere spring is after midsummer - const QDateTime midSummer = QDate(year, 6, 21).startOfDay(); + const QDateTime midSummer = QDate(year, 6, 21).startOfDay(timeZone); const QTimeZone::OffsetData transition = midSummer.isDaylightTime() ? timeZone.previousTransition(midSummer) : timeZone.nextTransition(midSummer); @@ -4596,7 +4592,7 @@ void tst_QDateTimeEdit::stepIntoDSTGap_data() QTest::addColumn<int>("steps"); QTest::addColumn<QDateTime>("end"); - const QTimeZone timeZone = QTimeZone::systemTimeZone(); + const QTimeZone timeZone = QTimeZone("Europe/Oslo"); if (!timeZone.hasDaylightTime()) QSKIP("This test needs to run in a timezone that observes DST!"); @@ -4611,14 +4607,14 @@ void tst_QDateTimeEdit::stepIntoDSTGap_data() // change hour if (springGap.hour() != 0) { QTest::addRow("hour up into %s gap", qPrintable(springGap.toString("hh:mm"))) - << QDateTime(spring, springGap.addSecs(-3600)) + << QDateTime(spring, springGap.addSecs(-3600), timeZone) << QDateTimeEdit::HourSection << +1 << springTransition; // 3:00:10 into 2:00:10 should get us to 1:00:10 QTest::addRow("hour down into %s gap", qPrintable(springGap.toString("hh:mm"))) - << QDateTime(spring, springGap.addSecs(3610)) + << QDateTime(spring, springGap.addSecs(3610), timeZone) << QDateTimeEdit::HourSection << -1 << QDateTime(spring, springGap.addSecs(-3590)); @@ -4628,7 +4624,7 @@ void tst_QDateTimeEdit::stepIntoDSTGap_data() if (spring.day() != 1) { // today's 2:05 is tomorrow's 3:05 QTest::addRow("day up into %s gap", qPrintable(springGap.toString("hh:mm"))) - << QDateTime(spring.addDays(-1), springGap.addSecs(300)) + << QDateTime(spring.addDays(-1), springGap.addSecs(300), timeZone) << QDateTimeEdit::DaySection << +1 << springTransition.addSecs(300); @@ -4636,7 +4632,7 @@ void tst_QDateTimeEdit::stepIntoDSTGap_data() if (spring.day() != spring.daysInMonth()) { QTest::addRow("day down into %s gap", qPrintable(springGap.toString("hh:mm"))) - << QDateTime(spring.addDays(1), springGap) + << QDateTime(spring.addDays(1), springGap, timeZone) << QDateTimeEdit::DaySection << -1 << springTransition; @@ -4644,24 +4640,24 @@ void tst_QDateTimeEdit::stepIntoDSTGap_data() // 2018-03-25 - change month QTest::addRow("month up into %s gap", qPrintable(springGap.toString("hh:mm"))) - << QDateTime(spring.addMonths(-1), springGap) + << QDateTime(spring.addMonths(-1), springGap, timeZone) << QDateTimeEdit::MonthSection << +1 << springTransition; QTest::addRow("month down into %s gap", qPrintable(springGap.toString("hh:mm"))) - << QDateTime(spring.addMonths(1), springGap) + << QDateTime(spring.addMonths(1), springGap, timeZone) << QDateTimeEdit::MonthSection << -1 << springTransition; // 2018-03-25 - change year QTest::addRow("year up into %s gap", qPrintable(springGap.toString("hh:mm"))) - << QDateTime(spring.addYears(-1), springGap) + << QDateTime(spring.addYears(-1), springGap, timeZone) << QDateTimeEdit::YearSection << +1 << springTransition; QTest::addRow("year down into %s gap", qPrintable(springGap.toString("hh:mm"))) - << QDateTime(spring.addYears(1), springGap) + << QDateTime(spring.addYears(1), springGap, timeZone) << QDateTimeEdit::YearSection << -1 << springTransition; |