From 0946f32ef740f42fc14dad5890b73c332c55840a Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 7 Jul 2021 02:54:14 +0200 Subject: [PATCH] Tests: PityTest - PityUnit change constructor semantics (parent) --- test/pitytest11/src/PityUnit.hh | 8 +++++++- test/pitytest11/src/PityUnit.hxx | 29 ++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/test/pitytest11/src/PityUnit.hh b/test/pitytest11/src/PityUnit.hh index 1c02585..b77d07d 100644 --- a/test/pitytest11/src/PityUnit.hh +++ b/test/pitytest11/src/PityUnit.hh @@ -28,7 +28,13 @@ namespace pEp { // Constructors are private PityUnit() = delete; explicit PityUnit( - AbstractPityUnit* const parent, + const std::string& name, + TestFunction test_func = nullptr, + TestContext* perspective = nullptr, + ExecutionMode exec_mode = ExecutionMode::FUNCTION); + + explicit PityUnit( + AbstractPityUnit& parent, const std::string& name, TestFunction test_func = nullptr, TestContext* perspective = nullptr, diff --git a/test/pitytest11/src/PityUnit.hxx b/test/pitytest11/src/PityUnit.hxx index c29c5b5..70a7c08 100644 --- a/test/pitytest11/src/PityUnit.hxx +++ b/test/pitytest11/src/PityUnit.hxx @@ -20,14 +20,25 @@ namespace pEp { namespace PityTest11 { - // CONSTRUCTOR - template - PityUnit::PityUnit( - AbstractPityUnit *const parent, - const std::string &name, - TestFunction test_func, - TestContext *perspective, - ExecutionMode exec_mode) : + + template + PityUnit::PityUnit( + const std::string &name, + TestFunction test_func, + TestContext *perspective, + ExecutionMode exec_mode) : + AbstractPityUnit(name, exec_mode), + _perspective{ perspective }, _test_func{ test_func } + { + } + + template + PityUnit::PityUnit( + AbstractPityUnit &parent, + const std::string &name, + TestFunction test_func, + TestContext *perspective, + ExecutionMode exec_mode) : AbstractPityUnit(parent, name, exec_mode), _perspective{ perspective }, _test_func{ test_func } { @@ -59,7 +70,7 @@ namespace pEp { if (_perspective != nullptr) { ret = _perspective; } else { - if (!_isRootUnit()) { + if (!isRoot()) { ret = (dynamic_cast *>(getParent()))->getPerspective(); } }