From 273518c82f53fd7e60936145554b16631bb91d2e Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Sat, 4 Nov 2023 09:44:33 +0100 Subject: [PATCH] TaskTree tests: Introduce GroupCanceled check Task-number: QTCREATORBUG-29834 Change-Id: I1bf716e662b279c1a85b7f95f81a61be39ee3110 Reviewed-by: hjk --- tests/auto/solutions/tasking/tst_tasking.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/auto/solutions/tasking/tst_tasking.cpp b/tests/auto/solutions/tasking/tst_tasking.cpp index 03be490df8f..029e5de3b19 100644 --- a/tests/auto/solutions/tasking/tst_tasking.cpp +++ b/tests/auto/solutions/tasking/tst_tasking.cpp @@ -24,7 +24,8 @@ enum class Handler { Canceled, GroupSetup, GroupSuccess, - GroupError, // TODO: Add GroupCanceled + GroupError, + GroupCanceled, Sync, BarrierAdvance, Timeout @@ -214,7 +215,12 @@ GroupItem createBarrierAdvance(const TreeStorage &storage, static Handler resultToGroupHandler(DoneWith result) { - return result == DoneWith::Success ? Handler::GroupSuccess : Handler::GroupError; + switch (result) { + case DoneWith::Success : return Handler::GroupSuccess; + case DoneWith::Error : return Handler::GroupError; + case DoneWith::Cancel : return Handler::GroupCanceled; + } + return Handler::GroupCanceled; } void tst_Tasking::testTree_data() @@ -980,7 +986,7 @@ void tst_Tasking::testTree_data() {2, Handler::Setup}, {2, Handler::Error}, {1, Handler::Canceled}, - {1, Handler::GroupError}, + {1, Handler::GroupCanceled}, {2, Handler::GroupError} }; @@ -1042,7 +1048,7 @@ void tst_Tasking::testTree_data() {2, Handler::Setup}, {3, Handler::Error}, {2, Handler::Canceled}, - {1, Handler::GroupError}, + {1, Handler::GroupCanceled}, {2, Handler::GroupError} }; @@ -1122,7 +1128,7 @@ void tst_Tasking::testTree_data() {2, Handler::Setup}, {3, Handler::Error}, {2, Handler::Canceled}, - {1, Handler::GroupError}, + {1, Handler::GroupCanceled}, {2, Handler::GroupError} };