testlib: Fix name of current test case element in JUnit reporter

Change-Id: I0bd77e5f1d0540b87568a0c69a4b96442d4000eb
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 1272b60d9eea398c70a7e7803d41e13ad9a1956f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 10 insertions, 10 deletions

diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp
index 10fe8fd81a..4d8ed2ae59 100644
--- a/src/testlib/qjunittestlogger.cpp
+++ b/src/testlib/qjunittestlogger.cpp
@@ -172,10 +172,10 @@ void QJUnitTestLogger::enterTestFunction(const char *function)
 
 void QJUnitTestLogger::enterTestCase(const char *name)
 {
-    currentLogElement = new QTestElement(QTest::LET_TestCase);
-    currentLogElement->addAttribute(QTest::AI_Name, name);
-    currentLogElement->addAttribute(QTest::AI_Classname, QTestResult::currentTestObjectName());
-    currentLogElement->addToList(&listOfTestcases);
+    currentTestCase = new QTestElement(QTest::LET_TestCase);
+    currentTestCase->addAttribute(QTest::AI_Name, name);
+    currentTestCase->addAttribute(QTest::AI_Classname, QTestResult::currentTestObjectName());
+    currentTestCase->addToList(&listOfTestcases);
 
     // The element will be deleted when the suite is deleted
 
@@ -194,7 +194,7 @@ void QJUnitTestLogger::enterTestData(QTestData *)
     if (QTestResult::currentTestFunction() != lastTestFunction) {
         // Adopt existing testcase for the initial test data
         auto *name = const_cast<QTestElementAttribute*>(
-            currentLogElement->attribute(QTest::AI_Name));
+            currentTestCase->attribute(QTest::AI_Name));
         name->setPair(QTest::AI_Name, testIdentifier.data());
         lastTestFunction = QTestResult::currentTestFunction();
         elapsedTestcaseTime.restart();
@@ -212,7 +212,7 @@ void QJUnitTestLogger::leaveTestFunction()
 
 void QJUnitTestLogger::leaveTestCase()
 {
-    currentLogElement->addAttribute(QTest::AI_Time,
+    currentTestCase->addAttribute(QTest::AI_Time,
         toSecondsFormat(elapsedTestCaseSeconds()).constData());
 }
 
@@ -272,7 +272,7 @@ void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description,
             failureElement->addLogElement(messageElement);
         }
 
-        currentLogElement->addLogElement(failureElement);
+        currentTestCase->addLogElement(failureElement);
     }
 
     /*
@@ -292,7 +292,7 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con
     if (type == QAbstractTestLogger::Skip) {
         auto skippedElement = new QTestElement(QTest::LET_Skipped);
         skippedElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
-        currentLogElement->addLogElement(skippedElement);
+        currentTestCase->addLogElement(skippedElement);
         return;
     }
 
@@ -336,7 +336,7 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con
     messageElement->addAttribute(QTest::AI_Type, typeBuf);
     messageElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
 
-    currentLogElement->addLogElement(messageElement);
+    currentTestCase->addLogElement(messageElement);
 
     // Also add the message to the system log (stdout/stderr), if one exists
     if (systemLogElement) {
diff --git a/src/testlib/qjunittestlogger_p.h b/src/testlib/qjunittestlogger_p.h
index 4c5f05e885..7998ae8fb7 100644
--- a/src/testlib/qjunittestlogger_p.h
+++ b/src/testlib/qjunittestlogger_p.h
@@ -85,7 +85,7 @@ class QJUnitTestLogger : public QAbstractTestLogger
 
         QTestElement *currentTestSuite = nullptr;
         QTestElement *listOfTestcases = nullptr;
-        QTestElement *currentLogElement = nullptr;
+        QTestElement *currentTestCase = nullptr;
         QTestElement *systemOutputElement = nullptr;
         QTestElement *systemErrorElement = nullptr;
         QTestJUnitStreamer *logFormatter = nullptr;