tests: sync common test infrastructure with ndn-cxx
Change-Id: I6f2ee4b5b644d6fddcebbe1158b1dd9ad2159417
diff --git a/tests/route/test-fib-entry.cpp b/tests/route/test-fib-entry.cpp
index e38986a..b323ca5 100644
--- a/tests/route/test-fib-entry.cpp
+++ b/tests/route/test-fib-entry.cpp
@@ -18,17 +18,16 @@
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*
* \author Ashlesh Gawande <agawande@memphis.edu>
- *
**/
#include "route/fib-entry.hpp"
#include "route/nexthop-list.hpp"
+#include "tests/boost-test.hpp"
+
#include <ndn-cxx/util/time.hpp>
-#include <boost/test/unit_test.hpp>
namespace nlsr {
-
namespace test {
BOOST_AUTO_TEST_SUITE(TestFibEntry)
diff --git a/tests/route/test-map-entry.cpp b/tests/route/test-map-entry.cpp
index 234e5a6..0429dde 100644
--- a/tests/route/test-map-entry.cpp
+++ b/tests/route/test-map-entry.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2019 , The University of Memphis,
+ * Copyright (c) 2014-2019, The University of Memphis,
* Regents of the University of California
*
* This file is part of NLSR (Named-data Link State Routing).
@@ -18,13 +18,12 @@
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*
* \author Ashlesh Gawande <agawande@memphis.edu>
- *
**/
+
#include "route/map.hpp"
-#include <boost/test/unit_test.hpp>
+#include "tests/boost-test.hpp"
namespace nlsr {
-
namespace test {
BOOST_AUTO_TEST_SUITE(TestMapEntry)
diff --git a/tests/route/test-map.cpp b/tests/route/test-map.cpp
index a324b6e..0564377 100644
--- a/tests/route/test-map.cpp
+++ b/tests/route/test-map.cpp
@@ -18,13 +18,12 @@
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*
* \author Ashlesh Gawande <agawande@memphis.edu>
- *
**/
+
#include "route/map.hpp"
-#include <boost/test/unit_test.hpp>
+#include "tests/boost-test.hpp"
namespace nlsr {
-
namespace test {
BOOST_AUTO_TEST_SUITE(TestMap)
diff --git a/tests/route/test-name-prefix-table-entry.cpp b/tests/route/test-name-prefix-table-entry.cpp
index 478d4bd..949c380 100644
--- a/tests/route/test-name-prefix-table-entry.cpp
+++ b/tests/route/test-name-prefix-table-entry.cpp
@@ -18,13 +18,12 @@
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*
* \author Ashlesh Gawande <agawande@memphis.edu>
- *
**/
+
#include "route/name-prefix-table-entry.hpp"
-#include <boost/test/unit_test.hpp>
+#include "tests/boost-test.hpp"
namespace nlsr {
-
namespace test {
BOOST_AUTO_TEST_SUITE(TestNpte)
diff --git a/tests/route/test-nexthop-list.cpp b/tests/route/test-nexthop-list.cpp
index ed5bf0d..5bdef4d 100644
--- a/tests/route/test-nexthop-list.cpp
+++ b/tests/route/test-nexthop-list.cpp
@@ -21,10 +21,9 @@
#include "route/nexthop-list.hpp"
#include "route/nexthop.hpp"
-#include <boost/test/unit_test.hpp>
+#include "tests/boost-test.hpp"
namespace nlsr {
-
namespace test {
BOOST_AUTO_TEST_SUITE(TestNhl)
diff --git a/tests/route/test-nexthop.cpp b/tests/route/test-nexthop.cpp
index 12be825..3a6a5fd 100644
--- a/tests/route/test-nexthop.cpp
+++ b/tests/route/test-nexthop.cpp
@@ -18,13 +18,12 @@
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*
* \author Ashlesh Gawande <agawande@memphis.edu>
- *
**/
+
#include "route/nexthop.hpp"
-#include <boost/test/unit_test.hpp>
+#include "tests/boost-test.hpp"
namespace nlsr {
-
namespace test {
BOOST_AUTO_TEST_SUITE(TestNexthop)
diff --git a/tests/route/test-routing-table-entry.cpp b/tests/route/test-routing-table-entry.cpp
index b2ac244..574abc2 100644
--- a/tests/route/test-routing-table-entry.cpp
+++ b/tests/route/test-routing-table-entry.cpp
@@ -18,13 +18,12 @@
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*
* \author Ashlesh Gawande <agawande@memphis.edu>
- *
**/
+
#include "route/routing-table-entry.hpp"
-#include <boost/test/unit_test.hpp>
+#include "tests/boost-test.hpp"
namespace nlsr {
-
namespace test {
BOOST_AUTO_TEST_SUITE(TestRoutingTableEntry)
diff --git a/tests/route/test-routing-table-pool-entry.cpp b/tests/route/test-routing-table-pool-entry.cpp
index 444fbbd..cf425d2 100644
--- a/tests/route/test-routing-table-pool-entry.cpp
+++ b/tests/route/test-routing-table-pool-entry.cpp
@@ -18,16 +18,15 @@
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*
* \author Nicholas Gordon <nmgordon@memphis.edu>
- *
**/
+
#include "route/routing-table-pool-entry.hpp"
#include "route/nexthop.hpp"
#include "route/nexthop-list.hpp"
-#include <boost/test/unit_test.hpp>
+#include "tests/boost-test.hpp"
namespace nlsr {
-
namespace test {
BOOST_AUTO_TEST_SUITE(TestRoutingTablePoolEntry)
diff --git a/tests/route/test-routing-table.cpp b/tests/route/test-routing-table.cpp
index cd600f1..0f630aa 100644
--- a/tests/route/test-routing-table.cpp
+++ b/tests/route/test-routing-table.cpp
@@ -18,15 +18,14 @@
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*
* \author Ashlesh Gawande <agawande@memphis.edu>
- *
**/
#include "route/routing-table.hpp"
#include "nlsr.hpp"
-#include "../test-common.hpp"
#include "route/routing-table-entry.hpp"
#include "route/nexthop.hpp"
-#include <boost/test/unit_test.hpp>
+
+#include "tests/test-common.hpp"
namespace nlsr {
namespace test {