summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp8
-rw-r--r--tests/auto/corelib/tools/qregexp/tst_qregexp.cpp2
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp64
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp2
-rw-r--r--tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp2
5 files changed, 38 insertions, 40 deletions
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
index 54c86ab632..fc3d8e0fbb 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
@@ -127,7 +127,7 @@ void tst_QCoreApplication::argc()
char *argv[] = { "tst_qcoreapplication" };
QCoreApplication app(argc, argv);
QCOMPARE(argc, 1);
- QCOMPARE(app.argc(), 1);
+ QCOMPARE(app.arguments().count(), 1);
}
{
@@ -135,7 +135,7 @@ void tst_QCoreApplication::argc()
char *argv[] = { "tst_qcoreapplication", "arg1", "arg2", "arg3" };
QCoreApplication app(argc, argv);
QCOMPARE(argc, 4);
- QCOMPARE(app.argc(), 4);
+ QCOMPARE(app.arguments().count(), 4);
}
{
@@ -143,7 +143,7 @@ void tst_QCoreApplication::argc()
char **argv = 0;
QCoreApplication app(argc, argv);
QCOMPARE(argc, 0);
- QCOMPARE(app.argc(), 0);
+ QCOMPARE(app.arguments().count(), 0);
}
{
@@ -151,7 +151,7 @@ void tst_QCoreApplication::argc()
char *argv[] = { "tst_qcoreapplication", "-qmljsdebugger=port:3768,block" };
QCoreApplication app(argc, argv);
QCOMPARE(argc, 1);
- QCOMPARE(app.argc(), 1);
+ QCOMPARE(app.arguments().count(), 1);
}
}
diff --git a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
index 53e9ccc6fd..0148e933e4 100644
--- a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
+++ b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
@@ -1311,7 +1311,7 @@ void tst_QRegExp::posAndCapConsistency()
QFETCH( QString, cap2 );
QRegExp re(reStr);
- QCOMPARE(re.numCaptures(), 2);
+ QCOMPARE(re.captureCount(), 2);
QCOMPARE(re.capturedTexts().size(), 3);
QCOMPARE(re.indexIn(text), matchIndex);
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 753b47dabf..14c2be5bd8 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -329,8 +329,8 @@ void tst_QFiledialog::filterSelectedSignal()
filterChoices << "Image files (*.png *.xpm *.jpg)"
<< "Text files (*.txt)"
<< "Any files (*.*)";
- fd.setFilters(filterChoices);
- QCOMPARE(fd.filters(), filterChoices);
+ fd.setNameFilters(filterChoices);
+ QCOMPARE(fd.nameFilters(), filterChoices);
QComboBox *filters = qFindChild<QComboBox*>(&fd, "fileTypeCombo");
QVERIFY(filters);
@@ -354,7 +354,7 @@ void tst_QFiledialog::args()
#ifndef Q_OS_WIN
QCOMPARE(fd.directory(), QDir(directory));
#endif
- QCOMPARE(fd.filters(), QStringList(filter));
+ QCOMPARE(fd.nameFilters(), QStringList(filter));
}
void tst_QFiledialog::directory()
@@ -648,7 +648,7 @@ void tst_QFiledialog::filters()
QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(const QString &)));
QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &)));
QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &)));
- QCOMPARE(fd.filters(), QStringList("All Files (*)"));
+ QCOMPARE(fd.nameFilters(), QStringList("All Files (*)"));
// effects
QList<QComboBox*> views = qFindChildren<QComboBox*>(&fd, "fileTypeCombo");
@@ -659,14 +659,14 @@ void tst_QFiledialog::filters()
filters << "Image files (*.png *.xpm *.jpg)"
<< "Text files (*.txt)"
<< "Any files (*.*)";
- fd.setFilters(filters);
+ fd.setNameFilters(filters);
QCOMPARE(views.at(0)->isVisible(), false);
fd.show();
fd.setAcceptMode(QFileDialog::AcceptSave);
QCOMPARE(views.at(0)->isVisible(), true);
- QCOMPARE(fd.filters(), filters);
- fd.setFilter("Image files (*.png *.xpm *.jpg);;Text files (*.txt);;Any files (*.*)");
- QCOMPARE(fd.filters(), filters);
+ QCOMPARE(fd.nameFilters(), filters);
+ fd.setNameFilter("Image files (*.png *.xpm *.jpg);;Text files (*.txt);;Any files (*.*)");
+ QCOMPARE(fd.nameFilters(), filters);
QCOMPARE(spyCurrentChanged.count(), 0);
QCOMPARE(spyDirectoryEntered.count(), 0);
QCOMPARE(spyFilesSelected.count(), 0);
@@ -682,38 +682,38 @@ void tst_QFiledialog::filters()
QStringList expected;
expected << "C++ Source Files(*.cpp)";
expected << "Any(*.*)";
- fd2.setFilter("C++ Source Files(*.cpp);;Any(*.*)");
- QCOMPARE(expected, fd2.filters());
- fd2.setFilter("C++ Source Files(*.cpp) ;;Any(*.*)");
- QCOMPARE(expected, fd2.filters());
- fd2.setFilter("C++ Source Files(*.cpp);; Any(*.*)");
- QCOMPARE(expected, fd2.filters());
- fd2.setFilter(" C++ Source Files(*.cpp);; Any(*.*)");
- QCOMPARE(expected, fd2.filters());
- fd2.setFilter("C++ Source Files(*.cpp) ;; Any(*.*)");
- QCOMPARE(expected, fd2.filters());
+ fd2.setNameFilter("C++ Source Files(*.cpp);;Any(*.*)");
+ QCOMPARE(expected, fd2.nameFilters());
+ fd2.setNameFilter("C++ Source Files(*.cpp) ;;Any(*.*)");
+ QCOMPARE(expected, fd2.nameFilters());
+ fd2.setNameFilter("C++ Source Files(*.cpp);; Any(*.*)");
+ QCOMPARE(expected, fd2.nameFilters());
+ fd2.setNameFilter(" C++ Source Files(*.cpp);; Any(*.*)");
+ QCOMPARE(expected, fd2.nameFilters());
+ fd2.setNameFilter("C++ Source Files(*.cpp) ;; Any(*.*)");
+ QCOMPARE(expected, fd2.nameFilters());
}
void tst_QFiledialog::selectFilter()
{
QNonNativeFileDialog fd;
QSignalSpy spyFilterSelected(&fd, SIGNAL(filterSelected(const QString &)));
- QCOMPARE(fd.selectedFilter(), QString("All Files (*)"));
+ QCOMPARE(fd.selectedNameFilter(), QString("All Files (*)"));
QStringList filters;
filters << "Image files (*.png *.xpm *.jpg)"
<< "Text files (*.txt)"
<< "Any files (*.*)";
- fd.setFilters(filters);
- QCOMPARE(fd.selectedFilter(), filters.at(0));
- fd.selectFilter(filters.at(1));
- QCOMPARE(fd.selectedFilter(), filters.at(1));
- fd.selectFilter(filters.at(2));
- QCOMPARE(fd.selectedFilter(), filters.at(2));
-
- fd.selectFilter("bob");
- QCOMPARE(fd.selectedFilter(), filters.at(2));
- fd.selectFilter("");
- QCOMPARE(fd.selectedFilter(), filters.at(2));
+ fd.setNameFilters(filters);
+ QCOMPARE(fd.selectedNameFilter(), filters.at(0));
+ fd.selectNameFilter(filters.at(1));
+ QCOMPARE(fd.selectedNameFilter(), filters.at(1));
+ fd.selectNameFilter(filters.at(2));
+ QCOMPARE(fd.selectedNameFilter(), filters.at(2));
+
+ fd.selectNameFilter("bob");
+ QCOMPARE(fd.selectedNameFilter(), filters.at(2));
+ fd.selectNameFilter("");
+ QCOMPARE(fd.selectedNameFilter(), filters.at(2));
QCOMPARE(spyFilterSelected.count(), 0);
}
@@ -1004,8 +1004,8 @@ void tst_QFiledialog::proxymodel()
void tst_QFiledialog::setNameFilter()
{
QNonNativeFileDialog fd;
- fd.setFilter(QString());
- fd.setFilters(QStringList());
+ fd.setNameFilter(QString());
+ fd.setNameFilters(QStringList());
}
void tst_QFiledialog::focus()
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index 9e0c6c6dbd..472469e797 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -266,7 +266,7 @@ void tst_QFileDialog2::showNameFilterDetails()
filterChoices << "Image files (*.png *.xpm *.jpg)"
<< "Text files (*.txt)"
<< "Any files (*.*)";
- fd.setFilters(filterChoices);
+ fd.setNameFilters(filterChoices);
fd.setNameFilterDetailsVisible(false);
QCOMPARE(filters->itemText(0), QString("Image files"));
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index 2ec6a566f9..9e965ff235 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -141,8 +141,6 @@ private:
tst_QMessageBox::tst_QMessageBox() : keyToSend(-1)
{
- int argc = qApp->argc();
- QT_REQUIRE_VERSION(argc, qApp->argv(), "4.6.2")
}
int tst_QMessageBox::exec(QMessageBox *msgBox, int key)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 05:04:12 +0000