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

Autotest: extract cpp document lookup into cpp test parser

Browse Source 
Change-Id: I261684206ec7ff9a97ca4a88b5846ebbc0fdda47
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2019-05-10 08:58:56 +02:00
parent 6a1a5be10c
commit 2f505fd0f9
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotest/gtest/gtestparser.cpp
View File

@@ -139,12 +139,10 @@ static bool handleGTest(QFutureInterface<TestParseResultPtr> futureInterface,
bool GTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool GTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
const QString &fileName) const QString &fileName)
{ {
if (!m_cppSnapshot.contains(fileName) || !selectedForBuilding(fileName)) CPlusPlus::Document::Ptr doc = document(fileName);
if (doc.isNull() || !includesGTest(doc, m_cppSnapshot) || !hasGTestNames(doc))
return false; return false;
CPlusPlus::Document::Ptr document = m_cppSnapshot.find(fileName).value(); return handleGTest(futureInterface, doc, m_cppSnapshot, id());
if (!includesGTest(document, m_cppSnapshot) || !hasGTestNames(document))
return false;
return handleGTest(futureInterface, document, m_cppSnapshot, id());
} }
} // namespace Internal } // namespace Internal

5
src/plugins/autotest/itestparser.cpp
View File

@@ -78,5 +78,10 @@ void CppParser::release()
m_workingCopy = CppTools::WorkingCopy(); m_workingCopy = CppTools::WorkingCopy();
} }
CPlusPlus::Document::Ptr CppParser::document(const QString &fileName)
{
return selectedForBuilding(fileName) ? m_cppSnapshot.document(fileName) : nullptr;
}
} // namespace Internal } // namespace Internal
} // namespace Autotest } // namespace Autotest

2
src/plugins/autotest/itestparser.h
View File

@@ -81,6 +81,8 @@ public:
static QByteArray getFileContent(const QString &filePath); static QByteArray getFileContent(const QString &filePath);
void release() override; void release() override;
CPlusPlus::Document::Ptr document(const QString &fileName);
protected: protected:
CPlusPlus::Snapshot m_cppSnapshot; CPlusPlus::Snapshot m_cppSnapshot;
CppTools::WorkingCopy m_workingCopy; CppTools::WorkingCopy m_workingCopy;

4
src/plugins/autotest/qtest/qttestparser.cpp
View File

@@ -389,9 +389,9 @@ void QtTestParser::release()
bool QtTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface, bool QtTestParser::processDocument(QFutureInterface<TestParseResultPtr> futureInterface,
const QString &fileName) const QString &fileName)
{ {
if (!m_cppSnapshot.contains(fileName) || !selectedForBuilding(fileName)) CPlusPlus::Document::Ptr doc = document(fileName);
if (doc.isNull())
return false; return false;
CPlusPlus::Document::Ptr doc = m_cppSnapshot.find(fileName).value();
const QString &oldName = m_testCaseNames.value(fileName); const QString &oldName = m_testCaseNames.value(fileName);
const QStringList &alternativeFiles = m_alternativeFiles.values(fileName); const QStringList &alternativeFiles = m_alternativeFiles.values(fileName);
if ((!includesQtTest(doc, m_cppSnapshot) || !qtTestLibDefined(fileName)) && oldName.isEmpty()) if ((!includesQtTest(doc, m_cppSnapshot) || !qtTestLibDefined(fileName)) && oldName.isEmpty())