From ff25a7ec056d3381e04251eb65a59c46afe79e08 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 24 Aug 2017 18:50:59 +0200 Subject: QAbstractItemModelTester: fix the autotests Move the modeltest autotest in the right place, and fix the other autotests that were using it to use the version now in QtTestLib. Change-Id: Ic6838945f616d580f357c872ce0956c341be3b16 Reviewed-by: David Faure --- .../corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro | 6 +++--- .../corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro | 6 +++--- .../itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro | 6 +++--- .../itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp | 7 +++---- 4 files changed, 12 insertions(+), 13 deletions(-) (limited to 'tests/auto/corelib') diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro index dc7362e442..da1f87e76a 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qabstractitemmodel QT = core testlib gui -mtdir = ../../../other/modeltest +mtdir = ../../../other/qabstractitemmodelutils INCLUDEPATH += $$PWD/$${mtdir} -SOURCES = tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp -HEADERS = $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h +SOURCES = tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp +HEADERS = $${mtdir}/dynamictreemodel.h DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro index ba32f02962..ddec0d2354 100644 --- a/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro +++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro @@ -1,8 +1,8 @@ CONFIG += testcase TARGET = tst_qidentityproxymodel -mtdir = ../../../other/modeltest +mtdir = ../../../other/qabstractitemmodelutils INCLUDEPATH += $$PWD/$${mtdir} QT += testlib -SOURCES += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp -HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h +SOURCES += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp +HEADERS += $${mtdir}/dynamictreemodel.h diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro index 099f666def..dfa8b9fa1b 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qsortfilterproxymodel QT += widgets testlib -mtdir = ../../../other/modeltest +mtdir = ../../../other/qabstractitemmodelutils INCLUDEPATH += $$PWD/$${mtdir} -SOURCES += tst_qsortfilterproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp -HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h +SOURCES += tst_qsortfilterproxymodel.cpp $${mtdir}/dynamictreemodel.cpp +HEADERS += $${mtdir}/dynamictreemodel.h diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index dd5394d452..1acedf4271 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -28,7 +28,6 @@ #include #include "dynamictreemodel.h" -#include "modeltest.h" #include #include @@ -3312,7 +3311,7 @@ void tst_QSortFilterProxyModel::filteredColumns() FilteredColumnProxyModel *proxy = new FilteredColumnProxyModel(this); proxy->setSourceModel(model); - new ModelTest(proxy, this); + new QAbstractItemModelTester(proxy, this); ModelInsertCommand *insertCommand = new ModelInsertCommand(model, this); insertCommand->setNumCols(2); @@ -3351,7 +3350,7 @@ void tst_QSortFilterProxyModel::headerDataChanged() QSortFilterProxyModel *proxy = new QSortFilterProxyModel(this); proxy->setSourceModel(model); - new ModelTest(proxy, this); + new QAbstractItemModelTester(proxy, this); model->emitHeaderDataChanged(); } @@ -4129,7 +4128,7 @@ void tst_QSortFilterProxyModel::resortingDoesNotBreakTreeModels() proxy.sort(0); proxy.setSourceModel(treeModel); - ModelTest modelTest(&proxy); + QAbstractItemModelTester modelTester(&proxy); QCOMPARE(proxy.rowCount(), 2); e1->setText("entry1"); -- cgit v1.2.3