Browse Source

Tests: PityTest - update tests

master
heck 4 years ago
parent
commit
d6a28a8154
  1. 2
      src/PityUnit.hh
  2. 46
      test/test_execmodes.cc
  3. 8
      test/test_linear.cc
  4. 81
      test/test_processdirs.cc
  5. 2
      test/test_swarm.cc

2
src/PityUnit.hh

@ -19,7 +19,7 @@
namespace pEp { namespace pEp {
namespace PityTest11 { namespace PityTest11 {
template<class TestContext> template<class TestContext = void>
class PityUnit { class PityUnit {
public: public:
using TestFunction = const std::function<void(PityUnit<TestContext>&, TestContext*)>; using TestFunction = const std::function<void(PityUnit<TestContext>&, TestContext*)>;

46
test/test_execmodes.cc

@ -29,46 +29,36 @@ int main(int argc, char* argv[])
// Subprocess 1 // Subprocess 1
PityUnit<> test1 = PityUnit<>{ &root, PityUnit<> test1 = PityUnit<>{ &root,
"node1", "node1",
[](PityUnit<>& unit, [](PityUnit<>& unit, void* ctx) {
PityModel* model, do_some_work(unit, 200, 10);
PityPerspective* psp) { do_some_work(unit, 200, 10); }, },
nullptr,
nullptr, nullptr,
pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL }; pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL };
PityUnit<> test1_1 = PityUnit<>{ &test1, PityUnit<> test1_1 = PityUnit<>{ &test1, "test1.1", [](PityUnit<>& unit, void* ctx) {
"test1.1", do_some_work(unit, 200, 10);
[](PityUnit<>& unit, } };
PityModel* model,
PityPerspective* psp) { do_some_work(unit, 200, 10); } };
PityUnit<> test1_2 = PityUnit<>{ &test1, PityUnit<> test1_2 = PityUnit<>{ &test1, "test1.2", [](PityUnit<>& unit, void* ctx) {
"test1.2", do_some_work(unit, 200, 10);
[](PityUnit<>& unit, } };
PityModel* model,
PityPerspective* psp) { do_some_work(unit, 200, 10); } };
// Subprocess 2 // Subprocess 2
PityUnit<> test2 = PityUnit<>{ &root, PityUnit<> test2 = PityUnit<>{ &root,
"node2", "node2",
[](PityUnit<>& unit, [](PityUnit<>& unit, void* ctx) {
PityModel* model, do_some_work(unit, 200, 10);
PityPerspective* psp) { do_some_work(unit, 200, 10); }, },
nullptr,
nullptr, nullptr,
pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL }; pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL };
PityUnit<> test2_1 = PityUnit<>{ &test2, PityUnit<> test2_1 = PityUnit<>{ &test2, "test2.1", [](PityUnit<>& unit, void* ctx) {
"test2.1", do_some_work(unit, 200, 10);
[](PityUnit<>& unit, } };
PityModel* model,
PityPerspective* psp) { do_some_work(unit, 200, 10); } };
PityUnit<> test2_2 = PityUnit<>{ &test2, PityUnit<> test2_2 = PityUnit<>{ &test2, "test2.2", [](PityUnit<>& unit, void* ctx) {
"test2.2", do_some_work(unit, 200, 10);
[](PityUnit<>& unit, } };
PityModel* model,
PityPerspective* psp) { do_some_work(unit, 200, 10); } };
root.run(); root.run();
} }

8
test/test_linear.cc

@ -35,16 +35,16 @@ public:
Car car; Car car;
}; };
void test_setGear(const PityUnit<CarTestModel>& node) void test_setGear(PityUnit<CarTestModel>& node, CarTestModel* ctx)
{ {
int gear = 1; int gear = 1;
node.log("Setting gear to: " + to_string(gear)); node.log("Setting gear to: " + to_string(gear));
node.getModel()->car.setGear(gear); ctx->car.setGear(gear);
} }
void test_drive(const PityUnit<CarTestModel>& node) void test_drive(PityUnit<CarTestModel>& node, CarTestModel* ctx)
{ {
node.getModel()->car.drive(); ctx->car.drive();
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])

81
test/test_processdirs.cc

@ -19,95 +19,78 @@ int main(int argc, char* argv[])
PityUnit<> root = PityUnit<>{ nullptr, "test_processdirs" }; PityUnit<> root = PityUnit<>{ nullptr, "test_processdirs" };
// 1 // 1
PityUnit<> test1 = PityUnit<>{ PityUnit<> test1 = PityUnit<>{ &root, "node 1", [](PityUnit<>& mynode, void* ctx) {
&root, PTASSERT(
"node 1", mynode.processDir() == "./pitytest_data/test_processdirs/");
[](PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { } };
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/");
}
};
PityUnit<> test1_1 = PityUnit<>{ PityUnit<> test1_1 = PityUnit<>{ &test1, "node 1.1", [](PityUnit<>& mynode, void* ctx) {
&test1, PTASSERT(
"node 1.1", mynode.processDir() ==
[]( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { "./pitytest_data/test_processdirs/");
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/"); } };
}
};
// 2 // 2
PityUnit<> test2 = PityUnit<>{ PityUnit<> test2 = PityUnit<>{ &root, "node 2", [](PityUnit<>& mynode, void* ctx) {
&root, PTASSERT(
"node 2", mynode.processDir() == "./pitytest_data/test_processdirs/");
[]( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { } };
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/");
}
};
PityUnit<> test2_1 = PityUnit<>{ PityUnit<> test2_1 = PityUnit<>{
&test2, &test2,
"node 2.1", "node 2.1",
[]( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { [](PityUnit<>& mynode, void* ctx) {
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/"); PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/");
}, },
nullptr, nullptr,
nullptr,
pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL
}; };
PityUnit<> test2_1_1 = PityUnit<>{ PityUnit<> test2_1_1 = PityUnit<>{ &test2_1, "node 2.1.1", [](PityUnit<> mynode, void* ctx) {
&test2_1, PTASSERT(
"node 2.1.1", mynode.processDir() ==
[](PityUnit<> mynode, PityModel* model, PityPerspective* psp) { "./pitytest_data/test_processdirs/node_2_1/");
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/"); } };
}
};
// 3 // 3
PityUnit<> test3 = PityUnit<>{ PityUnit<> test3 = PityUnit<>{
&root, &root,
"node 3", "node 3",
[]( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { [](PityUnit<>& mynode, void* ctx) {
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/");
}, },
nullptr, nullptr,
nullptr,
PityUnit<>::ExecutionMode::PROCESS_PARALLEL PityUnit<>::ExecutionMode::PROCESS_PARALLEL
}; };
PityUnit<> test3_1 = PityUnit<>{ PityUnit<> test3_1 = PityUnit<>{ &test3, "node 3.1", [](PityUnit<>& mynode, void* ctx) {
&test3, PTASSERT(
"node 3.1", mynode.processDir() ==
[]( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { "./pitytest_data/test_processdirs/node_3/");
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); } };
}
};
PityUnit<> test3_1_1 = PityUnit<>{ PityUnit<> test3_1_1 = PityUnit<>{ &test3_1, "node 3.1.1", [](PityUnit<>& mynode, void* ctx) {
&test3_1, PTASSERT(
"node 3.1.1", mynode.processDir() ==
[]( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { "./pitytest_data/test_processdirs/node_3/");
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/"); } };
}
};
PityUnit<> test3_1_1_1 = PityUnit<>{ PityUnit<> test3_1_1_1 = PityUnit<>{
&test3_1_1, &test3_1_1,
"node 3.1.1", "node 3.1.1",
[]( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { [](PityUnit<>& mynode, void* ctx) {
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/"); PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/");
}, },
nullptr, nullptr,
nullptr,
PityUnit<>::ExecutionMode::PROCESS_PARALLEL PityUnit<>::ExecutionMode::PROCESS_PARALLEL
}; };
PityUnit<> test3_1_1_1_1 = PityUnit<>{ PityUnit<> test3_1_1_1_1 = PityUnit<>{
&test3_1_1_1, &test3_1_1_1,
"node 3.1.1.1", "node 3.1.1.1",
[]( PityUnit<>& mynode, PityModel* model, PityPerspective* psp) { [](PityUnit<>& mynode, void* ctx) {
PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/"); PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/");
} }
}; };

2
test/test_swarm.cc

@ -29,7 +29,7 @@ void test_node1(PityUnit<PityPerspective>& unit, PityPerspective* psp)
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
int nodesCount = 3; int nodesCount = 23;
PityModel model{ "test_swarm", nodesCount }; PityModel model{ "test_swarm", nodesCount };
PitySwarm swarm{model}; PitySwarm swarm{model};

Loading…
Cancel
Save