AutoTest: Support QTest::addRow as well

Fixes: QTCREATORBUG-24777
Change-Id: I33ac86a226036855a304b71e2e7ebfe8884d8dc3
Reviewed-by: David Schulz <david.schulz@qt.io>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/plugins/autotest/qtest/qttestvisitors.cpp b/src/plugins/autotest/qtest/qttestvisitors.cpp
index 7b8374985b..e1757e23f1 100644
--- a/src/plugins/autotest/qtest/qttestvisitors.cpp
+++ b/src/plugins/autotest/qtest/qttestvisitors.cpp
@@ -226,6 +226,9 @@ bool TestDataFunctionVisitor::visit(CallAST *ast)
                     bool ok = false;
                     QString name = extractNameFromAST(stringLiteral, &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 column = 0;
                         m_currentDoc->translationUnit()->getTokenStartPosition(
@@ -279,10 +282,12 @@ bool TestDataFunctionVisitor::newRowCallFound(CallAST *ast, unsigned *firstToken
             return false;
 
         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();
         } 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();
         }
     }