From b7e8b85c647dfa6c3cf556fdb523570818b16232 Mon Sep 17 00:00:00 2001 From: heck Date: Thu, 10 Jun 2021 05:18:26 +0200 Subject: [PATCH] Tests: PityTest - update tests --- test/test_execmodes.cc | 51 ++++++++------ test/test_processdirs.cc | 141 ++++++++++++++++++++++++--------------- 2 files changed, 119 insertions(+), 73 deletions(-) diff --git a/test/test_execmodes.cc b/test/test_execmodes.cc index 3f66138..6de72a9 100644 --- a/test/test_execmodes.cc +++ b/test/test_execmodes.cc @@ -1,12 +1,13 @@ #include "../src/PityUnit.hh" -#include "../../../src/std_utils.hh" +#include "../src/PityModel.hh" +#include "../src/PityPerspective.hh" #include using namespace std; using namespace pEp; using namespace pEp::PityTest11; -void do_some_work(const PityUnit<>& myself, int sleepmilis, int rep_count) +void do_some_work(PityUnit<>& myself, int sleepmilis, int rep_count) { int i = 0; while (i < rep_count) { @@ -28,36 +29,46 @@ int main(int argc, char* argv[]) // Subprocess 1 PityUnit<> test1 = PityUnit<>{ &root, "node1", - [](const PityUnit<>& mynode) { - do_some_work(mynode, 200, 10); - }, + [](PityUnit<>& unit, + PityModel* model, + PityPerspective* psp) { do_some_work(unit, 200, 10); }, + nullptr, nullptr, pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL }; - PityUnit<> test1_1 = PityUnit<>{ &test1, "test1.1", [](const PityUnit<>& mynode) { - do_some_work(mynode, 200, 10); - } }; + PityUnit<> test1_1 = PityUnit<>{ &test1, + "test1.1", + [](PityUnit<>& unit, + PityModel* model, + PityPerspective* psp) { do_some_work(unit, 200, 10); } }; - PityUnit<> test1_2 = PityUnit<>{ &test1, "test1.2", [](const PityUnit<>& mynode) { - do_some_work(mynode, 200, 10); - } }; + PityUnit<> test1_2 = PityUnit<>{ &test1, + "test1.2", + [](PityUnit<>& unit, + PityModel* model, + PityPerspective* psp) { do_some_work(unit, 200, 10); } }; // Subprocess 2 PityUnit<> test2 = PityUnit<>{ &root, "node2", - [](const PityUnit<>& mynode) { - do_some_work(mynode, 200, 10); - }, + [](PityUnit<>& unit, + PityModel* model, + PityPerspective* psp) { do_some_work(unit, 200, 10); }, + nullptr, nullptr, pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL }; - PityUnit<> test2_1 = PityUnit<>{ &test2, "test2.1", [](const PityUnit<>& mynode) { - do_some_work(mynode, 200, 10); - } }; + PityUnit<> test2_1 = PityUnit<>{ &test2, + "test2.1", + [](PityUnit<>& unit, + PityModel* model, + PityPerspective* psp) { do_some_work(unit, 200, 10); } }; - PityUnit<> test2_2 = PityUnit<>{ &test2, "test2.2", [](const PityUnit<>& mynode) { - do_some_work(mynode, 200, 10); - } }; + PityUnit<> test2_2 = PityUnit<>{ &test2, + "test2.2", + [](PityUnit<>& unit, + PityModel* model, + PityPerspective* psp) { do_some_work(unit, 200, 10); } }; root.run(); } diff --git a/test/test_processdirs.cc b/test/test_processdirs.cc index 25b95d6..70fe215 100644 --- a/test/test_processdirs.cc +++ b/test/test_processdirs.cc @@ -5,7 +5,7 @@ using namespace std; using namespace pEp::PityTest11; -void printHomeDir(const PityUnit<>& myself) +void printHomeDir(PityUnit<>& myself) { // TESTLOG(string(myself.getFQName() + " - PID: " + to_string(getpid()))); // cout << "[" << to_string(getpid()) << "/" << myself.getFQName() << "] - " << endl; @@ -19,63 +19,98 @@ int main(int argc, char* argv[]) PityUnit<> root = PityUnit<>{ nullptr, "test_processdirs" }; // 1 - PityUnit<> test1 = PityUnit<>{ &root, "node 1", [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/"); - } }; - - PityUnit<> test1_1 = PityUnit<>{ &test1, "node 1.1", [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/"); - } }; + PityUnit<> test1 = PityUnit<>{ + &root, + "node 1", + [](PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/"); + } + }; + + PityUnit<> test1_1 = PityUnit<>{ + &test1, + "node 1.1", + []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/"); + } + }; // 2 - PityUnit<> test2 = PityUnit<>{ &root, "node 2", [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/"); - } }; - - PityUnit<> test2_1 = PityUnit<>{ &test2, - "node 2.1", - [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/"); - }, - nullptr, - pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL }; - - - PityUnit<> test2_1_1 = PityUnit<>{ &test2_1, "node 2.1.1", [](PityUnit<> mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/"); - } }; + PityUnit<> test2 = PityUnit<>{ + &root, + "node 2", + []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/"); + } + }; + + PityUnit<> test2_1 = PityUnit<>{ + &test2, + "node 2.1", + []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/"); + }, + nullptr, + nullptr, + pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL + }; + + + PityUnit<> test2_1_1 = PityUnit<>{ + &test2_1, + "node 2.1.1", + [](PityUnit<> mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/"); + } + }; // 3 - PityUnit<> test3 = PityUnit<>{ &root, - "node 3", - [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); - }, - nullptr, - PityUnit<>::ExecutionMode::PROCESS_PARALLEL }; - - PityUnit<> test3_1 = PityUnit<>{ &test3, "node 3.1", [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); - } }; - - PityUnit<> test3_1_1 = PityUnit<>{ &test3_1, "node 3.1.1", [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); - } }; - - PityUnit<> test3_1_1_1 = PityUnit<>{ &test3_1_1, - "node 3.1.1", - [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/"); - }, - nullptr, - PityUnit<>::ExecutionMode::PROCESS_PARALLEL }; - - PityUnit<> test3_1_1_1_1 = PityUnit<>{ &test3_1_1_1, - "node 3.1.1.1", - [](const PityUnit<>& mynode) { - PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/"); - }}; + PityUnit<> test3 = PityUnit<>{ + &root, + "node 3", + []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); + }, + nullptr, + nullptr, + PityUnit<>::ExecutionMode::PROCESS_PARALLEL + }; + + PityUnit<> test3_1 = PityUnit<>{ + &test3, + "node 3.1", + []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); + } + }; + + PityUnit<> test3_1_1 = PityUnit<>{ + &test3_1, + "node 3.1.1", + []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); + } + }; + + PityUnit<> test3_1_1_1 = PityUnit<>{ + &test3_1_1, + "node 3.1.1", + []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/"); + }, + nullptr, + nullptr, + PityUnit<>::ExecutionMode::PROCESS_PARALLEL + }; + + PityUnit<> test3_1_1_1_1 = PityUnit<>{ + &test3_1_1_1, + "node 3.1.1.1", + []( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { + PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/"); + } + }; root.run(); } \ No newline at end of file