util: Use default resolver behavior in util::dns::Resolver
As of this commit, we are using the default behavior of
boost::asio::ip::resolver (only return IPv4 addresses if a non-loopback
IPv4 address is configured for the system; only return IPv6 addresses if
a non-loopback IPv6 address is configured for the system).
Unit tests are now conditioned upon availability of IPv4/IPv6 and will
not fail if IPv4 or IPv6 addresses cannot be resolved.
Change-Id: I8d7fa9a205ad26a2ca85fd22d582ffe6b0a02a92
Refs: #2415
diff --git a/tests/unit-tests/util/face-uri.cpp b/tests/unit-tests/util/face-uri.cpp
index 3ed42f5..52585b4 100644
--- a/tests/unit-tests/util/face-uri.cpp
+++ b/tests/unit-tests/util/face-uri.cpp
@@ -28,9 +28,13 @@
#include "util/face-uri.hpp"
#include "boost-test.hpp"
+#include "../network-configuration-detector.hpp"
namespace ndn {
namespace util {
+namespace tests {
+
+using ndn::tests::NetworkConfigurationDetector;
BOOST_AUTO_TEST_SUITE(UtilTestFaceUri)
@@ -172,7 +176,7 @@
BOOST_CHECK_EQUAL(FaceUri(endpoint6).toString(), "udp6://[2001:db8::1]:7777");
}
-BOOST_FIXTURE_TEST_CASE(CanonizeUdp, CanonizeFixture)
+BOOST_FIXTURE_TEST_CASE(CheckCanonicalUdp, CanonizeFixture)
{
BOOST_CHECK_EQUAL(FaceUri::canCanonize("udp"), true);
BOOST_CHECK_EQUAL(FaceUri::canCanonize("udp4"), true);
@@ -188,6 +192,14 @@
BOOST_CHECK_EQUAL(FaceUri("udp4://example.net:6363").isCanonical(), false);
BOOST_CHECK_EQUAL(FaceUri("udp6://example.net:6363").isCanonical(), false);
BOOST_CHECK_EQUAL(FaceUri("udp4://224.0.23.170:56363").isCanonical(), true);
+}
+
+BOOST_FIXTURE_TEST_CASE(CanonizeUdpV4, CanonizeFixture)
+{
+ if (!NetworkConfigurationDetector::hasIpv4()) {
+ BOOST_TEST_MESSAGE("Platform does not support IPv4, skipping the test case");
+ return;
+ }
// IPv4 unicast
addTest("udp4://192.0.2.1:6363", true, "udp4://192.0.2.1:6363");
@@ -204,6 +216,16 @@
addTest("udp4://224.0.23.170", true, "udp4://224.0.23.170:56363");
addTest("udp4://all-routers.mcast.net:56363", true, "udp4://224.0.0.2:56363");
+ runTests();
+}
+
+BOOST_FIXTURE_TEST_CASE(CanonizeUdpV6, CanonizeFixture)
+{
+ if (!NetworkConfigurationDetector::hasIpv6()) {
+ BOOST_TEST_MESSAGE("Platform does not support IPv6, skipping the test case");
+ return;
+ }
+
// IPv6 unicast
addTest("udp6://[2001:db8::1]:6363", true, "udp6://[2001:db8::1]:6363");
addTest("udp://[2001:db8::1]:6363", true, "udp6://[2001:db8::1]:6363");
@@ -245,7 +267,7 @@
BOOST_CHECK_EQUAL(FaceUri(endpoint6).toString(), "tcp6://[2001:db8::1]:7777");
}
-BOOST_FIXTURE_TEST_CASE(CanonizeTcp, CanonizeFixture)
+BOOST_FIXTURE_TEST_CASE(CheckCanonicalTcp, CanonizeFixture)
{
BOOST_CHECK_EQUAL(FaceUri::canCanonize("tcp"), true);
BOOST_CHECK_EQUAL(FaceUri::canCanonize("tcp4"), true);
@@ -261,6 +283,14 @@
BOOST_CHECK_EQUAL(FaceUri("tcp4://example.net:6363").isCanonical(), false);
BOOST_CHECK_EQUAL(FaceUri("tcp6://example.net:6363").isCanonical(), false);
BOOST_CHECK_EQUAL(FaceUri("tcp4://224.0.23.170:56363").isCanonical(), false);
+}
+
+BOOST_FIXTURE_TEST_CASE(CanonizeTcpV4, CanonizeFixture)
+{
+ if (!NetworkConfigurationDetector::hasIpv4()) {
+ BOOST_TEST_MESSAGE("Platform does not support IPv4, skipping the test case");
+ return;
+ }
// IPv4 unicast
addTest("tcp4://192.0.2.1:6363", true, "tcp4://192.0.2.1:6363");
@@ -277,6 +307,16 @@
addTest("tcp4://224.0.23.170", false, "");
addTest("tcp4://all-routers.mcast.net:56363", false, "");
+ runTests();
+}
+
+BOOST_FIXTURE_TEST_CASE(CanonizeTcpV6, CanonizeFixture)
+{
+ if (!NetworkConfigurationDetector::hasIpv6()) {
+ BOOST_TEST_MESSAGE("Platform does not support IPv6, skipping the test case");
+ return;
+ }
+
// IPv6 unicast
addTest("tcp6://[2001:db8::1]:6363", true, "tcp6://[2001:db8::1]:6363");
addTest("tcp://[2001:db8::1]:6363", true, "tcp6://[2001:db8::1]:6363");
@@ -441,5 +481,6 @@
BOOST_AUTO_TEST_SUITE_END()
+} // namespace tests
} // namespace util
} // namespace ndn