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

AutoTest: Re-order responsibilities

Browse Source 
Keep the timer for syncing frameworks where it
is really used, do not create functions that are
not necessary at all.

Change-Id: Ie0a49a2611dc67510b72562455ea2a1af7b1c538
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-09-05 10:42:01 +02:00
parent ad0dcb9668
commit 49942bc06a
8 changed files with 16 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,11 +56,6 @@ TestTreeModel::TestTreeModel(QObject *parent) :
connect(m_parser, &TestCodeParser::parsingFailed,
this, &TestTreeModel::sweep, Qt::QueuedConnection);
connect(ProjectExplorer::SessionManager::instance(),
&ProjectExplorer::SessionManager::startupProjectChanged,
this, &TestTreeModel::onStartupProjectChanged);
m_syncFrameworksTimer.setSingleShot(true);
connect(&m_syncFrameworksTimer, &QTimer::timeout, this, &TestTreeModel::syncTestFrameworks);
setupParsingConnections();
}
@@ -206,17 +201,15 @@ QList<TestTreeItem *> TestTreeModel::testItemsByName(const QString &testName)
return result;
}
void TestTreeModel::syncTestFrameworks()
void TestTreeModel::synchronizeTestFrameworks()
{
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);
TestFrameworkManager *manager = TestFrameworkManager::instance();
const QVariant useGlobal = project ? project->namedSettings(Constants::SK_USE_GLOBAL)
: QVariant();
if (!useGlobal.isValid() || AutotestPlugin::projectSettings(project)->useGlobalSettings()) {
sortedIds = frameworkManager->sortedActiveFrameworkIds();
sortedIds = manager->sortedActiveFrameworkIds();
} else { // we've got custom project settings
const TestProjectSettings *settings = AutotestPlugin::projectSettings(project);
const QMap<Core::Id, bool> active = settings->activeFrameworks();
@@ -225,17 +218,6 @@ void TestTreeModel::syncTestFrameworks()
});
}
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();
@@ -474,12 +456,6 @@ 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 =