summaryrefslogtreecommitdiffstats
path: root/tests/auto/qapplication
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-09-22 15:06:32 +0200
committerShane Kearns <shane.kearns@sosco.com>2009-09-22 16:32:49 +0200
commit24a928dd31ea54063b802cc2d249afe852daeebe (patch)
treea34aae1b4a3df5b3246dadd4b8f0a14f6e2d8e34 /tests/auto/qapplication
parentb85f6a46650774e2422ab44f1f12751ada8d9373 (diff)
Fix crashes in QApplication autotest
1) Input methods caused crash due to using CCoeEnv::Fep() without checking for NULL pointer 2) Autotest itself had Q_ASSERT where it should have used Q_VERIFY Reviewed-by: axis
Diffstat (limited to 'tests/auto/qapplication')
-rw-r--r--tests/auto/qapplication/tst_qapplication.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 6ffefc5597..2ba52396ac 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -1148,15 +1148,15 @@ void DeleteLaterWidget::runTest()
connect(w, SIGNAL(destroyed()), this, SLOT(childDeleted()));
w->deleteLater();
- Q_ASSERT(!child_deleted);
+ QVERIFY(!child_deleted);
QDialog dlg;
QTimer::singleShot(500, &dlg, SLOT(reject()));
dlg.exec();
- Q_ASSERT(!child_deleted);
+ QVERIFY(!child_deleted);
app->processEvents();
- Q_ASSERT(!child_deleted);
+ QVERIFY(!child_deleted);
QTimer::singleShot(500, this, SLOT(checkDeleteLater()));
@@ -1167,7 +1167,7 @@ void DeleteLaterWidget::runTest()
void DeleteLaterWidget::checkDeleteLater()
{
- Q_ASSERT(child_deleted);
+ QVERIFY(child_deleted);
close();
}