diff options
Diffstat (limited to 'tests/auto/widgets/dialogs')
17 files changed, 261 insertions, 136 deletions
diff --git a/tests/auto/widgets/dialogs/CMakeLists.txt b/tests/auto/widgets/dialogs/CMakeLists.txt new file mode 100644 index 0000000000..508093e7ad --- /dev/null +++ b/tests/auto/widgets/dialogs/CMakeLists.txt @@ -0,0 +1,19 @@ +add_subdirectory(qcolordialog) +add_subdirectory(qdialog) +add_subdirectory(qerrormessage) +if (NOT WINRT) + add_subdirectory(qfiledialog) + add_subdirectory(qfiledialog2) + add_subdirectory(qmessagebox) +endif() +if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR NOT WIN32) + add_subdirectory(qfilesystemmodel) +endif() +add_subdirectory(qfontdialog) +add_subdirectory(qinputdialog) +add_subdirectory(qprogressdialog) +if (QT_FEATURE_private_tests) + add_subdirectory(qsidebar) +endif() +add_subdirectory(qwizard) + diff --git a/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt new file mode 100644 index 0000000000..81ffdeff90 --- /dev/null +++ b/tests/auto/widgets/dialogs/qcolordialog/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qcolordialog.pro. + +##################################################################### +## tst_qcolordialog Test: +##################################################################### + +add_qt_test(tst_qcolordialog + SOURCES + tst_qcolordialog.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt new file mode 100644 index 0000000000..2c003f6fb6 --- /dev/null +++ b/tests/auto/widgets/dialogs/qdialog/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qdialog.pro. + +##################################################################### +## tst_qdialog Test: +##################################################################### + +add_qt_test(tst_qdialog + SOURCES + tst_qdialog.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 10a3746e36..94915d0e40 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -52,9 +52,6 @@ class DummyDialog : public QDialog { public: DummyDialog(): QDialog() {} -#if QT_DEPRECATED_SINCE(5, 13) - using QDialog::showExtension; -#endif }; class tst_QDialog : public QObject @@ -66,10 +63,6 @@ public: private slots: void cleanup(); void getSetCheck(); -#if QT_DEPRECATED_SINCE(5, 13) - void showExtension_data(); - void showExtension(); -#endif void defaultButtons(); void showMaximized(); void showMinimized(); @@ -80,9 +73,6 @@ private slots: void deleteInExec(); #if QT_CONFIG(sizegrip) void showSizeGrip(); -#if QT_DEPRECATED_SINCE(5, 13) - void showSizeGrip_deprecated(); -#endif #endif void setVisible(); void reject(); @@ -96,17 +86,6 @@ private slots: void tst_QDialog::getSetCheck() { QDialog obj1; -#if QT_DEPRECATED_SINCE(5, 13) - // QWidget* QDialog::extension() - // void QDialog::setExtension(QWidget*) - QWidget *var1 = new QWidget; - obj1.setExtension(var1); - QCOMPARE(var1, obj1.extension()); - obj1.setExtension((QWidget *)0); - QCOMPARE((QWidget *)0, obj1.extension()); - // No delete var1, since setExtension takes ownership -#endif - // int QDialog::result() // void QDialog::setResult(int) obj1.setResult(0); @@ -155,59 +134,6 @@ void tst_QDialog::cleanup() QVERIFY(QApplication::topLevelWidgets().isEmpty()); } -#if QT_DEPRECATED_SINCE(5, 13) -void tst_QDialog::showExtension_data() -{ - QTest::addColumn<QSize>("dlgSize"); - QTest::addColumn<QSize>("extSize"); - QTest::addColumn<bool>("horizontal"); - QTest::addColumn<QSize>("result"); - - //next we fill it with data - QTest::newRow( "data0" ) << QSize(200,100) << QSize(50,50) << false << QSize(200,150); - QTest::newRow( "data1" ) << QSize(200,100) << QSize(220,50) << false << QSize(220,150); - QTest::newRow( "data2" ) << QSize(200,100) << QSize(50,50) << true << QSize(250,100); - QTest::newRow( "data3" ) << QSize(200,100) << QSize(50,120) << true << QSize(250,120); -} - -void tst_QDialog::showExtension() -{ - QFETCH( QSize, dlgSize ); - QFETCH( QSize, extSize ); - QFETCH( bool, horizontal ); - - DummyDialog testWidget; - testWidget.resize(200, 200); - testWidget.setWindowTitle(QLatin1String(QTest::currentTestFunction()) + QLatin1Char(':') - + QLatin1String(QTest::currentDataTag())); - testWidget.show(); - QVERIFY(QTest::qWaitForWindowExposed(&testWidget)); - - testWidget.setFixedSize( dlgSize ); - QWidget *ext = new QWidget( &testWidget ); - ext->setFixedSize( extSize ); - testWidget.setExtension( ext ); - testWidget.setOrientation( horizontal ? Qt::Horizontal : Qt::Vertical ); - - QCOMPARE( testWidget.size(), dlgSize ); - QPoint oldPosition = testWidget.pos(); - - // show - testWidget.showExtension( true ); -// while ( testWidget->size() == dlgSize ) -// qApp->processEvents(); - - QTEST( testWidget.size(), "result" ); - - QCOMPARE(testWidget.pos(), oldPosition); - - // hide extension. back to old size ? - testWidget.showExtension( false ); - QCOMPARE( testWidget.size(), dlgSize ); - - testWidget.setExtension( 0 ); -} -#endif void tst_QDialog::defaultButtons() { @@ -434,7 +360,6 @@ void tst_QDialog::deleteInExec() #if QT_CONFIG(sizegrip) -// From Task 124269 void tst_QDialog::showSizeGrip() { QDialog dialog(nullptr); @@ -461,62 +386,6 @@ void tst_QDialog::showSizeGrip() QVERIFY(!sizeGrip->isVisible()); } -#if QT_DEPRECATED_SINCE(5, 13) -void tst_QDialog::showSizeGrip_deprecated() -{ - QDialog dialog(0); - dialog.show(); - QWidget *ext = new QWidget(&dialog); - QVERIFY(!dialog.extension()); - QVERIFY(!dialog.isSizeGripEnabled()); - - dialog.setSizeGripEnabled(true); - QPointer<QSizeGrip> sizeGrip = dialog.findChild<QSizeGrip *>(); - QVERIFY(sizeGrip); - QVERIFY(sizeGrip->isVisible()); - QVERIFY(dialog.isSizeGripEnabled()); - - dialog.setExtension(ext); - QVERIFY(dialog.extension() && !dialog.extension()->isVisible()); - QVERIFY(dialog.isSizeGripEnabled()); - - // normal show/hide sequence - dialog.showExtension(true); - QVERIFY(dialog.extension() && dialog.extension()->isVisible()); - QVERIFY(!dialog.isSizeGripEnabled()); - QVERIFY(!sizeGrip); - - dialog.showExtension(false); - QVERIFY(dialog.extension() && !dialog.extension()->isVisible()); - QVERIFY(dialog.isSizeGripEnabled()); - sizeGrip = dialog.findChild<QSizeGrip *>(); - QVERIFY(sizeGrip); - QVERIFY(sizeGrip->isVisible()); - - // show/hide sequence with interleaved size grip update - dialog.showExtension(true); - QVERIFY(dialog.extension() && dialog.extension()->isVisible()); - QVERIFY(!dialog.isSizeGripEnabled()); - QVERIFY(!sizeGrip); - - dialog.setSizeGripEnabled(false); - QVERIFY(!dialog.isSizeGripEnabled()); - - dialog.showExtension(false); - QVERIFY(dialog.extension() && !dialog.extension()->isVisible()); - QVERIFY(!dialog.isSizeGripEnabled()); - - dialog.setSizeGripEnabled(true); - sizeGrip = dialog.findChild<QSizeGrip *>(); - QVERIFY(sizeGrip); - QVERIFY(sizeGrip->isVisible()); - sizeGrip->hide(); - dialog.hide(); - dialog.show(); - QVERIFY(!sizeGrip->isVisible()); -} -#endif // QT_DEPRECATED_SINCE(5, 13) - #endif // QT_CONFIG(sizegrip) void tst_QDialog::setVisible() diff --git a/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt new file mode 100644 index 0000000000..9463020c66 --- /dev/null +++ b/tests/auto/widgets/dialogs/qerrormessage/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from qerrormessage.pro. + +##################################################################### +## tst_qerrormessage Test: +##################################################################### + +add_qt_test(tst_qerrormessage + SOURCES + tst_qerrormessage.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qerrormessage.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt new file mode 100644 index 0000000000..7b6d004776 --- /dev/null +++ b/tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qfiledialog.pro. + +##################################################################### +## tst_qfiledialog Test: +##################################################################### + +add_qt_test(tst_qfiledialog + SOURCES + tst_qfiledialog.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets + Qt::WidgetsPrivate +) diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index afb24bc528..9f09c7cfd1 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -801,9 +801,6 @@ void tst_QFiledialog::isReadOnly() QAction* renameAction = fd.findChild<QAction*>("qt_rename_action"); QAction* deleteAction = fd.findChild<QAction*>("qt_delete_action"); -#if QT_DEPRECATED_SINCE(5, 13) - QCOMPARE(fd.isReadOnly(), false); -#endif QCOMPARE(fd.testOption(QFileDialog::ReadOnly), false); // This is dependent upon the file/dir, find cross platform way to test diff --git a/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt new file mode 100644 index 0000000000..2fb610a784 --- /dev/null +++ b/tests/auto/widgets/dialogs/qfiledialog2/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qfiledialog2.pro. + +##################################################################### +## tst_qfiledialog2 Test: +##################################################################### + +add_qt_test(tst_qfiledialog2 + SOURCES + tst_qfiledialog2.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets + Qt::WidgetsPrivate +) diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt new file mode 100644 index 0000000000..346e2a7d5a --- /dev/null +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from qfilesystemmodel.pro. + +##################################################################### +## tst_qfilesystemmodel Test: +##################################################################### + +add_qt_test(tst_qfilesystemmodel + SOURCES + ../../../../shared/emulationdetector.h + tst_qfilesystemmodel.cpp + INCLUDE_DIRECTORIES + ../../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::Widgets + Qt::WidgetsPrivate +) + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qfilesystemmodel.pro:WIN32: +# testcase.timeout = "900" + +#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:MACOS: +# testcase.timeout = "900" diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp index 2c0b3f2bcb..63bf103725 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -1071,7 +1071,7 @@ void tst_QFileSystemModel::roleNames() QVERIFY(roles.contains(role)); QFETCH(QByteArray, roleName); - QCOMPARE(roles.values(role).count(), 1); + QCOMPARE(roles.contains(role), true); QCOMPARE(roles.value(role), roleName); } diff --git a/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt new file mode 100644 index 0000000000..af858c8946 --- /dev/null +++ b/tests/auto/widgets/dialogs/qfontdialog/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from qfontdialog.pro. + +##################################################################### +## tst_qfontdialog Test: +##################################################################### + +add_qt_test(tst_qfontdialog + SOURCES + tst_qfontdialog.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets + Qt::WidgetsPrivate +) + +# Resources: +set_source_files_properties("../../../shared/resources/test.ttf" + PROPERTIES QT_RESOURCE_ALIAS "test.ttf" +) +set_source_files_properties("../../../shared/resources/testfont.ttf" + PROPERTIES QT_RESOURCE_ALIAS "testfont.ttf" +) +set(testfonts_resource_files + "../../../shared/resources/test.ttf" + "../../../shared/resources/testfont.ttf" +) + +add_qt_resource(tst_qfontdialog "testfonts" + PREFIX + "/" + FILES + ${testfonts_resource_files} +) + + +## Scopes: +##################################################################### diff --git a/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt new file mode 100644 index 0000000000..7cd02a04c0 --- /dev/null +++ b/tests/auto/widgets/dialogs/qinputdialog/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qinputdialog.pro. + +##################################################################### +## tst_qinputdialog Test: +##################################################################### + +add_qt_test(tst_qinputdialog + SOURCES + tst_qinputdialog.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::WidgetsPrivate +) diff --git a/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt new file mode 100644 index 0000000000..ae12c58ca2 --- /dev/null +++ b/tests/auto/widgets/dialogs/qmessagebox/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qmessagebox.pro. + +##################################################################### +## tst_qmessagebox Test: +##################################################################### + +add_qt_test(tst_qmessagebox + SOURCES + tst_qmessagebox.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qmessagebox.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt new file mode 100644 index 0000000000..2f20ff0d81 --- /dev/null +++ b/tests/auto/widgets/dialogs/qprogressdialog/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qprogressdialog.pro. + +##################################################################### +## tst_qprogressdialog Test: +##################################################################### + +add_qt_test(tst_qprogressdialog + SOURCES + tst_qprogressdialog.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt new file mode 100644 index 0000000000..d1e2a6686c --- /dev/null +++ b/tests/auto/widgets/dialogs/qsidebar/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qsidebar.pro. + +##################################################################### +## tst_qsidebar Test: +##################################################################### + +add_qt_test(tst_qsidebar + SOURCES + tst_qsidebar.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::Widgets + Qt::WidgetsPrivate +) diff --git a/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt new file mode 100644 index 0000000000..bbe7bddd9d --- /dev/null +++ b/tests/auto/widgets/dialogs/qwizard/CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from qwizard.pro. + +##################################################################### +## tst_qwizard Test: +##################################################################### + +add_qt_test(tst_qwizard + SOURCES + tst_qwizard.cpp + tst_qwizard_2.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +# Resources: +set(qwizard_resource_files + "images/background.png" + "images/banner.png" + "images/logo.png" + "images/watermark.png" +) + +add_qt_resource(tst_qwizard "qwizard" + PREFIX + "/" + FILES + ${qwizard_resource_files} +) + diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp index 78616009a2..5b7ded0ecb 100644 --- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp +++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp @@ -96,8 +96,9 @@ private slots: void task248107_backButton(); void task255350_fieldObjectDestroyed(); void taskQTBUG_25691_fieldObjectDestroyed2(); +#if QT_CONFIG(shortcut) void taskQTBUG_46894_nextButtonShortcut(); - +#endif /* Things that could be added: @@ -2703,6 +2704,8 @@ void tst_QWizard::taskQTBUG_25691_fieldObjectDestroyed2() ::taskQTBUG_25691_fieldObjectDestroyed2(); } +#if QT_CONFIG(shortcut) + void tst_QWizard::taskQTBUG_46894_nextButtonShortcut() { for (int i = 0; i < QWizard::NStyles; ++i) { @@ -2717,5 +2720,7 @@ void tst_QWizard::taskQTBUG_46894_nextButtonShortcut() } } +#endif // QT_CONFIG(shortcut) + QTEST_MAIN(tst_QWizard) #include "tst_qwizard.moc" |