face: move Channel and subclasses into nfd::face namespace
Change-Id: I163ef20e11b65d19d68585ec075fd3cd224a573b
diff --git a/tests/daemon/face/channel-fixture.hpp b/tests/daemon/face/channel-fixture.hpp
index a8e619d..f764125 100644
--- a/tests/daemon/face/channel-fixture.hpp
+++ b/tests/daemon/face/channel-fixture.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -32,8 +32,11 @@
#include <type_traits>
namespace nfd {
+namespace face {
namespace tests {
+using namespace nfd::tests;
+
template<class ChannelT, class EndpointT>
class ChannelFixture : public BaseFixture
{
@@ -104,6 +107,7 @@
};
} // namespace tests
+} // namespace face
} // namespace nfd
#endif // NFD_TESTS_DAEMON_FACE_CHANNEL_FIXTURE_HPP
diff --git a/tests/daemon/face/tcp-channel-fixture.hpp b/tests/daemon/face/tcp-channel-fixture.hpp
index 869a76c..4f63035 100644
--- a/tests/daemon/face/tcp-channel-fixture.hpp
+++ b/tests/daemon/face/tcp-channel-fixture.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -31,12 +31,13 @@
#include "channel-fixture.hpp"
namespace nfd {
+namespace face {
namespace tests {
class TcpChannelFixture : public ChannelFixture<TcpChannel, tcp::Endpoint>
{
protected:
- virtual unique_ptr<TcpChannel>
+ unique_ptr<TcpChannel>
makeChannel(const boost::asio::ip::address& addr, uint16_t port = 0) final
{
if (port == 0)
@@ -45,7 +46,7 @@
return make_unique<TcpChannel>(tcp::Endpoint(addr, port));
}
- virtual void
+ void
connect(TcpChannel& channel) final
{
g_io.post([&] {
@@ -65,6 +66,7 @@
};
} // namespace tests
+} // namespace face
} // namespace nfd
#endif // NFD_TESTS_DAEMON_FACE_TCP_CHANNEL_FIXTURE_HPP
diff --git a/tests/daemon/face/tcp-channel.t.cpp b/tests/daemon/face/tcp-channel.t.cpp
index 6b7dc36..8068364 100644
--- a/tests/daemon/face/tcp-channel.t.cpp
+++ b/tests/daemon/face/tcp-channel.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -30,6 +30,7 @@
#include <boost/mpl/vector.hpp>
namespace nfd {
+namespace face {
namespace tests {
BOOST_AUTO_TEST_SUITE(Face)
@@ -64,4 +65,5 @@
BOOST_AUTO_TEST_SUITE_END() // Face
} // namespace tests
+} // namespace face
} // namespace nfd
diff --git a/tests/daemon/face/tcp-udp-channel.t.cpp b/tests/daemon/face/tcp-udp-channel.t.cpp
index eebf790..88d9cba 100644
--- a/tests/daemon/face/tcp-udp-channel.t.cpp
+++ b/tests/daemon/face/tcp-udp-channel.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -31,6 +31,7 @@
#include <boost/mpl/vector.hpp>
namespace nfd {
+namespace face {
namespace tests {
BOOST_AUTO_TEST_SUITE(Face)
@@ -148,4 +149,5 @@
BOOST_AUTO_TEST_SUITE_END() // Face
} // namespace tests
+} // namespace face
} // namespace nfd
diff --git a/tests/daemon/face/udp-channel-fixture.hpp b/tests/daemon/face/udp-channel-fixture.hpp
index 5e76be1..ebb79fb 100644
--- a/tests/daemon/face/udp-channel-fixture.hpp
+++ b/tests/daemon/face/udp-channel-fixture.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -32,12 +32,13 @@
#include "channel-fixture.hpp"
namespace nfd {
+namespace face {
namespace tests {
class UdpChannelFixture : public ChannelFixture<UdpChannel, udp::Endpoint>
{
protected:
- virtual unique_ptr<UdpChannel>
+ unique_ptr<UdpChannel>
makeChannel(const boost::asio::ip::address& addr, uint16_t port = 0) final
{
if (port == 0)
@@ -46,7 +47,7 @@
return make_unique<UdpChannel>(udp::Endpoint(addr, port), time::seconds(2));
}
- virtual void
+ void
connect(UdpChannel& channel) final
{
g_io.post([&] {
@@ -68,6 +69,7 @@
};
} // namespace tests
+} // namespace face
} // namespace nfd
#endif // NFD_TESTS_DAEMON_FACE_UDP_CHANNEL_FIXTURE_HPP
diff --git a/tests/daemon/face/unix-stream-channel.t.cpp b/tests/daemon/face/unix-stream-channel.t.cpp
index dcd0270..1a356c0 100644
--- a/tests/daemon/face/unix-stream-channel.t.cpp
+++ b/tests/daemon/face/unix-stream-channel.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -31,6 +31,7 @@
#include <fstream>
namespace nfd {
+namespace face {
namespace tests {
namespace fs = boost::filesystem;
@@ -44,7 +45,7 @@
listenerEp = unix_stream::Endpoint("nfd-test-unix-stream-channel.sock");
}
- virtual unique_ptr<UnixStreamChannel>
+ unique_ptr<UnixStreamChannel>
makeChannel() final
{
return make_unique<UnixStreamChannel>(listenerEp);
@@ -174,4 +175,5 @@
BOOST_AUTO_TEST_SUITE_END() // Face
} // namespace tests
+} // namespace face
} // namespace nfd
diff --git a/tests/daemon/face/websocket-channel.t.cpp b/tests/daemon/face/websocket-channel.t.cpp
index c0ee2f8..57e70f5 100644
--- a/tests/daemon/face/websocket-channel.t.cpp
+++ b/tests/daemon/face/websocket-channel.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -30,6 +30,7 @@
#include "test-ip.hpp"
namespace nfd {
+namespace face {
namespace tests {
namespace ip = boost::asio::ip;
@@ -37,7 +38,7 @@
class WebSocketChannelFixture : public ChannelFixture<WebSocketChannel, websocket::Endpoint>
{
protected:
- virtual unique_ptr<WebSocketChannel>
+ unique_ptr<WebSocketChannel>
makeChannel(const ip::address& addr, uint16_t port = 0) final
{
if (port == 0)
@@ -319,4 +320,5 @@
BOOST_AUTO_TEST_SUITE_END() // Face
} // namespace tests
+} // namespace face
} // namespace nfd
diff --git a/tests/daemon/mgmt/face-manager.t.cpp b/tests/daemon/mgmt/face-manager.t.cpp
index c584538..c953d3b 100644
--- a/tests/daemon/mgmt/face-manager.t.cpp
+++ b/tests/daemon/mgmt/face-manager.t.cpp
@@ -239,7 +239,7 @@
CheckResponseResult::OK);
}
-class TestChannel : public Channel
+class TestChannel : public face::Channel
{
public:
explicit
@@ -263,12 +263,12 @@
const ndn::optional<FaceUri>& localUri,
ndn::nfd::FacePersistency persistency,
bool wantLocalFieldsEnabled,
- const FaceCreatedCallback& onCreated,
- const FaceCreationFailedCallback& onConnectFailed) final
+ const face::FaceCreatedCallback& onCreated,
+ const face::FaceCreationFailedCallback& onConnectFailed) final
{
}
- std::vector<shared_ptr<const Channel>>
+ std::vector<shared_ptr<const face::Channel>>
getChannels() const final
{
return m_channels;
@@ -284,7 +284,7 @@
}
private:
- std::vector<shared_ptr<const Channel>> m_channels;
+ std::vector<shared_ptr<const face::Channel>> m_channels;
};
BOOST_AUTO_TEST_CASE(ChannelDataset)
diff --git a/tests/other/face-benchmark.cpp b/tests/other/face-benchmark.cpp
index 7017a7d..36bc4f4 100644
--- a/tests/other/face-benchmark.cpp
+++ b/tests/other/face-benchmark.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -166,8 +166,8 @@
private:
boost::asio::signal_set m_terminationSignalSet;
- TcpChannel m_tcpChannel;
- UdpChannel m_udpChannel;
+ face::TcpChannel m_tcpChannel;
+ face::UdpChannel m_udpChannel;
std::vector<std::pair<FaceUri, FaceUri>> m_faceUris;
};