AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qmessagebox: port away from deprecated methods

Browse Source 
* Wrap some tests that specifically test deprecated APIs
  into #ifdefery
* Refactor some tests to use available methods

Task-number: QTBUG-104858
Change-Id: I03e318004ce1c2718ee574bf11e00df9bc04bcaa
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Ivan Solovev 2022-08-17 16:06:54 +02:00
parent 906dfef22b
commit 6180e496c2
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
View File

@ -416,6 +416,8 @@ QT_WARNING_DISABLE_DEPRECATED
QCOMPARE(ret, int(QMessageBox::Yes));
QVERIFY(closeHelper.done());
#if QT_DEPRECATED_SINCE(6, 2)
// The overloads below are valid only before 6.2
closeHelper.start(Qt::Key_Enter);
ret = QMessageBox::information(nullptr, "title", "text", QMessageBox::Yes, QMessageBox::No | QMessageBox::Default);
QCOMPARE(ret, int(QMessageBox::No));
@ -448,22 +450,21 @@ QT_WARNING_DISABLE_DEPRECATED
QCOMPARE(ret, 1);
QVERIFY(closeHelper.done());
}
#endif // QT_DEPRECATED_SINCE(6, 2)
QT_WARNING_POP
}
void tst_QMessageBox::instanceSourceCompat()
{
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
QMessageBox mb("Application name here",
"Saving the file will overwrite the original file on the disk.\n"
"Do you really want to save?",
QMessageBox::Information,
QMessageBox::Yes | QMessageBox::Default,
QMessageBox::No,
QMessageBox::Cancel | QMessageBox::Escape);
mb.setButtonText(QMessageBox::Yes, "Save");
mb.setButtonText(QMessageBox::No, "Discard");
QMessageBox mb(QMessageBox::Information,
"Application name here",
"Saving the file will overwrite the original file on the disk.\n"
"Do you really want to save?",
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
mb.setDefaultButton(QMessageBox::Yes);
mb.setEscapeButton(QMessageBox::Cancel);
mb.button(QMessageBox::Yes)->setText("Save");
mb.button(QMessageBox::No)->setText("Discard");
mb.addButton("&Revert", QMessageBox::RejectRole);
mb.addButton("&Zoo", QMessageBox::ActionRole);
@ -479,7 +480,6 @@ QT_WARNING_DISABLE_DEPRECATED
closeHelper.start(QKeyCombination(Qt::ALT | Qt::Key_Z).toCombined(), &mb);
QCOMPARE(mb.exec(), 1);
#endif
QT_WARNING_POP
}
void tst_QMessageBox::detailsText()
@ -557,6 +557,7 @@ void tst_QMessageBox::incorrectDefaultButton()
QMessageBox::question(nullptr, "", "I've been hit!",QFlag(QMessageBox::Ok | QMessageBox::Cancel),QMessageBox::Save);
QVERIFY(closeHelper.done());
#if QT_DEPRECATED_SINCE(6, 2)
closeHelper.start(Qt::Key_Escape);
QTest::ignoreMessage(QtWarningMsg, "QDialogButtonBox::createButton: Invalid ButtonRole, button not added");
QTest::ignoreMessage(QtWarningMsg, "QDialogButtonBox::createButton: Invalid ButtonRole, button not added");
@ -566,6 +567,7 @@ QT_WARNING_DISABLE_DEPRECATED
QMessageBox::question(nullptr, "", "I've been hit!",QMessageBox::Ok | QMessageBox::Cancel,QMessageBox::Save | QMessageBox::Cancel,QMessageBox::Ok);
QT_WARNING_POP
QVERIFY(closeHelper.done());
#endif
}
void tst_QMessageBox::updateSize()