face: pass addFace and NetworkMonitor to ProtocolFactory constructor

refs #4021

Change-Id: I842515eb044bb1c655b347e6069e63c55c4e2d54
This commit is contained in:
Junxiao Shi committed 2017-07-17 00:53:22 +00:00
1 parent 2d49175d6e
commit 0ba6d64e5a
22 files changed
+162 -97

No files matched your search

+11 -6
View File
@@ -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 @@ BOOST_AUTO_TEST_SUITE(ProcessConfig)
class DummyProtocolFactory : public ProtocolFactory
{
public:
DummyProtocolFactory(const CtorParams& params)
: ProtocolFactory(params)
{
}
void
processConfig(OptionalConfigSection configSection,
FaceSystem::ConfigContext& context) override
@@ -81,8 +86,8 @@ public:
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(Normal)
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(UnknownSection)
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(