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

AutoTest: Add project based {en|dis}abling of test frameworks

Browse Source 
Provide integration into the 'Project' view which allows to set
some settings on a per project base.
For now only enabling or disabling of test frameworks.

Task-number: QTCREATORBUG-16704
Change-Id: Iedd9a300164931e07a21cbb4e5a222be3266c81e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-08-05 15:47:10 +02:00
committed by David Schulz
parent edcd955aad
commit 43e27f76b3
13 changed files with 476 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@
#include "autotestplugin.h"
#include "testcodeparser.h"
#include "testframeworkmanager.h"
#include "testprojectsettings.h"
#include "testsettings.h"
#include "testtreeitem.h"
#include "testtreemodel.h"
@@ -53,6 +54,11 @@ TestTreeModel::TestTreeModel(QObject *parent) :
this, &TestTreeModel::sweep, Qt::QueuedConnection);
connect(m_parser, &TestCodeParser::parsingFailed,
this, &TestTreeModel::sweep, Qt::QueuedConnection);
connect(ProjectExplorer::SessionManager::instance(),
&ProjectExplorer::SessionManager::startupProjectChanged,
this, &TestTreeModel::onStartupProjectChanged);
connect(&m_syncFrameworksTimer, &QTimer::timeout, this, &TestTreeModel::syncTestFrameworks);
setupParsingConnections();
}
@@ -200,13 +206,55 @@ QList<TestTreeItem *> TestTreeModel::testItemsByName(const QString &testName)
void TestTreeModel::syncTestFrameworks()
{
ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject();
if (!project)
return;
QList<Core::Id> sortedIds;
TestFrameworkManager *frameworkManager = TestFrameworkManager::instance();
const QVariant useGlobal = project->namedSettings(Constants::SK_USE_GLOBAL);
if (!useGlobal.isValid() || AutotestPlugin::projectSettings(project)->useGlobalSettings()) {
sortedIds = frameworkManager->sortedActiveFrameworkIds();
} else { // we've got custom project settings
const TestProjectSettings *settings = AutotestPlugin::projectSettings(project);
const QMap<Core::Id, bool> active = settings->activeFrameworks();
sortedIds = Utils::filtered(active.keys(), [active](const Core::Id &id) {
return active.value(id);
});
}
syncFrameworks(sortedIds);
}
void TestTreeModel::scheduleTestFrameworksSync(bool immediately)
{
m_syncFrameworksTimer.start(immediately ? 0 : 3000);
}
void TestTreeModel::syncFrameworks(const QList<Core::Id> &sortedIds)
{
TestFrameworkManager *manager = TestFrameworkManager::instance();
// pre-check to avoid further processing when frameworks are unchanged
Utils::TreeItem *invisibleRoot = rootItem();
const int count = invisibleRoot->childCount();
if (count == sortedIds.size()) {
bool different = false;
QList<Core::Id> registered = manager->sortedRegisteredFrameworkIds();
for (int i = 0; i < count; ++i) {
if (manager->rootNodeForTestFramework(sortedIds[i]) != invisibleRoot->childAt(i)) {
different = true;
break;
}
}
if (!different)
return;
}
// remove all currently registered
removeTestRootNodes();
TestFrameworkManager *frameworkManager = TestFrameworkManager::instance();
QList<Core::Id> sortedIds = frameworkManager->sortedActiveFrameworkIds();
for (const Core::Id &id : sortedIds)
rootItem()->appendChild(frameworkManager->rootNodeForTestFramework(id));
rootItem()->appendChild(manager->rootNodeForTestFramework(id));
m_parser->syncTestFrameworks(sortedIds);
emit updatedActiveFrameworks(sortedIds.size());
@@ -424,6 +472,12 @@ void TestTreeModel::onParseResultReady(const TestParseResultPtr result)
handleParseResult(result.data(), rootNode);
}
void TestTreeModel::onStartupProjectChanged()
{
m_syncFrameworksTimer.stop();
scheduleTestFrameworksSync(true);
}
void TestTreeModel::handleParseResult(const TestParseResult *result, TestTreeItem *parentNode)
{
const bool groupingEnabled =