diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-07-29 16:40:09 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-08-05 03:58:50 +0200 |
| commit | 5a483656bca949f6c31b5da5339fa5cbe1dfac76 (patch) | |
| tree | 44b803a7955de910f5e46afeec2dc94dd1bb911f | |
| parent | bb74e72aa92b599cb4c80c23161ce9b66639ec01 (diff) | |
testlib: Sync up QTest::LogElementType with element names
539553a57216c4ece292ff54fb623807c334cdb6 renamed the LET_Error element
enum to LET_Message, without renaming the corresponding "error" element
name. This was not an issue in practice, since we never write the actual
element in QTestJUnitStreamer, but the two should be in sync to avoid
any confusion.
Pick-to: 6.2
Change-Id: I6c29f5303393b5f36b2f9877940bf3f6eaf3b7d2
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rw-r--r-- | src/testlib/qtestcoreelement_p.h | 1 | ||||
| -rw-r--r-- | src/testlib/qtestelementattribute_p.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testlib/qtestcoreelement_p.h b/src/testlib/qtestcoreelement_p.h index 4eb7361a5c..98de54ccff 100644 --- a/src/testlib/qtestcoreelement_p.h +++ b/src/testlib/qtestcoreelement_p.h @@ -139,6 +139,7 @@ const char *QTestCoreElement<ElementType>::elementName() const "testcase", "testsuite", "benchmark", + "message", "system-err", "system-out" }; diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h index 973d43ace8..762ac13430 100644 --- a/src/testlib/qtestelementattribute_p.h +++ b/src/testlib/qtestelementattribute_p.h @@ -89,12 +89,13 @@ namespace QTest { LET_Property = 0, LET_Properties = 1, LET_Failure = 2, - LET_Message = 3, + LET_Error = 3, LET_TestCase = 4, LET_TestSuite = 5, LET_Benchmark = 6, - LET_SystemError = 7, - LET_SystemOutput = 8 + LET_Message = 7, + LET_SystemError = 8, + LET_SystemOutput = 9 }; } |