diff options
author | David Faure <david.faure@kdab.com> | 2021-10-01 11:17:17 +0200 |
---|---|---|
committer | David Faure <david.faure@kdab.com> | 2021-10-01 18:30:25 +0200 |
commit | 8652f4766b1afb31acc7f5678ca5786a8209b275 (patch) | |
tree | 0dfd72b75a3fe48a40e356738811b0d6a0d96a77 /tests/auto/corelib/itemmodels | |
parent | 1f86957f1dd14cc538e7ad9ffee4eb63001af407 (diff) | |
download | qtbase-8652f4766b1afb31acc7f5678ca5786a8209b275.tar.gz |
Untangle qsortfilterproxymodel unittests
With the QRegExp variant removed, it was weird to have all QSFPM
tests in "tst_qsortfilterproxymodel_regularexpression", even those
completely unrelated to regexps. Instead of reuniting into a single
executable as before, I simply split it out in separate executables:
* tst_qsortfilterproxymodel has the "standard" QSFPM tests
* tst_qsortfilterproxymodel_regularexpression has the regexp-related tests
* tst_qsortfilterproxymodel_recursive is separate as before
Change-Id: I345530b4352671164008bba4805af7b12ac90247
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/itemmodels')
-rw-r--r-- | tests/auto/corelib/itemmodels/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel/CMakeLists.txt | 15 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp (renamed from tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp) | 1 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.h (renamed from tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp | 12 |
6 files changed, 20 insertions, 18 deletions
diff --git a/tests/auto/corelib/itemmodels/CMakeLists.txt b/tests/auto/corelib/itemmodels/CMakeLists.txt index 530a54c91e..fcea1c843d 100644 --- a/tests/auto/corelib/itemmodels/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/CMakeLists.txt @@ -8,10 +8,11 @@ if(TARGET Qt::Gui) add_subdirectory(qidentityproxymodel) add_subdirectory(qitemselectionmodel) add_subdirectory(qsortfilterproxymodel_recursive) + add_subdirectory(qsortfilterproxymodel_regularexpression) add_subdirectory(qtransposeproxymodel) endif() if(TARGET Qt::Widgets) - add_subdirectory(qsortfilterproxymodel_regularexpression) + add_subdirectory(qsortfilterproxymodel) endif() if(TARGET Qt::Sql AND TARGET Qt::Widgets) add_subdirectory(qitemmodel) diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/CMakeLists.txt new file mode 100644 index 0000000000..25c8553088 --- /dev/null +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## tst_qsortfilterproxymodel Test: +##################################################################### + +qt_internal_add_test(tst_qsortfilterproxymodel + SOURCES + ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h + tst_qsortfilterproxymodel.cpp + INCLUDE_DIRECTORIES + ../../../other/qabstractitemmodelutils + LIBRARIES + Qt::Gui + Qt::Widgets + Qt::TestPrivate +) diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 6da65e59e8..ad7fc6f8f8 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -5522,4 +5522,5 @@ void tst_QSortFilterProxyModel::createPersistentOnLayoutAboutToBeChanged() // QT QCOMPARE(layoutChangedSpy.size(), 1); } +QTEST_MAIN(tst_QSortFilterProxyModel) #include "tst_qsortfilterproxymodel.moc" diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.h index baad28ec06..baad28ec06 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.h diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt index 1e96dea732..c5c0203567 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/CMakeLists.txt @@ -1,19 +1,12 @@ -# Generated from qsortfilterproxymodel_regularexpression.pro. - ##################################################################### ## tst_qsortfilterproxymodel_regularexpression Test: ##################################################################### qt_internal_add_test(tst_qsortfilterproxymodel_regularexpression SOURCES - ../../../other/qabstractitemmodelutils/dynamictreemodel.cpp ../../../other/qabstractitemmodelutils/dynamictreemodel.h - ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp ../qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h tst_qsortfilterproxymodel_regularexpression.cpp INCLUDE_DIRECTORIES ../../../other/qabstractitemmodelutils - ../qsortfilterproxymodel_common LIBRARIES - Qt::Gui - Qt::Widgets Qt::TestPrivate ) diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp index 8411d40a72..39376b3499 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_regularexpression/tst_qsortfilterproxymodel_regularexpression.cpp @@ -29,14 +29,11 @@ #include <QTest> #include <QSignalSpy> #include <QStringListModel> +#include <QSortFilterProxyModel> -#include "tst_qsortfilterproxymodel.h" - -class tst_QSortFilterProxyModelRegularExpression : public tst_QSortFilterProxyModel +class tst_QSortFilterProxyModelRegularExpression : public QObject { Q_OBJECT -public: - tst_QSortFilterProxyModelRegularExpression(); private slots: void tst_invalid(); void tst_caseSensitivity(); @@ -45,11 +42,6 @@ private slots: void tst_regexCaseSensitivityNotification(); }; -tst_QSortFilterProxyModelRegularExpression::tst_QSortFilterProxyModelRegularExpression() : - tst_QSortFilterProxyModel() -{ -} - void tst_QSortFilterProxyModelRegularExpression::tst_invalid() { const QLatin1String pattern("test"); |