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

AutoTest: Fix reparsing of header files...

Browse Source 
...when having split source and headers and defining test data functions
inside the source file.
If we just reparse a header file (e.g. when opening the respective file
inside the editor) we have no explicit information where the definition
of the functions is. This lead to not finding the information necessary
for displaying data tags and throwing away old information as they have
been marked for removal.

Change-Id: Ieb8ed9f7c758fe2c793e60ca2c30b4025106363b
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-05-04 12:18:52 +02:00
parent 8390f9e80a
commit 3d96108bbd
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,31 +404,31 @@ static CPlusPlus::Document::Ptr declaringDocument(CPlusPlus::Document::Ptr doc,
return declaringDoc; return declaringDoc;
} }
static bool hasFunctionWithDataTagUsage(const QMap<QString, TestCodeLocationAndType> &testFunctions) static QSet<QString> filesWithDataFunctionDefinitions(
{
foreach (const QString &functionName, testFunctions.keys()) {
if (functionName.endsWith(QLatin1String("_data")) &&
testFunctions.contains(functionName.left(functionName.size() - 5))) {
return true;
}
}
return false;
}
static QMap<QString, TestCodeLocationList> checkForDataTags(const QString &fileName,
const QMap<QString, TestCodeLocationAndType> &testFunctions) const QMap<QString, TestCodeLocationAndType> &testFunctions)
{ {
if (hasFunctionWithDataTagUsage(testFunctions)) { QSet<QString> result;
const CPlusPlus::Snapshot snapshot = CPlusPlus::CppModelManagerBase::instance()->snapshot(); QMap<QString, TestCodeLocationAndType>::ConstIterator it = testFunctions.begin();
const QByteArray fileContent = getFileContent(fileName); const QMap<QString, TestCodeLocationAndType>::ConstIterator end = testFunctions.end();
CPlusPlus::Document::Ptr document = snapshot.preprocessedDocument(fileContent, fileName);
document->check(); for ( ; it != end; ++it) {
CPlusPlus::AST *ast = document->translationUnit()->ast(); const QString &key = it.key();
TestDataFunctionVisitor visitor(document); if (key.endsWith(QLatin1String("_data")) && testFunctions.contains(key.left(key.size() - 5)))
visitor.accept(ast); result.insert(it.value().m_name);
return visitor.dataTags();
} }
return QMap<QString, TestCodeLocationList>(); return result;
}
static QMap<QString, TestCodeLocationList> checkForDataTags(const QString &fileName)
{
const CPlusPlus::Snapshot snapshot = CPlusPlus::CppModelManagerBase::instance()->snapshot();
const QByteArray fileContent = getFileContent(fileName);
CPlusPlus::Document::Ptr document = snapshot.preprocessedDocument(fileContent, fileName);
document->check();
CPlusPlus::AST *ast = document->translationUnit()->ast();
TestDataFunctionVisitor visitor(document);
visitor.accept(ast);
return visitor.dataTags();
} }
/****** end of helpers ******/ /****** end of helpers ******/
@@ -549,12 +549,11 @@ static void checkDocumentForTestCode(QFutureInterface<TestParseResult> futureInt
return; return;
const QMap<QString, TestCodeLocationAndType> testFunctions = visitor.privateSlots(); const QMap<QString, TestCodeLocationAndType> testFunctions = visitor.privateSlots();
const QSet<QString> &files = filesWithDataFunctionDefinitions(testFunctions);
QMap<QString, TestCodeLocationList> dataTags = QMap<QString, TestCodeLocationList> dataTags;
checkForDataTags(declaringDoc->fileName(), testFunctions); foreach (const QString &file, files)
dataTags.unite(checkForDataTags(file));
if (declaringDoc->fileName() != document->fileName())
dataTags.unite(checkForDataTags(document->fileName(), testFunctions));
TestParseResult parseResult(TestTreeModel::AutoTest); TestParseResult parseResult(TestTreeModel::AutoTest);
parseResult.fileName = declaringDoc->fileName(); parseResult.fileName = declaringDoc->fileName();