[uri] Added tests for boost::asio::ip::address overloads in builder::set_host.

Author: glynos

boost/network/uri/builder.hpp

@@ -9,6 +9,7 @@
 
 
 # include <boost/network/uri/uri.hpp>
+# include <boost/asio/ip/address.hpp>
 
 
 namespace boost {
@@ -62,6 +63,38 @@ class builder {
         return set_host(host);
     }
 
+    builder &set_host(const asio::ip::address &address) {
+        uri_.uri_.append(address.to_string());
+        uri_.parse();
+        return *this;
+    }
+
+    builder &host(const asio::ip::address &host) {
+        return set_host(host);
+    }
+
+    builder &set_host(const asio::ip::address_v4 &address) {
+        uri_.uri_.append(address.to_string());
+        uri_.parse();
+        return *this;
+    }
+
+    builder &host(const asio::ip::address_v4 &host) {
+        return set_host(host);
+    }
+
+    builder &set_host(const asio::ip::address_v6 &address) {
+        uri_.uri_.append("[");
+        uri_.uri_.append(address.to_string());
+        uri_.uri_.append("]");
+        uri_.parse();
+        return *this;
+    }
+
+    builder &host(const asio::ip::address_v6 &host) {
+        return set_host(host);
+    }
+
     builder &set_port(const string_type &port) {
         uri_.uri_.append(":");
         uri_.uri_.append(port);

libs/network/test/uri/uri_builder_test.cpp

@@ -146,3 +146,29 @@ BOOST_AUTO_TEST_CASE(mailto_builder_test)
     BOOST_REQUIRE(uri::valid(instance));
     BOOST_CHECK_EQUAL("mailto:[email protected]", instance.string());
 }
+
+BOOST_AUTO_TEST_CASE(ipv4_address) {
+    using namespace boost::asio::ip;
+    uri::uri instance;
+    uri::builder builder(instance);
+    builder
+        .scheme("http")
+        .host(address_v4::loopback())
+        .path("/")
+        ;
+    BOOST_REQUIRE(uri::valid(instance));
+    BOOST_CHECK_EQUAL("http://127.0.0.1/", instance.string());
+}
+
+//BOOST_AUTO_TEST_CASE(ipv6_address) {
+//    using namespace boost::asio::ip;
+//    uri::uri instance;
+//    uri::builder builder(instance);
+//    builder
+//        .scheme("http")
+//        .host(address_v6::loopback())
+//        .path("/")
+//        ;
+//    BOOST_REQUIRE(uri::valid(instance));
+//    BOOST_CHECK_EQUAL("http://[::1]/", instance.string());
+//}

libs/network/test/uri/uri_test.cpp

@@ -249,6 +249,14 @@ BOOST_AUTO_TEST_CASE(ipv4_address_test) {
     BOOST_CHECK_EQUAL(uri::path(instance), "/");
 }
 
+BOOST_AUTO_TEST_CASE(ipv4_loopback_test) {
+    uri::uri instance("http://127.0.0.1/");
+    BOOST_REQUIRE(uri::valid(instance));
+    BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
+    BOOST_CHECK_EQUAL(uri::host(instance), "127.0.0.1");
+    BOOST_CHECK_EQUAL(uri::path(instance), "/");
+}
+
 BOOST_AUTO_TEST_CASE(ipv6_address_test_1) {
     uri::uri instance("http://[1080:0:0:0:8:800:200C:417A]/");
     BOOST_REQUIRE(uri::valid(instance));
@@ -265,6 +273,14 @@ BOOST_AUTO_TEST_CASE(ipv6_address_test_2) {
     BOOST_CHECK_EQUAL(uri::path(instance), "/");
 }
 
+//BOOST_AUTO_TEST_CASE(ipv6_loopback_test) {
+//    uri::uri instance("http://[::1]/");
+//    BOOST_REQUIRE(uri::valid(instance));
+//    BOOST_CHECK_EQUAL(uri::scheme(instance), "http");
+//    BOOST_CHECK_EQUAL(uri::host(instance), "[::1]");
+//    BOOST_CHECK_EQUAL(uri::path(instance), "/");
+//}
+
 BOOST_AUTO_TEST_CASE(ftp_test) {
     uri::uri instance("ftp://[email protected]/");
     BOOST_REQUIRE(uri::valid(instance));