summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-01-16 14:51:29 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-16 17:07:12 +0100
commit6acdb3256113a5cdc9633077ada5674e5ee694d1 (patch)
tree284c4055fb2b5368af6dab742ec362757879dc10 /tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
parent7a0099183a1c107126bda3b59a47651aac612426 (diff)
Clarify docs that everything must be re-queried on model reset.
Change-Id: I05970302d4f52d092a7c65a45b9e5a3570b1d144 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp')
-rw-r--r--tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp37
1 files changed, 36 insertions, 1 deletions
diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
index af1e492a8b..8829f6e7b1 100644
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -1669,6 +1669,19 @@ private:
};
+class ModelWithCustomRole : public QStringListModel
+{
+ Q_OBJECT
+public:
+ ModelWithCustomRole(QObject *parent = 0)
+ : QStringListModel(parent)
+ {
+ QHash<int, QByteArray> roleNames_ = roleNames();
+ roleNames_.insert(Qt::UserRole + 1, "custom");
+ setRoleNames(roleNames_);
+ }
+};
+
ListenerObject::ListenerObject(QAbstractProxyModel *parent)
: QObject(parent), m_model(parent)
{
@@ -1722,7 +1735,7 @@ void tst_QAbstractItemModel::testReset()
nullProxy->setSourceModel(m_model);
// Makes sure the model and proxy are in a consistent state. before and after reset.
- new ListenerObject(nullProxy);
+ ListenerObject *listener = new ListenerObject(nullProxy);
ModelResetCommandFixed *resetCommand = new ModelResetCommandFixed(m_model, this);
@@ -1741,6 +1754,28 @@ void tst_QAbstractItemModel::testReset()
QVERIFY(m_model->rowCount() == 9);
QModelIndex destIndex = m_model->index(4, 0);
QVERIFY(m_model->rowCount(destIndex) == 11);
+
+ // Delete it because its slots test things which are not true after this point.
+ delete listener;
+
+ QSignalSpy proxyBeforeResetSpy(nullProxy, SIGNAL(modelAboutToBeReset()));
+ QSignalSpy proxyAfterResetSpy(nullProxy, SIGNAL(modelReset()));
+
+ // Before setting it, it does not have custom roles.
+ QCOMPARE(nullProxy->roleNames().value(Qt::UserRole + 1), QByteArray());
+
+ nullProxy->setSourceModel(new ModelWithCustomRole(this));
+ QVERIFY(proxyBeforeResetSpy.size() == 1);
+ QVERIFY(proxyAfterResetSpy.size() == 1);
+
+ QCOMPARE(nullProxy->roleNames().value(Qt::UserRole + 1), QByteArray("custom"));
+
+ nullProxy->setSourceModel(m_model);
+ QVERIFY(proxyBeforeResetSpy.size() == 2);
+ QVERIFY(proxyAfterResetSpy.size() == 2);
+
+ // After being reset the proxy must be queried again.
+ QCOMPARE(nullProxy->roleNames().value(Qt::UserRole + 1), QByteArray());
}
class CustomRoleModel : public QStringListModel