fw: pull FaceTable construction out of Forwarder class
Refs: #4922, #4973
Change-Id: Ibbd4a8840cb0d01ebbd4cabf9c34fa78a1d23db1
diff --git a/tests/daemon/table/strategy-choice.t.cpp b/tests/daemon/table/strategy-choice.t.cpp
index 339903e..8c52b54 100644
--- a/tests/daemon/table/strategy-choice.t.cpp
+++ b/tests/daemon/table/strategy-choice.t.cpp
@@ -36,9 +36,6 @@
{
protected:
StrategyChoiceFixture()
- : sc(forwarder.getStrategyChoice())
- , strategyNameP("/strategy-choice-P/%FD%00")
- , strategyNameQ("/strategy-choice-Q/%FD%00")
{
DummyStrategy::registerAs(strategyNameP);
DummyStrategy::registerAs(strategyNameQ);
@@ -77,11 +74,12 @@
}
protected:
- Forwarder forwarder;
- StrategyChoice& sc;
+ FaceTable faceTable;
+ Forwarder forwarder{faceTable};
+ StrategyChoice& sc{forwarder.getStrategyChoice()};
- const Name strategyNameP;
- const Name strategyNameQ;
+ const Name strategyNameP = "/strategy-choice-P/%FD%00";
+ const Name strategyNameQ = "/strategy-choice-Q/%FD%00";
};
BOOST_AUTO_TEST_SUITE(Table)