From fa86a9dff0b6257da580111622794b107e6f166c Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 26 May 2023 11:05:35 +0200
Subject: [PATCH] TaskTree tests: Make test enums printable

In this way we see the name of the enum value instead
of an int on test fail.

Change-Id: I5eeae785c0bf1a85d7e5430b4b6b3aca8dd409ee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 tests/auto/solutions/tasking/tst_tasking.cpp | 21 ++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/auto/solutions/tasking/tst_tasking.cpp b/tests/auto/solutions/tasking/tst_tasking.cpp
index 7da3177b8a8..17335d29f41 100644
--- a/tests/auto/solutions/tasking/tst_tasking.cpp
+++ b/tests/auto/solutions/tasking/tst_tasking.cpp
@@ -17,6 +17,10 @@ using namespace Tasking;
 using TestTask = Async<void>;
 using Test = AsyncTask<void>;
 
+namespace PrintableEnums {
+
+Q_NAMESPACE
+
 enum class Handler {
     Setup,
     Done,
@@ -25,8 +29,16 @@ enum class Handler {
     GroupDone,
     GroupError,
     Sync,
-    BarrierAdvance,
+    BarrierAdvance
 };
+Q_ENUM_NS(Handler);
+
+enum class OnDone { Success, Failure };
+Q_ENUM_NS(OnDone);
+
+} // namespace PrintableEnums
+
+using namespace PrintableEnums;
 
 using Log = QList<QPair<int, Handler>>;
 
@@ -45,8 +57,6 @@ static const char s_taskIdProperty[] = "__taskId";
 
 static FutureSynchronizer *s_futureSynchronizer = nullptr;
 
-enum class OnDone { Success, Failure };
-
 struct TestData {
     TreeStorage<CustomStorage> storage;
     Group root;
@@ -1619,15 +1629,14 @@ void tst_Tasking::testTree()
     Log actualLog;
     const auto collectLog = [&actualLog](CustomStorage *storage) { actualLog = storage->m_log; };
     taskTree.onStorageDone(testData.storage, collectLog);
-    const int result = taskTree.runBlocking(2000);
+    const OnDone result = taskTree.runBlocking(2000) ? OnDone::Success : OnDone::Failure;
     QCOMPARE(taskTree.isRunning(), false);
 
     QCOMPARE(taskTree.progressValue(), testData.taskCount);
     QCOMPARE(actualLog, testData.expectedLog);
     QCOMPARE(CustomStorage::instanceCount(), 0);
 
-    const bool expectSuccess = testData.onDone == OnDone::Success;
-    QCOMPARE(result, expectSuccess);
+    QCOMPARE(result, testData.onDone);
 }
 
 void tst_Tasking::storageOperators()