face: pass addFace and NetworkMonitor to ProtocolFactory constructor
refs #4021
Change-Id: I842515eb044bb1c655b347e6069e63c55c4e2d54
diff --git a/tests/daemon/face/face-system.t.cpp b/tests/daemon/face/face-system.t.cpp
index 590c063..1e46240 100644
--- a/tests/daemon/face/face-system.t.cpp
+++ b/tests/daemon/face/face-system.t.cpp
@@ -1,5 +1,5 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
* Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
@@ -40,6 +40,11 @@
class DummyProtocolFactory : public ProtocolFactory
{
public:
+ DummyProtocolFactory(const CtorParams& params)
+ : ProtocolFactory(params)
+ {
+ }
+
void
processConfig(OptionalConfigSection configSection,
FaceSystem::ConfigContext& context) override
@@ -81,8 +86,8 @@
BOOST_AUTO_TEST_CASE(Normal)
{
- faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>();
- faceSystem.m_factories["f2"] = make_unique<DummyProtocolFactory>();
+ faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>(faceSystem.makePFCtorParams());
+ faceSystem.m_factories["f2"] = make_unique<DummyProtocolFactory>(faceSystem.makePFCtorParams());
auto f1 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f1"));
auto f2 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f2"));
@@ -119,8 +124,8 @@
BOOST_AUTO_TEST_CASE(OmittedSection)
{
- faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>();
- faceSystem.m_factories["f2"] = make_unique<DummyProtocolFactory>();
+ faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>(faceSystem.makePFCtorParams());
+ faceSystem.m_factories["f2"] = make_unique<DummyProtocolFactory>(faceSystem.makePFCtorParams());
auto f1 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f1"));
auto f2 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f2"));
@@ -165,7 +170,7 @@
BOOST_AUTO_TEST_CASE(ChangeProvidedSchemes)
{
- faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>();
+ faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>(faceSystem.makePFCtorParams());
auto f1 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f1"));
const std::string CONFIG = R"CONFIG(