Refactor and modernize namespace declarations
Move all unit tests to namespace nfd::tests
Delete unused header core/algorithm.hpp
Change-Id: I5591f0c5f3bb5db67f8b45fae95471f8a555ca68
diff --git a/tests/daemon/rib/create-route.hpp b/tests/daemon/rib/create-route.hpp
index b248575..4e3fd57 100644
--- a/tests/daemon/rib/create-route.hpp
+++ b/tests/daemon/rib/create-route.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,17 +28,15 @@
#include "rib/route.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-inline Route
+inline rib::Route
createRoute(uint64_t faceId,
std::underlying_type_t<ndn::nfd::RouteOrigin> origin,
uint64_t cost = 0,
std::underlying_type_t<ndn::nfd::RouteFlags> flags = ndn::nfd::ROUTE_FLAGS_NONE)
{
- Route r;
+ rib::Route r;
r.faceId = faceId;
r.origin = static_cast<ndn::nfd::RouteOrigin>(origin);
r.cost = cost;
@@ -46,8 +44,6 @@
return r;
}
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
#endif // NFD_TESTS_DAEMON_RIB_CREATE_ROUTE_HPP
diff --git a/tests/daemon/rib/fib-updates-common.hpp b/tests/daemon/rib/fib-updates-common.hpp
index 1930d14..9ceaeab 100644
--- a/tests/daemon/rib/fib-updates-common.hpp
+++ b/tests/daemon/rib/fib-updates-common.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -35,11 +35,10 @@
#include <ndn-cxx/util/dummy-client-face.hpp>
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using rib::FibUpdate;
+using rib::FibUpdater;
class MockFibUpdater : public FibUpdater
{
@@ -113,10 +112,10 @@
uint64_t cost,
std::underlying_type_t<ndn::nfd::RouteFlags> flags)
{
- Route route = createRoute(faceId, origin, cost, flags);
+ auto route = createRoute(faceId, origin, cost, flags);
- RibUpdate update;
- update.setAction(RibUpdate::REGISTER)
+ rib::RibUpdate update;
+ update.setAction(rib::RibUpdate::REGISTER)
.setName(name)
.setRoute(route);
@@ -128,10 +127,10 @@
eraseRoute(const Name& name, uint64_t faceId,
std::underlying_type_t<ndn::nfd::RouteOrigin> origin)
{
- Route route = createRoute(faceId, origin, 0, 0);
+ auto route = createRoute(faceId, origin, 0, 0);
- RibUpdate update;
- update.setAction(RibUpdate::UNREGISTER)
+ rib::RibUpdate update;
+ update.setAction(rib::RibUpdate::UNREGISTER)
.setName(name)
.setRoute(route);
@@ -169,12 +168,10 @@
ndn::util::DummyClientFace face;
ndn::nfd::Controller controller;
- Rib rib;
+ rib::Rib rib;
MockFibUpdater fibUpdater;
};
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
#endif // NFD_TESTS_DAEMON_RIB_FIB_UPDATES_COMMON_HPP
diff --git a/tests/daemon/rib/fib-updates-erase-face.t.cpp b/tests/daemon/rib/fib-updates-erase-face.t.cpp
index d55f207..a911d5e 100644
--- a/tests/daemon/rib/fib-updates-erase-face.t.cpp
+++ b/tests/daemon/rib/fib-updates-erase-face.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-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,9 +28,7 @@
#include "tests/test-common.hpp"
#include "fib-updates-common.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
BOOST_FIXTURE_TEST_SUITE(TestFibUpdates, FibUpdatesFixture)
@@ -426,6 +424,4 @@
BOOST_AUTO_TEST_SUITE_END() // FibUpdates
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/fib-updates-new-face.t.cpp b/tests/daemon/rib/fib-updates-new-face.t.cpp
index 49cd56f..79924df 100644
--- a/tests/daemon/rib/fib-updates-new-face.t.cpp
+++ b/tests/daemon/rib/fib-updates-new-face.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,9 +28,7 @@
#include "tests/test-common.hpp"
#include "fib-updates-common.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
BOOST_FIXTURE_TEST_SUITE(TestFibUpdates, FibUpdatesFixture)
@@ -267,6 +265,4 @@
BOOST_AUTO_TEST_SUITE_END() // FibUpdates
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/fib-updates-new-namespace.t.cpp b/tests/daemon/rib/fib-updates-new-namespace.t.cpp
index 90abd31..4ceb60b 100644
--- a/tests/daemon/rib/fib-updates-new-namespace.t.cpp
+++ b/tests/daemon/rib/fib-updates-new-namespace.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,9 +28,7 @@
#include "tests/test-common.hpp"
#include "fib-updates-common.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
BOOST_FIXTURE_TEST_SUITE(TestFibUpdates, FibUpdatesFixture)
@@ -195,6 +193,4 @@
BOOST_AUTO_TEST_SUITE_END() // FibUpdates
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/fib-updates-update-face.t.cpp b/tests/daemon/rib/fib-updates-update-face.t.cpp
index 54cd2d4..bb76d01 100644
--- a/tests/daemon/rib/fib-updates-update-face.t.cpp
+++ b/tests/daemon/rib/fib-updates-update-face.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2015, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,9 +28,7 @@
#include "tests/test-common.hpp"
#include "fib-updates-common.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
BOOST_FIXTURE_TEST_SUITE(TestFibUpdates, FibUpdatesFixture)
@@ -261,6 +259,4 @@
BOOST_AUTO_TEST_SUITE_END() // FibUpdates
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/readvertise/client-to-nlsr-readvertise-policy.t.cpp b/tests/daemon/rib/readvertise/client-to-nlsr-readvertise-policy.t.cpp
index b804725..eab14e8 100644
--- a/tests/daemon/rib/readvertise/client-to-nlsr-readvertise-policy.t.cpp
+++ b/tests/daemon/rib/readvertise/client-to-nlsr-readvertise-policy.t.cpp
@@ -28,11 +28,9 @@
#include "tests/test-common.hpp"
#include "tests/daemon/global-io-fixture.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using namespace nfd::rib;
BOOST_AUTO_TEST_SUITE(Readvertise)
BOOST_FIXTURE_TEST_SUITE(TestClientToNlsrReadvertisePolicy, GlobalIoFixture)
@@ -72,6 +70,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestClientToNlsrReadvertisePolicy
BOOST_AUTO_TEST_SUITE_END() // Readvertise
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/readvertise/host-to-gateway-readvertise-policy.t.cpp b/tests/daemon/rib/readvertise/host-to-gateway-readvertise-policy.t.cpp
index c3682dd..df73058 100644
--- a/tests/daemon/rib/readvertise/host-to-gateway-readvertise-policy.t.cpp
+++ b/tests/daemon/rib/readvertise/host-to-gateway-readvertise-policy.t.cpp
@@ -29,11 +29,9 @@
#include "tests/key-chain-fixture.hpp"
#include "tests/daemon/global-io-fixture.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using namespace nfd::rib;
class HostToGatewayReadvertisePolicyFixture : public GlobalIoFixture, public KeyChainFixture
{
@@ -109,6 +107,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestHostToGatewayReadvertisePolicy
BOOST_AUTO_TEST_SUITE_END() // Readvertise
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/readvertise/nfd-rib-readvertise-destination.t.cpp b/tests/daemon/rib/readvertise/nfd-rib-readvertise-destination.t.cpp
index 5a64bbe..36ca585 100644
--- a/tests/daemon/rib/readvertise/nfd-rib-readvertise-destination.t.cpp
+++ b/tests/daemon/rib/readvertise/nfd-rib-readvertise-destination.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -32,11 +32,9 @@
#include <ndn-cxx/security/signing-info.hpp>
#include <ndn-cxx/util/dummy-client-face.hpp>
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using namespace nfd::rib;
class NfdRibReadvertiseDestinationFixture : public GlobalIoTimeFixture, public KeyChainFixture
{
@@ -251,6 +249,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestNfdRibReadvertiseDestination
BOOST_AUTO_TEST_SUITE_END() // Readvertise
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/readvertise/readvertise.t.cpp b/tests/daemon/rib/readvertise/readvertise.t.cpp
index ffcab71..6242dfc 100644
--- a/tests/daemon/rib/readvertise/readvertise.t.cpp
+++ b/tests/daemon/rib/readvertise/readvertise.t.cpp
@@ -34,11 +34,9 @@
#include <boost/range/adaptor/transformed.hpp>
#include <boost/range/algorithm/copy.hpp>
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using namespace nfd::rib;
class DummyReadvertisePolicy : public ReadvertisePolicy
{
@@ -300,6 +298,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestReadvertise
BOOST_AUTO_TEST_SUITE_END() // Readvertise
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/rib-entry.t.cpp b/tests/daemon/rib/rib-entry.t.cpp
index b946b78..903313e 100644
--- a/tests/daemon/rib/rib-entry.t.cpp
+++ b/tests/daemon/rib/rib-entry.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,21 +28,20 @@
#include "tests/test-common.hpp"
#include "tests/daemon/global-io-fixture.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using rib::RibEntry;
+using rib::Route;
BOOST_FIXTURE_TEST_SUITE(TestRibEntry, GlobalIoFixture)
BOOST_AUTO_TEST_CASE(Basic)
{
- rib::RibEntry entry;
- rib::RibEntry::iterator entryIt;
+ RibEntry entry;
+ RibEntry::iterator entryIt;
bool didInsert = false;
- rib::Route route1;
+ Route route1;
route1.faceId = 1;
route1.origin = ndn::nfd::ROUTE_ORIGIN_APP;
@@ -172,6 +171,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestRibEntry
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/rib-update.t.cpp b/tests/daemon/rib/rib-update.t.cpp
index 90c80f0..533439a 100644
--- a/tests/daemon/rib/rib-update.t.cpp
+++ b/tests/daemon/rib/rib-update.t.cpp
@@ -29,9 +29,9 @@
#include "tests/test-common.hpp"
#include "tests/daemon/rib/create-route.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
+
+using namespace nfd::rib;
BOOST_AUTO_TEST_SUITE(TestRibUpdate)
@@ -76,6 +76,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestRibUpdate
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/rib.t.cpp b/tests/daemon/rib/rib.t.cpp
index cc96e79..b635207 100644
--- a/tests/daemon/rib/rib.t.cpp
+++ b/tests/daemon/rib/rib.t.cpp
@@ -29,11 +29,9 @@
#include "tests/daemon/global-io-fixture.hpp"
#include "tests/daemon/rib/create-route.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using rib::Route;
BOOST_FIXTURE_TEST_SUITE(TestRib, GlobalIoFixture)
@@ -239,39 +237,37 @@
Route route1 = createRoute(1, 20, 10);
Route route2 = createRoute(2, 30, 20);
- RibRouteRef routeInfo;
-
int nAfterInsertEntryInvocations = 0;
int nAfterAddRouteInvocations = 0;
int nBeforeRemoveRouteInvocations = 0;
int nAfterEraseEntryInvocations = 0;
- rib.afterInsertEntry.connect([&] (const Name& inName) {
- BOOST_CHECK_EQUAL(nAfterInsertEntryInvocations, 0);
- BOOST_CHECK_EQUAL(nAfterAddRouteInvocations, 0);
- BOOST_CHECK(rib.find(name) != rib.end());
- nAfterInsertEntryInvocations++;
- });
+ rib.afterInsertEntry.connect([&] (const auto&) {
+ BOOST_CHECK_EQUAL(nAfterInsertEntryInvocations, 0);
+ BOOST_CHECK_EQUAL(nAfterAddRouteInvocations, 0);
+ BOOST_CHECK(rib.find(name) != rib.end());
+ nAfterInsertEntryInvocations++;
+ });
- rib.afterAddRoute.connect([&] (const RibRouteRef& rrr) {
- BOOST_CHECK_EQUAL(nAfterInsertEntryInvocations, 1);
- BOOST_CHECK(rib.find(name) != rib.end());
- BOOST_CHECK(rib.find(name, route) != nullptr);
- nAfterAddRouteInvocations++;
- });
+ rib.afterAddRoute.connect([&] (const auto&) {
+ BOOST_CHECK_EQUAL(nAfterInsertEntryInvocations, 1);
+ BOOST_CHECK(rib.find(name) != rib.end());
+ BOOST_CHECK(rib.find(name, route) != nullptr);
+ nAfterAddRouteInvocations++;
+ });
- rib.beforeRemoveRoute.connect([&] (const RibRouteRef& rrr) {
- BOOST_CHECK_EQUAL(nAfterEraseEntryInvocations, 0);
- BOOST_CHECK(rib.find(name) != rib.end());
- BOOST_CHECK(rib.find(name, route) != nullptr);
- nBeforeRemoveRouteInvocations++;
- });
+ rib.beforeRemoveRoute.connect([&] (const auto&) {
+ BOOST_CHECK_EQUAL(nAfterEraseEntryInvocations, 0);
+ BOOST_CHECK(rib.find(name) != rib.end());
+ BOOST_CHECK(rib.find(name, route) != nullptr);
+ nBeforeRemoveRouteInvocations++;
+ });
- rib.afterEraseEntry.connect([&] (const Name& inName) {
- BOOST_CHECK_EQUAL(nBeforeRemoveRouteInvocations, 2);
- BOOST_CHECK_EQUAL(nAfterEraseEntryInvocations, 0);
- BOOST_CHECK(rib.find(name) == rib.end());
- nAfterEraseEntryInvocations++;
- });
+ rib.afterEraseEntry.connect([&] (const auto&) {
+ BOOST_CHECK_EQUAL(nBeforeRemoveRouteInvocations, 2);
+ BOOST_CHECK_EQUAL(nAfterEraseEntryInvocations, 0);
+ BOOST_CHECK(rib.find(name) == rib.end());
+ nAfterEraseEntryInvocations++;
+ });
route = route1;
rib.insert(name, route);
@@ -333,6 +329,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestRib
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/route.t.cpp b/tests/daemon/rib/route.t.cpp
index 011ce7e..910e641 100644
--- a/tests/daemon/rib/route.t.cpp
+++ b/tests/daemon/rib/route.t.cpp
@@ -28,11 +28,9 @@
#include "tests/test-common.hpp"
#include "tests/daemon/global-io-fixture.hpp"
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using rib::Route;
BOOST_FIXTURE_TEST_SUITE(TestRoute, GlobalIoTimeFixture)
@@ -161,6 +159,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestRoute
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests
diff --git a/tests/daemon/rib/service.t.cpp b/tests/daemon/rib/service.t.cpp
index caa59d3..5b808cc 100644
--- a/tests/daemon/rib/service.t.cpp
+++ b/tests/daemon/rib/service.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -32,11 +32,9 @@
#include <boost/property_tree/info_parser.hpp>
#include <sstream>
-namespace nfd {
-namespace rib {
-namespace tests {
+namespace nfd::tests {
-using namespace nfd::tests;
+using rib::Service;
class RibServiceFixture : public RibIoFixture
{
@@ -147,6 +145,4 @@
BOOST_AUTO_TEST_SUITE_END() // TestService
-} // namespace tests
-} // namespace rib
-} // namespace nfd
+} // namespace nfd::tests