Updated test for port as an unsigned short.

glynos · glynos · commit 2c2cf86651ca · 2011-08-16T18:52:12.000+02:00
diff --git a/boost/network/uri/uri.hpp b/boost/network/uri/uri.hpp
@@ -263,18 +263,21 @@ struct port_wrapper {
 
     }
 
-    operator boost::optional<unsigned short> () const {
+    boost::optional<unsigned short> to_optional() const {
         typename basic_uri<Tag>::string_type port = uri.port();
         return (port.empty())?
             boost::optional<unsigned short>() :
             boost::optional<unsigned short>(boost::lexical_cast<unsigned short>(port));
     }
 
+    operator boost::optional<unsigned short> () const {
+        return to_optional();
+    }
+
     operator unsigned short () const {
-        const boost::optional<unsigned short> &port =
-            static_cast<boost::optional<unsigned short> >(*this);
         typedef typename string<Tag>::type string_type;
         typedef constants<Tag> consts;
+        const boost::optional<unsigned short> &port = to_optional();
         if (port) return *port;
         return boost::iequals(uri.scheme_range(), string_type(consts::https())) ? 443 : 80;
     }
diff --git a/libs/network/test/url_test.cpp b/libs/network/test/url_test.cpp
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(full_uri_test, T, tag_types) {
     BOOST_CHECK(boost::equal(uri::scheme(instance), scheme));
     BOOST_CHECK(boost::equal(uri::user_info(instance), user_info));
     BOOST_CHECK(boost::equal(uri::host(instance), host));
-    // BOOST_CHECK_EQUAL(uri::port(instance), port);
+    BOOST_CHECK_EQUAL(static_cast<unsigned short>(uri::port_us(instance)), 8000);
     BOOST_CHECK(boost::equal(uri::port(instance), port));
     BOOST_CHECK(boost::equal(uri::path(instance), path));
     BOOST_CHECK(boost::equal(uri::query(instance), query));
@@ -214,7 +214,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(assignment_test, T, tag_types) {
     uri_type instance(string_type(boost::begin(url), boost::end(url)));
     uri_type copy;
     copy = instance;
-    // BOOST_CHECK(instance.raw() == copy.raw());
     BOOST_CHECK(instance.to_string() == copy.to_string());
     BOOST_CHECK(instance == copy);
 }
