commit 944f38bb4987f071f970692d6f92c7e88ba1df5e
author Eric Newberry <enewberry@email.arizona.edu> Thu Jul 20 20:54:22 2017 -0400
committer Eric Newberry <enewberry@email.arizona.edu> Sun Jul 23 20:37:06 2017 -0400
tree e312caf6587d5ad4d04385364a740cfc4075318d
parent b347b7f189a4667594efa24f42a735d7a144f2ee

face: move face parameters into CreateFaceParams struct

refs #4003

Change-Id: I6e1149e7075eb055912fd452a21b22fcb610829a

tests/daemon/face/face-system.t.cpp

diff --git a/tests/daemon/face/face-system.t.cpp b/tests/daemon/face/face-system.t.cpp
index 1e46240..2bb5a1f 100644
--- a/tests/daemon/face/face-system.t.cpp
+++ b/tests/daemon/face/face-system.t.cpp
@@ -56,10 +56,7 @@
   }
 
   void
-  createFace(const FaceUri& remoteUri,
-             const ndn::optional<FaceUri>& localUri,
-             ndn::nfd::FacePersistency persistency,
-             bool wantLocalFieldsEnabled,
+  createFace(const CreateFaceParams& params,
              const FaceCreatedCallback& onCreated,
              const FaceCreationFailedCallback& onFailure) override
   {

tests/daemon/face/factory-test-common.hpp

diff --git a/tests/daemon/face/factory-test-common.hpp b/tests/daemon/face/factory-test-common.hpp
index 20ccaf3..046aeb2 100644
--- a/tests/daemon/face/factory-test-common.hpp
+++ b/tests/daemon/face/factory-test-common.hpp
@@ -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,
@@ -49,7 +49,7 @@
            bool wantLocalFieldsEnabled,
            const CreateFaceExpectedResult& expected)
 {
-  factory.createFace(remoteUri, localUri, persistency, wantLocalFieldsEnabled,
+  factory.createFace({remoteUri, localUri, persistency, wantLocalFieldsEnabled},
                      [expected] (const shared_ptr<Face>&) {
                        BOOST_CHECK_EQUAL(CreateFaceExpectedResult::SUCCESS, expected.result);
                      },

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 d994fa2..8dd12ec 100644
--- a/tests/daemon/face/tcp-factory.t.cpp
+++ b/tests/daemon/face/tcp-factory.t.cpp
@@ -260,10 +260,8 @@
 {
   factory.createChannel("0.0.0.0", "20070");
 
-  factory.createFace(FaceUri("tcp4://192.0.2.1:20070"),
-                     {},
-                     ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
-                     false,
+  factory.createFace({FaceUri("tcp4://192.0.2.1:20070"), {},
+                      ndn::nfd::FACE_PERSISTENCY_PERSISTENT, false},
                      bind(&FaceCreateTimeoutFixture::onFaceCreated, this, _1),
                      bind(&FaceCreateTimeoutFixture::onConnectFailed, this, _2));
 

tests/daemon/mgmt/face-manager.t.cpp

diff --git a/tests/daemon/mgmt/face-manager.t.cpp b/tests/daemon/mgmt/face-manager.t.cpp
index 5f8eef0..03bdd78 100644
--- a/tests/daemon/mgmt/face-manager.t.cpp
+++ b/tests/daemon/mgmt/face-manager.t.cpp
@@ -268,10 +268,7 @@
   }
 
   void
-  createFace(const FaceUri& remoteUri,
-             const ndn::optional<FaceUri>& localUri,
-             ndn::nfd::FacePersistency persistency,
-             bool wantLocalFieldsEnabled,
+  createFace(const CreateFaceParams& params,
              const face::FaceCreatedCallback& onCreated,
              const face::FaceCreationFailedCallback& onConnectFailed) final
   {