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

TaskTree: Add more tests for recently added fixes

Browse Source 
Change-Id: Ia71fa174380b484cbe07a23f8b641755c5edcc65
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-20 03:10:56 +01:00
parent 6269c2cec8
commit 9dfd72017c
1 changed files with 79 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
tests/auto/utils/tasktree/tst_tasktree.cpp
View File

@@ -163,9 +163,9 @@ void tst_TaskTree::processTree_data()
const auto rootError = [storage] { const auto rootError = [storage] {
storage->m_log.append({-1, Handler::GroupError}); storage->m_log.append({-1, Handler::GroupError});
}; };
const auto setupDynamicProcess = [storage](QtcProcess &process, TaskAction action) { const auto setupDynamicProcess = [storage, setupProcess](QtcProcess &process, int processId,
Q_UNUSED(process) TaskAction action) {
storage->m_log.append({-1, Handler::Setup}); setupProcess(process, processId);
return action; return action;
}; };
@@ -178,23 +178,92 @@ void tst_TaskTree::processTree_data()
const Group dynamicTaskDoneRoot { const Group dynamicTaskDoneRoot {
Storage(storage), Storage(storage),
Process(std::bind(setupDynamicProcess, _1, TaskAction::StopWithDone)), Process(std::bind(setupDynamicProcess, _1, 1, TaskAction::StopWithDone), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, TaskAction::StopWithDone)) Process(std::bind(setupDynamicProcess, _1, 2, TaskAction::StopWithDone), readResult, readError)
}; };
const Log dynamicTaskDoneLog{{-1, Handler::Setup}, const Log dynamicTaskDoneLog{{1, Handler::Setup},
{-1, Handler::Setup}}; {2, Handler::Setup}};
QTest::newRow("DynamicTaskDone") << dynamicTaskDoneRoot << storage << dynamicTaskDoneLog QTest::newRow("DynamicTaskDone") << dynamicTaskDoneRoot << storage << dynamicTaskDoneLog
<< false << true << 2; << false << true << 2;
const Group dynamicTaskErrorRoot { const Group dynamicTaskErrorRoot {
Storage(storage), Storage(storage),
Process(std::bind(setupDynamicProcess, _1, TaskAction::StopWithError)), Process(std::bind(setupDynamicProcess, _1, 1, TaskAction::StopWithError), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, TaskAction::StopWithError)) Process(std::bind(setupDynamicProcess, _1, 2, TaskAction::StopWithError), readResult, readError)
}; };
const Log dynamicTaskErrorLog{{-1, Handler::Setup}}; const Log dynamicTaskErrorLog{{1, Handler::Setup}};
QTest::newRow("DynamicTaskError") << dynamicTaskErrorRoot << storage << dynamicTaskErrorLog QTest::newRow("DynamicTaskError") << dynamicTaskErrorRoot << storage << dynamicTaskErrorLog
<< false << false << 2; << false << false << 2;
const Group dynamicMixedRoot {
Storage(storage),
Process(std::bind(setupDynamicProcess, _1, 1, TaskAction::Continue), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, 2, TaskAction::Continue), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, 3, TaskAction::StopWithError), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, 4, TaskAction::Continue), readResult, readError)
};
const Log dynamicMixedLog{{1, Handler::Setup},
{1, Handler::Done},
{2, Handler::Setup},
{2, Handler::Done},
{3, Handler::Setup}};
QTest::newRow("DynamicMixed") << dynamicMixedRoot << storage << dynamicMixedLog
<< true << false << 4;
const Group dynamicParallelRoot {
parallel,
Storage(storage),
Process(std::bind(setupDynamicProcess, _1, 1, TaskAction::Continue), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, 2, TaskAction::Continue), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, 3, TaskAction::StopWithError), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, 4, TaskAction::Continue), readResult, readError)
};
const Log dynamicParallelLog{{1, Handler::Setup},
{2, Handler::Setup},
{3, Handler::Setup},
{1, Handler::Error},
{2, Handler::Error}};
QTest::newRow("DynamicParallel") << dynamicParallelRoot << storage << dynamicParallelLog
<< false << false << 4;
const Group dynamicParallelGroupRoot {
parallel,
Storage(storage),
Process(std::bind(setupDynamicProcess, _1, 1, TaskAction::Continue), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, 2, TaskAction::Continue), readResult, readError),
Group {
Process(std::bind(setupDynamicProcess, _1, 3, TaskAction::StopWithError), readResult, readError)
},
Process(std::bind(setupDynamicProcess, _1, 4, TaskAction::Continue), readResult, readError)
};
const Log dynamicParallelGroupLog{{1, Handler::Setup},
{2, Handler::Setup},
{3, Handler::Setup},
{1, Handler::Error},
{2, Handler::Error}};
QTest::newRow("DynamicParallelGroup") << dynamicParallelGroupRoot << storage
<< dynamicParallelGroupLog << false << false << 4;
const Group dynamicParallelGroupSetupRoot {
parallel,
Storage(storage),
Process(std::bind(setupDynamicProcess, _1, 1, TaskAction::Continue), readResult, readError),
Process(std::bind(setupDynamicProcess, _1, 2, TaskAction::Continue), readResult, readError),
Group {
DynamicSetup([storage] { storage->m_log.append({0, Handler::GroupSetup});
return GroupConfig{GroupAction::StopWithError}; }),
Process(std::bind(setupDynamicProcess, _1, 3, TaskAction::Continue), readResult, readError)
},
Process(std::bind(setupDynamicProcess, _1, 4, TaskAction::Continue), readResult, readError)
};
const Log dynamicParallelGroupSetupLog{{1, Handler::Setup},
{2, Handler::Setup},
{0, Handler::GroupSetup},
{1, Handler::Error},
{2, Handler::Error}};
QTest::newRow("DynamicParallelGroupSetup") << dynamicParallelGroupSetupRoot << storage
<< dynamicParallelGroupSetupLog << false << false << 4;
const Group nestedRoot { const Group nestedRoot {
Storage(storage), Storage(storage),
Group { Group {