face: group parameters to createFace and connect into a common structure
Change-Id: Icb6857602ed7e897be6c5334b05be23793d133bb
diff --git a/tests/daemon/face/udp-factory.t.cpp b/tests/daemon/face/udp-factory.t.cpp
index 4ef1451..7303f5c 100644
--- a/tests/daemon/face/udp-factory.t.cpp
+++ b/tests/daemon/face/udp-factory.t.cpp
@@ -877,9 +877,7 @@
createFace(factory,
FaceUri("udp4://127.0.0.1:6363"),
{},
- ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
- false,
- false,
+ {ndn::nfd::FACE_PERSISTENCY_PERSISTENT, false, false},
{CreateFaceExpectedResult::FAILURE, 504, "No channels available to connect"});
createChannel("127.0.0.1", 20071);
@@ -887,33 +885,25 @@
createFace(factory,
FaceUri("udp4://127.0.0.1:6363"),
{},
- ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
- false,
- false,
+ {ndn::nfd::FACE_PERSISTENCY_PERSISTENT, false, false},
{CreateFaceExpectedResult::SUCCESS, 0, ""});
createFace(factory,
FaceUri("udp4://127.0.0.1:6363"),
{},
- ndn::nfd::FACE_PERSISTENCY_PERMANENT,
- false,
- false,
+ {ndn::nfd::FACE_PERSISTENCY_PERMANENT, false, false},
{CreateFaceExpectedResult::SUCCESS, 0, ""});
createFace(factory,
FaceUri("udp4://127.0.0.1:20072"),
{},
- ndn::nfd::FACE_PERSISTENCY_PERMANENT,
- false,
- false,
+ {ndn::nfd::FACE_PERSISTENCY_PERMANENT, false, false},
{CreateFaceExpectedResult::SUCCESS, 0, ""});
createFace(factory,
FaceUri("udp4://127.0.0.1:20073"),
{},
- ndn::nfd::FACE_PERSISTENCY_PERMANENT,
- false,
- true,
+ {ndn::nfd::FACE_PERSISTENCY_PERMANENT, false, true},
{CreateFaceExpectedResult::SUCCESS, 0, ""});
}
@@ -924,36 +914,28 @@
createFace(factory,
FaceUri("udp4://127.0.0.1:20072"),
FaceUri("udp4://127.0.0.1:20071"),
- ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
- false,
- false,
+ {ndn::nfd::FACE_PERSISTENCY_PERSISTENT, false, false},
{CreateFaceExpectedResult::FAILURE, 406,
"Unicast UDP faces cannot be created with a LocalUri"});
createFace(factory,
FaceUri("udp4://127.0.0.1:20072"),
{},
- ndn::nfd::FACE_PERSISTENCY_ON_DEMAND,
- false,
- false,
+ {ndn::nfd::FACE_PERSISTENCY_ON_DEMAND, false, false},
{CreateFaceExpectedResult::FAILURE, 406,
"Outgoing UDP faces do not support on-demand persistency"});
createFace(factory,
FaceUri("udp4://233.252.0.1:23252"),
{},
- ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
- false,
- false,
+ {ndn::nfd::FACE_PERSISTENCY_PERSISTENT, false, false},
{CreateFaceExpectedResult::FAILURE, 406,
"Cannot create multicast UDP faces"});
createFace(factory,
FaceUri("udp4://127.0.0.1:20072"),
{},
- ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
- true,
- false,
+ {ndn::nfd::FACE_PERSISTENCY_PERSISTENT, true, false},
{CreateFaceExpectedResult::FAILURE, 406,
"Local fields can only be enabled on faces with local scope"});
}