Browse Source

Tests: PityTest - PityUnit change constructor semantics (parent)

master
heck 4 years ago
parent
commit
e5aa9c6ef2
  1. 8
      src/PityUnit.hh
  2. 29
      src/PityUnit.hxx

8
src/PityUnit.hh

@ -28,7 +28,13 @@ namespace pEp {
// Constructors are private // Constructors are private
PityUnit() = delete; PityUnit() = delete;
explicit PityUnit<TestContext>( explicit PityUnit<TestContext>(
AbstractPityUnit* const parent, const std::string& name,
TestFunction test_func = nullptr,
TestContext* perspective = nullptr,
ExecutionMode exec_mode = ExecutionMode::FUNCTION);
explicit PityUnit<TestContext>(
AbstractPityUnit& parent,
const std::string& name, const std::string& name,
TestFunction test_func = nullptr, TestFunction test_func = nullptr,
TestContext* perspective = nullptr, TestContext* perspective = nullptr,

29
src/PityUnit.hxx

@ -20,14 +20,25 @@
namespace pEp { namespace pEp {
namespace PityTest11 { namespace PityTest11 {
// CONSTRUCTOR
template<class TestContext> template<class TestContext>
PityUnit<TestContext>::PityUnit( PityUnit<TestContext>::PityUnit(
AbstractPityUnit *const parent, const std::string &name,
const std::string &name, TestFunction test_func,
TestFunction test_func, TestContext *perspective,
TestContext *perspective, ExecutionMode exec_mode) :
ExecutionMode exec_mode) : AbstractPityUnit(name, exec_mode),
_perspective{ perspective }, _test_func{ test_func }
{
}
template<class TestContext>
PityUnit<TestContext>::PityUnit(
AbstractPityUnit &parent,
const std::string &name,
TestFunction test_func,
TestContext *perspective,
ExecutionMode exec_mode) :
AbstractPityUnit(parent, name, exec_mode), AbstractPityUnit(parent, name, exec_mode),
_perspective{ perspective }, _test_func{ test_func } _perspective{ perspective }, _test_func{ test_func }
{ {
@ -59,7 +70,7 @@ namespace pEp {
if (_perspective != nullptr) { if (_perspective != nullptr) {
ret = _perspective; ret = _perspective;
} else { } else {
if (!_isRootUnit()) { if (!isRoot()) {
ret = (dynamic_cast<PityUnit<TestContext> *>(getParent()))->getPerspective(); ret = (dynamic_cast<PityUnit<TestContext> *>(getParent()))->getPerspective();
} }
} }

Loading…
Cancel
Save