feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TaskTree: Add tests for Group's CallDoneIf

Browse Source 
Change-Id: I7140c1c7e28f6f503520ad05e6dcd613dcec2df3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2024-01-24 12:11:17 +01:00
parent 6116605c4c
commit 359ab928b1
1 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
tests/auto/solutions/tasking/tst_tasking.cpp
View File

@@ -597,10 +597,10 @@ void tst_Tasking::testTree_data()
storage->m_log.append({taskId, Handler::GroupSetup}); storage->m_log.append({taskId, Handler::GroupSetup});
}); });
}; };
const auto groupDone = [storage](int taskId) { const auto groupDone = [storage](int taskId, CallDoneIf callIf = CallDoneIf::SuccessOrError) {
return onGroupDone([storage, taskId](DoneWith result) { return onGroupDone([storage, taskId](DoneWith result) {
storage->m_log.append({taskId, resultToGroupHandler(result)}); storage->m_log.append({taskId, resultToGroupHandler(result)});
}); }, callIf);
}; };
const auto groupSetupWithTweak = [storage](int taskId, SetupResult desiredResult) { const auto groupSetupWithTweak = [storage](int taskId, SetupResult desiredResult) {
return onGroupSetup([storage, taskId, desiredResult] { return onGroupSetup([storage, taskId, desiredResult] {
@@ -2901,6 +2901,55 @@ void tst_Tasking::testTree_data()
<< TestData{storage, rootParallelLimit, logParallelLimit, 2, DoneWith::Success}; << TestData{storage, rootParallelLimit, logParallelLimit, 2, DoneWith::Success};
} }
{
const auto createRoot = [=](DoneResult doneResult, CallDoneIf callDoneIf) {
return Group {
storage,
Group {
createTask(1, doneResult)
},
groupDone(2, callDoneIf)
};
};
const Log logSuccessLong {
{1, Handler::Setup},
{1, Handler::Success},
{2, Handler::GroupSuccess}
};
const Log logSuccessShort {
{1, Handler::Setup},
{1, Handler::Success}
};
const Log logErrorLong {
{1, Handler::Setup},
{1, Handler::Error},
{2, Handler::GroupError}
};
const Log logErrorShort {
{1, Handler::Setup},
{1, Handler::Error}
};
QTest::newRow("CallDoneIfGroupSuccessOrErrorAfterSuccess")
<< TestData{storage, createRoot(DoneResult::Success, CallDoneIf::SuccessOrError),
logSuccessLong, 1, DoneWith::Success};
QTest::newRow("CallDoneIfGroupSuccessAfterSuccess")
<< TestData{storage, createRoot(DoneResult::Success, CallDoneIf::Success),
logSuccessLong, 1, DoneWith::Success};
QTest::newRow("CallDoneIfGroupErrorAfterSuccess")
<< TestData{storage, createRoot(DoneResult::Success, CallDoneIf::Error),
logSuccessShort, 1, DoneWith::Success};
QTest::newRow("CallDoneIfGroupSuccessOrErrorAfterError")
<< TestData{storage, createRoot(DoneResult::Error, CallDoneIf::SuccessOrError),
logErrorLong, 1, DoneWith::Error};
QTest::newRow("CallDoneIfGroupSuccessAfterError")
<< TestData{storage, createRoot(DoneResult::Error, CallDoneIf::Success),
logErrorShort, 1, DoneWith::Error};
QTest::newRow("CallDoneIfGroupErrorAfterError")
<< TestData{storage, createRoot(DoneResult::Error, CallDoneIf::Error),
logErrorLong, 1, DoneWith::Error};
}
// This test checks if storage shadowing works OK. // This test checks if storage shadowing works OK.
QTest::newRow("StorageShadowing") << storageShadowingData(); QTest::newRow("StorageShadowing") << storageShadowingData();
} }