summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qdialog/tst_qdialog.cpp28
1 files changed, 11 insertions, 17 deletions
diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/qdialog/tst_qdialog.cpp
index dc6878da72..e95bc53fe4 100644
--- a/tests/auto/qdialog/tst_qdialog.cpp
+++ b/tests/auto/qdialog/tst_qdialog.cpp
@@ -50,6 +50,8 @@
#include <QVBoxLayout>
#include <QSizeGrip>
+#include "../../shared/util.h"
+
Q_DECLARE_METATYPE(QSize)
@@ -160,8 +162,8 @@ void tst_QDialog::initTestCase()
void tst_QDialog::cleanupTestCase()
{
if (testWidget) {
- delete testWidget;
- testWidget = 0;
+ delete testWidget;
+ testWidget = 0;
}
}
@@ -585,35 +587,27 @@ void tst_QDialog::reject()
TestRejectDialog dialog;
dialog.show();
QTest::qWaitForWindowShown(&dialog);
- QTest::qWait(100);
- QVERIFY(dialog.isVisible());
+ QTRY_VERIFY(dialog.isVisible());
dialog.reject();
- QTest::qWait(100);
- QVERIFY(!dialog.isVisible());
+ QTRY_VERIFY(!dialog.isVisible());
QCOMPARE(dialog.called, 1);
dialog.show();
QTest::qWaitForWindowShown(&dialog);
- QTest::qWait(100);
-
- QVERIFY(dialog.isVisible());
+ QTRY_VERIFY(dialog.isVisible());
QVERIFY(dialog.close());
- QTest::qWait(100);
- QVERIFY(!dialog.isVisible());
+ QTRY_VERIFY(!dialog.isVisible());
QCOMPARE(dialog.called, 2);
dialog.cancelReject = true;
dialog.show();
QTest::qWaitForWindowShown(&dialog);
- QTest::qWait(100);
- QVERIFY(dialog.isVisible());
+ QTRY_VERIFY(dialog.isVisible());
dialog.reject();
- QTest::qWait(100);
- QVERIFY(dialog.isVisible());
+ QTRY_VERIFY(dialog.isVisible());
QCOMPARE(dialog.called, 3);
QVERIFY(!dialog.close());
- QTest::qWait(100);
- QVERIFY(dialog.isVisible());
+ QTRY_VERIFY(dialog.isVisible());
QCOMPARE(dialog.called, 4);
}