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

Autotest: De-noise TestCodeParser

Browse Source 
Change-Id: Ide351ed081417d3520714dcc44d543797f75dd4a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-05-10 22:44:28 +03:00
committed by Orgad Shaneh
parent bae0368034
commit c7d7cb9d40
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/autotest/testcodeparser.cpp
View File

@@ -55,6 +55,8 @@ static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.testcodeparser")
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
using namespace ProjectExplorer;
TestCodeParser::TestCodeParser(TestTreeModel *parent) TestCodeParser::TestCodeParser(TestTreeModel *parent)
: QObject(parent), : QObject(parent),
m_model(parent) m_model(parent)
@@ -100,7 +102,7 @@ void TestCodeParser::setState(State state)
} }
m_parserState = state; m_parserState = state;
if (m_parserState == Idle && ProjectExplorer::SessionManager::startupProject()) { if (m_parserState == Idle && SessionManager::startupProject()) {
if (m_fullUpdatePostponed || m_dirty) { if (m_fullUpdatePostponed || m_dirty) {
emitUpdateTestTree(); emitUpdateTestTree();
} else if (m_partialUpdatePostponed) { } else if (m_partialUpdatePostponed) {
@@ -160,7 +162,7 @@ void TestCodeParser::updateTestTree(ITestParser *parser)
return; return;
} }
if (!ProjectExplorer::SessionManager::startupProject()) if (!SessionManager::startupProject())
return; return;
m_fullUpdatePostponed = false; m_fullUpdatePostponed = false;
@@ -201,10 +203,10 @@ void TestCodeParser::onDocumentUpdated(const QString &fileName)
if (m_codeModelParsing || m_fullUpdatePostponed) if (m_codeModelParsing || m_fullUpdatePostponed)
return; return;
ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject(); Project *project = SessionManager::startupProject();
if (!project) if (!project)
return; return;
if (!project->files(ProjectExplorer::Project::SourceFiles).contains(fileName)) if (!project->files(Project::SourceFiles).contains(fileName))
return; return;
scanForTests(QStringList(fileName)); scanForTests(QStringList(fileName));
@@ -222,7 +224,7 @@ void TestCodeParser::onQmlDocumentUpdated(const QmlJS::Document::Ptr &document)
onDocumentUpdated(fileName); onDocumentUpdated(fileName);
} }
void TestCodeParser::onStartupProjectChanged(ProjectExplorer::Project *project) void TestCodeParser::onStartupProjectChanged(Project *project)
{ {
if (m_parserState == FullParse || m_parserState == PartialParse) { if (m_parserState == FullParse || m_parserState == PartialParse) {
qCDebug(LOG) << "Canceling scanForTest (startup project changed)"; qCDebug(LOG) << "Canceling scanForTest (startup project changed)";
@@ -233,9 +235,9 @@ void TestCodeParser::onStartupProjectChanged(ProjectExplorer::Project *project)
emitUpdateTestTree(); emitUpdateTestTree();
} }
void TestCodeParser::onProjectPartsUpdated(ProjectExplorer::Project *project) void TestCodeParser::onProjectPartsUpdated(Project *project)
{ {
if (project != ProjectExplorer::SessionManager::startupProject()) if (project != SessionManager::startupProject())
return; return;
if (m_codeModelParsing) if (m_codeModelParsing)
m_fullUpdatePostponed = true; m_fullUpdatePostponed = true;
@@ -334,12 +336,12 @@ void TestCodeParser::scanForTests(const QStringList &fileList, ITestParser *pars
m_reparseTimerTimedOut = false; m_reparseTimerTimedOut = false;
m_postponedFiles.clear(); m_postponedFiles.clear();
bool isFullParse = fileList.isEmpty(); bool isFullParse = fileList.isEmpty();
ProjectExplorer::Project *project = ProjectExplorer::SessionManager::startupProject(); Project *project = SessionManager::startupProject();
if (!project) if (!project)
return; return;
QStringList list; QStringList list;
if (isFullParse) { if (isFullParse) {
list = project->files(ProjectExplorer::Project::SourceFiles); list = project->files(Project::SourceFiles);
if (list.isEmpty()) { if (list.isEmpty()) {
// at least project file should be there, but might happen if parsing current project // at least project file should be there, but might happen if parsing current project
// takes too long, especially when opening sessions holding multiple projects // takes too long, especially when opening sessions holding multiple projects