[URI] Added test for opaqueness.

Author: glynos

boost/network/uri/builder.hpp

@@ -27,7 +27,7 @@ class builder {
 
     builder &scheme(const string_type &scheme) {
         uri_.uri_.append(scheme);
-        if (non_hierarchical_schemes::exists(scheme)) {
+        if (opaque_schemes::exists(scheme)) {
             uri_.uri_.append(":");
         }
         else {

boost/network/uri/directives/scheme.hpp

@@ -27,7 +27,7 @@ struct scheme_directive {
         >
     void operator () (Uri &uri) const {
         uri.append(scheme);
-        if (non_hierarchical_schemes::exists(scheme)) {
+        if (opaque_schemes::exists(scheme)) {
             uri.append(":");
         }
         else {

boost/network/uri/schemes.hpp

@@ -22,7 +22,7 @@ class hierarchical_schemes {
 
 };
 
-class non_hierarchical_schemes {
+class opaque_schemes {
 
 public:
 

boost/network/uri/uri.hpp

@@ -284,11 +284,21 @@ bool is_absolute(const uri &uri_) {
     return uri_.is_valid() && !boost::empty(uri_.scheme_range());
 }
 
+inline
+bool is_relative(const uri &uri_) {
+    return uri_.is_valid() && boost::empty(uri_.scheme_range());
+}
+
 inline
 bool is_hierarchical(const uri &uri_) {
     return is_absolute(uri_) && hierarchical_schemes::exists(scheme(uri_));
 }
 
+inline
+bool is_opaque(const uri &uri_) {
+    return is_absolute(uri_) && opaque_schemes::exists(scheme(uri_));
+}
+
 inline
 bool is_valid(const uri &uri_) {
     return valid(uri_);

libs/network/src/uri/parse.cpp

@@ -188,7 +188,7 @@ struct uri_grammar : qi::grammar<
             ;
 
         start %=
-            -(scheme >> ':')
+            (scheme >> ':')
             >> hier_part
             >>  -('?' >> query)
             >>  -('#' >> fragment)

libs/network/src/uri/schemes.cpp

@@ -13,7 +13,7 @@ namespace network {
 namespace uri {
 namespace {
 static boost::unordered_set<std::string> hierarchical_schemes_;
-static boost::unordered_set<std::string> non_hierarchical_schemes_;
+static boost::unordered_set<std::string> opaque_schemes_;
 
 bool register_hierarchical_schemes() {
     hierarchical_schemes_.insert("http");
@@ -36,27 +36,27 @@ bool register_hierarchical_schemes() {
     return true;
 }
 
-bool register_non_hierarchical_schemes() {
-    non_hierarchical_schemes_.insert("mailto");
-    non_hierarchical_schemes_.insert("news");
-    non_hierarchical_schemes_.insert("im");
-    non_hierarchical_schemes_.insert("sip");
-    non_hierarchical_schemes_.insert("sms");
-    non_hierarchical_schemes_.insert("xmpp");
+bool register_opaque_schemes() {
+    opaque_schemes_.insert("mailto");
+    opaque_schemes_.insert("news");
+    opaque_schemes_.insert("im");
+    opaque_schemes_.insert("sip");
+    opaque_schemes_.insert("sms");
+    opaque_schemes_.insert("xmpp");
     return true;
 }
 
 
 static bool hierarchical = register_hierarchical_schemes();
-static bool non_hierarchical = register_non_hierarchical_schemes();
+static bool opaque = register_opaque_schemes();
 } // namespace
 
 bool hierarchical_schemes::exists(const std::string &scheme) {
     return hierarchical_schemes_.end() != hierarchical_schemes_.find(scheme);
 }
 
-bool non_hierarchical_schemes::exists(const std::string &scheme) {
-    return non_hierarchical_schemes_.end() != non_hierarchical_schemes_.find(scheme);
+bool opaque_schemes::exists(const std::string &scheme) {
+    return opaque_schemes_.end() != opaque_schemes_.find(scheme);
 }
 } // namespace uri
 } // namespace network

libs/network/test/uri/relative_url_test.cpp

@@ -12,15 +12,7 @@
 using namespace boost::network;
 
 BOOST_AUTO_TEST_CASE(relative_uri_test) {
-    uri::uri instance("www.example.com/");
-    BOOST_REQUIRE(uri::valid(instance));
-    BOOST_CHECK(uri::is_absolute(instance));
-    BOOST_CHECK_EQUAL(uri::path(instance), "www.example.com/");
-}
-
-BOOST_AUTO_TEST_CASE(relative_uri_scheme_test) {
-    uri::uri instance("www.example.com/");
-    BOOST_REQUIRE(instance.scheme_range());
-    BOOST_CHECK(instance.begin() == boost::begin(instance.scheme_range()));
-    BOOST_CHECK(instance.begin() == boost::end(instance.scheme_range()));
+    // don't yet support relative URIs
+    uri::uri instance("example.com");
+    BOOST_REQUIRE(!uri::valid(instance));
 }