commit 15b5505e01488e75b5b85dfc866e494a2d6d3417
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Jan 27 19:09:28 2018 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Mon Jan 29 18:56:12 2018 -0500
tree 9d6b3d2f7e207196426811bff64a124e73278a14
parent 97a010178c0bd340babb3dfabcc6f8f6abbaef42

face: group parameters to createFace and connect into a common structure

Change-Id: Icb6857602ed7e897be6c5334b05be23793d133bb

tests/daemon/face/tcp-factory.t.cpp

diff --git a/tests/daemon/face/tcp-factory.t.cpp b/tests/daemon/face/tcp-factory.t.cpp
index 39567d6..934229f 100644
--- a/tests/daemon/face/tcp-factory.t.cpp
+++ b/tests/daemon/face/tcp-factory.t.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2017,  Regents of the University of California,
+ * Copyright (c) 2014-2018,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -172,9 +172,7 @@
   createFace(factory,
              FaceUri("tcp4://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");
@@ -182,33 +180,25 @@
   createFace(factory,
              FaceUri("tcp4://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("tcp4://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("tcp4://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("tcp4://127.0.0.1:20073"),
              {},
-             ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
-             false,
-             true,
+             {ndn::nfd::FACE_PERSISTENCY_PERSISTENT, false, true},
              {CreateFaceExpectedResult::SUCCESS, 0, ""});
 }
 
@@ -219,27 +209,21 @@
   createFace(factory,
              FaceUri("tcp4://127.0.0.1:20072"),
              FaceUri("tcp4://127.0.0.1:20071"),
-             ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
-             false,
-             false,
+             {ndn::nfd::FACE_PERSISTENCY_PERSISTENT, false, false},
              {CreateFaceExpectedResult::FAILURE, 406,
               "Unicast TCP faces cannot be created with a LocalUri"});
 
   createFace(factory,
              FaceUri("tcp4://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 TCP faces do not support on-demand persistency"});
 
   createFace(factory,
              FaceUri("tcp4://198.51.100.100:6363"),
              {},
-             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"});
 }
@@ -272,13 +256,11 @@
 BOOST_FIXTURE_TEST_CASE(CreateFaceTimeout, CreateFaceTimeoutFixture)
 {
   createChannel("0.0.0.0", "20070");
-
-  factory.createFace({FaceUri("tcp4://192.0.2.1:20070"), {},
-                      ndn::nfd::FACE_PERSISTENCY_PERSISTENT, false, false},
+  factory.createFace({FaceUri("tcp4://192.0.2.1:20070"), {}, {}},
                      bind(&CreateFaceTimeoutFixture::onFaceCreated, this, _1),
                      bind(&CreateFaceTimeoutFixture::onConnectFailed, this, _2));
 
-  BOOST_REQUIRE_EQUAL(limitedIo.run(1, time::seconds(10)), LimitedIo::EXCEED_OPS);
+  BOOST_REQUIRE_EQUAL(limitedIo.run(1, 10_s), LimitedIo::EXCEED_OPS);
   BOOST_CHECK(face == nullptr);
 }