Change #include style
Header files are now always included with their path from the
project's root directory rather than the path relative to
the includer.
Change-Id: If39b8510eef8da00baf5fe88337c45dbdf8c766e
Refs: #3084
diff --git a/tests/unit/net/collect-netifs.cpp b/tests/unit/net/collect-netifs.cpp
index ca8e6ef..eeaec20 100644
--- a/tests/unit/net/collect-netifs.cpp
+++ b/tests/unit/net/collect-netifs.cpp
@@ -25,8 +25,8 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#include "collect-netifs.hpp"
-#include "net/network-monitor.hpp"
+#include "tests/unit/net/collect-netifs.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
#include <boost/asio/io_service.hpp>
diff --git a/tests/unit/net/collect-netifs.hpp b/tests/unit/net/collect-netifs.hpp
index 322e323..b941abf 100644
--- a/tests/unit/net/collect-netifs.hpp
+++ b/tests/unit/net/collect-netifs.hpp
@@ -25,11 +25,10 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#ifndef NFD_TESTS_UNIT_TESTS_NET_COLLECT_NETIFS_HPP
-#define NFD_TESTS_UNIT_TESTS_NET_COLLECT_NETIFS_HPP
+#ifndef NDN_TESTS_UNIT_NET_COLLECT_NETIFS_HPP
+#define NDN_TESTS_UNIT_NET_COLLECT_NETIFS_HPP
-#include "common.hpp"
-#include "net/network-interface.hpp"
+#include "ndn-cxx/net/network-interface.hpp"
#include <vector>
@@ -49,4 +48,4 @@
} // namespace net
} // namespace ndn
-#endif // NFD_TESTS_UNIT_TESTS_NET_COLLECT_NETIFS_HPP
+#endif // NDN_TESTS_UNIT_NET_COLLECT_NETIFS_HPP
diff --git a/tests/unit/net/dns.t.cpp b/tests/unit/net/dns.t.cpp
index e4afa8e..db834c0 100644
--- a/tests/unit/net/dns.t.cpp
+++ b/tests/unit/net/dns.t.cpp
@@ -19,10 +19,10 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#include "net/dns.hpp"
+#include "ndn-cxx/net/dns.hpp"
-#include "boost-test.hpp"
-#include "network-configuration-detector.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/net/network-configuration-detector.hpp"
#include <boost/asio/io_service.hpp>
diff --git a/tests/unit/net/ethernet.t.cpp b/tests/unit/net/ethernet.t.cpp
index 4f76dbb..162170b 100644
--- a/tests/unit/net/ethernet.t.cpp
+++ b/tests/unit/net/ethernet.t.cpp
@@ -25,9 +25,9 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#include "net/ethernet.hpp"
+#include "ndn-cxx/net/ethernet.hpp"
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
namespace ndn {
namespace tests {
diff --git a/tests/unit/net/face-uri.t.cpp b/tests/unit/net/face-uri.t.cpp
index 71d76b1..2b99470 100644
--- a/tests/unit/net/face-uri.t.cpp
+++ b/tests/unit/net/face-uri.t.cpp
@@ -25,11 +25,11 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#include "net/face-uri.hpp"
+#include "ndn-cxx/net/face-uri.hpp"
-#include "boost-test.hpp"
-#include "collect-netifs.hpp"
-#include "network-configuration-detector.hpp"
+#include "tests/boost-test.hpp"
+#include "tests/unit/net/collect-netifs.hpp"
+#include "tests/unit/net/network-configuration-detector.hpp"
namespace ndn {
namespace tests {
diff --git a/tests/unit/net/network-configuration-detector.cpp b/tests/unit/net/network-configuration-detector.cpp
index 3e4f128..84e1244 100644
--- a/tests/unit/net/network-configuration-detector.cpp
+++ b/tests/unit/net/network-configuration-detector.cpp
@@ -19,12 +19,12 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#include "network-configuration-detector.hpp"
+#include "tests/unit/net/network-configuration-detector.hpp"
-#include <boost/asio/ip/address.hpp>
-#include <boost/asio/ip/udp.hpp>
-#include <boost/asio/ip/basic_resolver.hpp>
#include <boost/asio/io_service.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/basic_resolver.hpp>
+#include <boost/asio/ip/udp.hpp>
#include <boost/range/iterator_range_core.hpp>
namespace ndn {
diff --git a/tests/unit/net/network-configuration-detector.hpp b/tests/unit/net/network-configuration-detector.hpp
index 58715c8..015b2b8 100644
--- a/tests/unit/net/network-configuration-detector.hpp
+++ b/tests/unit/net/network-configuration-detector.hpp
@@ -19,8 +19,8 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#ifndef NDN_TESTS_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
-#define NDN_TESTS_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#ifndef NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#define NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
#define SKIP_IF_IPV4_UNAVAILABLE() \
do { \
@@ -72,4 +72,4 @@
} // namespace tests
} // namespace ndn
-#endif // NDN_TESTS_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
+#endif // NDN_TESTS_UNIT_NET_NETWORK_CONFIGURATION_DETECTOR_HPP
diff --git a/tests/unit/net/network-monitor-stub.t.cpp b/tests/unit/net/network-monitor-stub.t.cpp
index 8fbf3eb..453a510 100644
--- a/tests/unit/net/network-monitor-stub.t.cpp
+++ b/tests/unit/net/network-monitor-stub.t.cpp
@@ -19,9 +19,9 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#include "net/network-monitor-stub.hpp"
+#include "ndn-cxx/net/network-monitor-stub.hpp"
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
namespace ndn {
namespace net {
diff --git a/tests/unit/net/network-monitor.t.cpp b/tests/unit/net/network-monitor.t.cpp
index b522ee6..132d0db 100644
--- a/tests/unit/net/network-monitor.t.cpp
+++ b/tests/unit/net/network-monitor.t.cpp
@@ -19,9 +19,10 @@
* See AUTHORS.md for complete list of ndn-cxx authors and contributors.
*/
-#include "net/network-monitor.hpp"
+#include "ndn-cxx/net/network-monitor.hpp"
-#include "boost-test.hpp"
+#include "tests/boost-test.hpp"
+
#include <boost/asio/io_service.hpp>
namespace ndn {