From 607c37befb145c3aa1b9d29365ac682a2bd3a55f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 20 Jul 2012 16:18:29 +0200 Subject: Remove usage of deprecated qWaitForWindowShown in dialog tests. Change-Id: Id3ebe202d65ee682e8e2e3ae107808e9abb6cc15 Reviewed-by: Stephen Kelly --- tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp') diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 98ea8f4ac7..b50e32c8ea 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -286,7 +286,7 @@ void tst_QFiledialog::filesSelectedSignal() QSignalSpy spyFilesSelected(&fd, SIGNAL(filesSelected(const QStringList &))); fd.show(); - QTest::qWait(500); + QVERIFY(QTest::qWaitForWindowExposed(&fd)); QListView *listView = qFindChild(&fd, "listView"); QVERIFY(listView); @@ -938,7 +938,7 @@ void tst_QFiledialog::selectFiles() QString temporary = QDir::tempPath() + QLatin1String("/blah"); dialog->selectFile(temporary); dialog->show(); - QTest::qWait(500); + QVERIFY(QTest::qWaitForWindowExposed(dialog)); QLineEdit *lineEdit = qFindChild(dialog, "fileNameEdit"); QVERIFY(lineEdit); QCOMPARE(lineEdit->text(),QLatin1String("blah")); @@ -1012,9 +1012,9 @@ void tst_QFiledialog::focus() fd.setDirectory(QDir::currentPath()); fd.show(); QApplication::setActiveWindow(&fd); - QTest::qWaitForWindowShown(&fd); - QTRY_COMPARE(fd.isVisible(), true); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&fd)); + QVERIFY(QTest::qWaitForWindowActive(&fd)); + QCOMPARE(fd.isVisible(), true); + QCOMPARE(QApplication::activeWindow(), static_cast(&fd)); qApp->processEvents(); // make sure the tests work with focus follows mouse -- cgit v1.2.3