feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Fix check state handling for filtering

Browse Source 
Changing (gtest) filters can result in inconsistent
check states up to the root item.
This patch makes the check states consistent again.

Change-Id: I83b146c8859a352892945312ee2fd183699fc79c
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-04-12 15:13:07 +02:00
parent ca97be6a13
commit 32a219f5c1
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/autotest/testtreemodel.cpp
View File

@@ -245,6 +245,7 @@ void TestTreeModel::rebuild(const QList<Core::Id> &frameworkIds)
filterAndInsert(testItem, frameworkRoot, groupingEnabled); filterAndInsert(testItem, frameworkRoot, groupingEnabled);
} }
} }
revalidateCheckState(frameworkRoot);
} }
} }
@@ -282,6 +283,7 @@ void TestTreeModel::sweep()
for (Utils::TreeItem *frameworkRoot : *rootItem()) { for (Utils::TreeItem *frameworkRoot : *rootItem()) {
TestTreeItem *root = static_cast<TestTreeItem *>(frameworkRoot); TestTreeItem *root = static_cast<TestTreeItem *>(frameworkRoot);
sweepChildren(root); sweepChildren(root);
revalidateCheckState(root);
} }
// even if nothing has changed by the sweeping we might had parse which added or modified items // even if nothing has changed by the sweeping we might had parse which added or modified items
emit testTreeModelChanged(); emit testTreeModelChanged();
@@ -326,6 +328,20 @@ static TestTreeItem *fullCopyOf(TestTreeItem *other)
return result; return result;
} }
static void applyParentCheckState(TestTreeItem *parent, TestTreeItem *newItem)
{
QTC_ASSERT(parent && newItem, return);
if (parent->checked() != newItem->checked()) {
const Qt::CheckState checkState = parent->checked() == Qt::Unchecked ? Qt::Unchecked
: Qt::Checked;
newItem->setData(0, checkState, Qt::CheckStateRole);
newItem->forAllChildren([checkState](Utils::TreeItem *it) {
it->setData(0, checkState, Qt::CheckStateRole);
});
}
}
void TestTreeModel::insertItemInParent(TestTreeItem *item, TestTreeItem *root, bool groupingEnabled) void TestTreeModel::insertItemInParent(TestTreeItem *item, TestTreeItem *root, bool groupingEnabled)
{ {
TestTreeItem *parentNode = root; TestTreeItem *parentNode = root;
@@ -342,17 +358,19 @@ void TestTreeModel::insertItemInParent(TestTreeItem *item, TestTreeItem *root, b
} }
} }
// check if a similar item is already present (can happen for rebuild()) // check if a similar item is already present (can happen for rebuild())
if (auto otherChild = parentNode->findChild(item)) { if (auto otherItem = parentNode->findChild(item)) {
// only handle item's children and add them to the already present one // only handle item's children and add them to the already present one
for (int row = 0, count = item->childCount(); row < count; ++row) for (int row = 0, count = item->childCount(); row < count; ++row) {
otherChild->appendChild(fullCopyOf(item->childItem(row))); TestTreeItem *child = fullCopyOf(item->childItem(row));
applyParentCheckState(otherItem, child);
otherItem->appendChild(child);
}
delete item; delete item;
item = otherChild; // TODO needed? or early return?
} else { } else {
// we could try to add a non-checked item to a checked group or vice versa
applyParentCheckState(parentNode, item);
parentNode->appendChild(item); parentNode->appendChild(item);
} }
if (item->checked() != parentNode->checked())
revalidateCheckState(parentNode);
} }
void TestTreeModel::revalidateCheckState(TestTreeItem *item) void TestTreeModel::revalidateCheckState(TestTreeItem *item)