whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QAbstractItemModelTester: don't rely on hasChildren() 

Dynamic models which use fetchMore to asynchronously fill subdirs
(like KDirModel) return true in hasChildren() for dirs that are expected
to have children (so that the "+" shows in the treeview) but do not
actually have children readily available.
They will be inserted later on once the async listing job is done
(as a result of fetchMore triggering that job).

So QAbstractItemModelTester should use rowCount instead, to find out
if there are children present.

This detected a bug in QConcatenateTablesProxyModel: it returned
a non-zero rowCount for its items, while it's flat.

Change-Id: Idcdc86159f1fc79ed5297075dfcf30c09896287a
Pick-to: 5.15
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
David Faure 2020-10-23 19:07:05 +02:00
parent feda3e7673
commit 72e0d699ce
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp
View File

@ -313,8 +313,8 @@ QModelIndex QConcatenateTablesProxyModel::parent(const QModelIndex &index) const
int QConcatenateTablesProxyModel::rowCount(const QModelIndex &parent) const
{
Q_D(const QConcatenateTablesProxyModel);
Q_ASSERT(checkIndex(parent, QAbstractItemModel::CheckIndexOption::ParentIsInvalid)); // flat model
Q_UNUSED(parent);
if (parent.isValid())
return 0; // flat model
return d->m_rowCount;
}

9
src/testlib/qabstractitemmodeltester.cpp
View File

@ -438,7 +438,7 @@ void QAbstractItemModelTesterPrivate::parent()
// when asked for the parent of an invalid index.
MODELTESTER_VERIFY(!model->parent(QModelIndex()).isValid());
if (!model->hasChildren())
if (model->rowCount() == 0)
return;
// Column 0 | Column 1 |
@ -449,11 +449,12 @@ void QAbstractItemModelTesterPrivate::parent()
// Common error test #1, make sure that a top level index has a parent
// that is a invalid QModelIndex.
QModelIndex topIndex = model->index(0, 0, QModelIndex());
MODELTESTER_VERIFY(topIndex.isValid());
MODELTESTER_VERIFY(!model->parent(topIndex).isValid());
// Common error test #2, make sure that a second level index has a parent
// that is the first level index.
if (model->hasChildren(topIndex)) {
if (model->rowCount(topIndex) > 0) {
QModelIndex childIndex = model->index(0, 0, topIndex);
MODELTESTER_VERIFY(childIndex.isValid());
MODELTESTER_COMPARE(model->parent(childIndex), topIndex);
@ -465,7 +466,7 @@ void QAbstractItemModelTesterPrivate::parent()
if (model->hasIndex(0, 1)) {
QModelIndex topIndex1 = model->index(0, 1, QModelIndex());
MODELTESTER_VERIFY(topIndex1.isValid());
if (model->hasChildren(topIndex) && model->hasChildren(topIndex1)) {
if (model->rowCount(topIndex) > 0 && model->rowCount(topIndex1) > 0) {
QModelIndex childIndex = model->index(0, 0, topIndex);
MODELTESTER_VERIFY(childIndex.isValid());
QModelIndex childIndex1 = model->index(0, 0, topIndex1);
@ -583,7 +584,7 @@ void QAbstractItemModelTesterPrivate::checkChildren(const QModelIndex &parent, i
*/
void QAbstractItemModelTesterPrivate::data()
{
if (!model->hasChildren())
if (model->rowCount() == 0 || model->columnCount() == 0)
return;
MODELTESTER_VERIFY(model->index(0, 0).isValid());