Remove Q_ASSERT from qitemmodel autotest

Allow createModel() to return a null model on failure (which it already
did in release mode builds), but fail the test gracefully instead of
crashing when a null model is returned.

Change-Id: Iaa0ec31183e0c90fcea512223d01e07ed188a380
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/qitemmodel/tst_qitemmodel.cpp
index 7e177ba..9482853 100644
--- a/tests/auto/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/qitemmodel/tst_qitemmodel.cpp
@@ -199,6 +199,7 @@ void tst_QItemModel::nonDestructiveBasicTest()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     QCOMPARE(currentModel->buddy(QModelIndex()), QModelIndex());
     currentModel->canFetchMore(QModelIndex());
@@ -244,6 +245,7 @@ void tst_QItemModel::rowCount()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     QFETCH(bool, isEmpty);
     if (isEmpty) {
@@ -291,6 +293,7 @@ void tst_QItemModel::columnCount()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     QFETCH(bool, isEmpty);
     if (isEmpty) {
@@ -325,6 +328,7 @@ void tst_QItemModel::hasIndex()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     // Make sure that invalid values returns an invalid index
     QCOMPARE(currentModel->hasIndex(-2, -2), false);
@@ -359,6 +363,7 @@ void tst_QItemModel::index()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     // Make sure that invalid values returns an invalid index
     QCOMPARE(currentModel->index(-2, -2), QModelIndex());
@@ -489,6 +494,7 @@ void tst_QItemModel::parent()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     // Make sure the model wont crash and will return an invalid QModelIndex
     // when asked for the parent of an invalid index.
@@ -538,6 +544,7 @@ void tst_QItemModel::data()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     // Invalid index should return an invalid qvariant
     QVERIFY(!currentModel->data(QModelIndex()).isValid());
@@ -618,6 +625,7 @@ void tst_QItemModel::setData()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
     qRegisterMetaType<QModelIndex>("QModelIndex");
     QSignalSpy spy(currentModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)));
     QCOMPARE(currentModel->setData(QModelIndex(), QVariant()), false);
@@ -660,6 +668,7 @@ void tst_QItemModel::setHeaderData()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     QCOMPARE(currentModel->setHeaderData(-1, Qt::Horizontal, QVariant()), false);
     QCOMPARE(currentModel->setHeaderData(-1, Qt::Vertical, QVariant()), false);
@@ -708,6 +717,7 @@ void tst_QItemModel::sort()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     QFETCH(bool, isEmpty);
     if (isEmpty)
@@ -819,6 +829,7 @@ void tst_QItemModel::remove()
     QFETCH(QString, modelType);
 
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     QFETCH(bool, readOnly);
     if (readOnly)
@@ -1160,6 +1171,7 @@ void tst_QItemModel::insert()
 {
     QFETCH(QString, modelType);
     currentModel = testModels->createModel(modelType);
+    QVERIFY(currentModel);
 
     QFETCH(bool, readOnly);
     if (readOnly)