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

AutoTest: Support QTest::addRow as well

Browse Source 
Fixes: QTCREATORBUG-24777
Change-Id: I33ac86a226036855a304b71e2e7ebfe8884d8dc3
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2020-10-14 17:36:26 +02:00
parent b58ca33ff6
commit c9d2a8d69e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/autotest/qtest/qttestvisitors.cpp
View File

@@ -226,6 +226,9 @@ bool TestDataFunctionVisitor::visit(CallAST *ast)
bool ok = false; bool ok = false;
QString name = extractNameFromAST(stringLiteral, &ok); QString name = extractNameFromAST(stringLiteral, &ok);
if (ok) { if (ok) {
// if it's a format string we skip as we cannot assure correct tag name
if (name.contains('%') && expressionListAST->next != nullptr)
return true;
int line = 0; int line = 0;
int column = 0; int column = 0;
m_currentDoc->translationUnit()->getTokenStartPosition( m_currentDoc->translationUnit()->getTokenStartPosition(
@@ -279,10 +282,12 @@ bool TestDataFunctionVisitor::newRowCallFound(CallAST *ast, unsigned *firstToken
return false; return false;
if (const auto qualifiedNameAST = exp->name->asQualifiedName()) { if (const auto qualifiedNameAST = exp->name->asQualifiedName()) {
found = m_overview.prettyName(qualifiedNameAST->name) == "QTest::newRow"; const QString name = m_overview.prettyName(qualifiedNameAST->name);
found = (name == "QTest::newRow" || name == "QTest::addRow");
*firstToken = qualifiedNameAST->firstToken(); *firstToken = qualifiedNameAST->firstToken();
} else if (m_insideUsingQTest) { } else if (m_insideUsingQTest) {
found = m_overview.prettyName(exp->name->name) == "newRow"; const QString name = m_overview.prettyName(exp->name->name);
found = (name == "newRow" || name == "addRow");
*firstToken = exp->name->firstToken(); *firstToken = exp->name->firstToken();
} }
} }