From 4652da536a5db3608e6026b27dfe808227b721f2 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Wed, 2 Jun 2021 12:15:05 +0200
Subject: tst_QDateTimeEdit::editingRanged(): use QScopedPointer

Test would previously have leaked on failure.
While checking for other uses of delete-after-checks, simplify one
place that tested deleting a calendar widget lead to recreation.

Pick-to: 5.15 6.1
Change-Id: I9524902a02dd42793bcf71113c6799dc925ac4a0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 .../widgets/qdatetimeedit/tst_qdatetimeedit.cpp    | 28 ++++++++++------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index ffe171d5f0..5f003928c0 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) 2020 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()
@@ -3858,7 +3856,6 @@ void tst_QDateTimeEdit::deleteCalendarWidget()
 {
     {
         // setup
-        QCalendarWidget *cw = 0;
         QDateEdit edit;
         QVERIFY(!edit.calendarWidget());
         edit.setCalendarPopup(true);
@@ -3866,8 +3863,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());
-- 
cgit v1.2.3