[uri] Added further equality tests.

Author: glynos

boost/network/uri/uri.hpp

@@ -15,6 +15,7 @@
 # include <boost/utility/swap.hpp>
 # include <boost/range/algorithm/equal.hpp>
 # include <boost/range/algorithm/copy.hpp>
+# include <boost/range/as_literal.hpp>
 # include <boost/range/iterator_range.hpp>
 # include <boost/lexical_cast.hpp>
 # include <boost/optional.hpp>
@@ -38,14 +39,25 @@ class BOOST_URI_DECL uri {
 public:
 
     typedef std::string string_type;
+    typedef string_type::value_type value_type;
     typedef string_type::const_iterator const_iterator;
-    typedef boost::iterator_range<std::string::const_iterator> const_range_type;
+    typedef boost::iterator_range<const_iterator> const_range_type;
 
     uri()
         : is_valid_(false) {
 
     }
 
+    //uri(const value_type *uri)
+    //    : uri_(uri), is_valid_(false) {
+    //    parse();
+    //}
+
+    uri(const string_type &uri)
+        : uri_(uri), is_valid_(false) {
+        parse();
+    }
+
     template <
         class FwdIter
         >
@@ -54,11 +66,6 @@ class BOOST_URI_DECL uri {
         parse();
     }
 
-    uri(const string_type &uri)
-        : uri_(uri), is_valid_(false) {
-        parse();
-    }
-
     uri(const uri &other)
         : uri_(other.uri_) {
 		parse();
@@ -316,6 +323,26 @@ bool operator == (const uri &lhs, const uri &rhs) {
     return boost::equal(lhs, rhs);
 }
 
+inline
+bool operator == (const uri &lhs, const uri::string_type &rhs) {
+    return boost::equal(lhs, rhs);
+}
+
+inline
+bool operator == (const uri::string_type &lhs, const uri &rhs) {
+    return boost::equal(lhs, rhs);
+}
+
+inline
+bool operator == (const uri &lhs, const uri::value_type *rhs) {
+    return boost::equal(lhs, boost::as_literal(rhs));
+}
+
+inline
+bool operator == (const uri::value_type *lhs, const uri &rhs) {
+    return boost::equal(boost::as_literal(lhs), rhs);
+}
+
 inline
 bool operator != (const uri &lhs, const uri &rhs) {
     return !(lhs == rhs);

libs/network/test/uri/uri_test.cpp

@@ -342,6 +342,30 @@ BOOST_AUTO_TEST_CASE(equality_test) {
     BOOST_CHECK(uri_1 == uri_2);
 }
 
+BOOST_AUTO_TEST_CASE(equality_test_1) {
+    uri::uri uri_1("http://www.example.com/");
+    std::string uri_2("http://www.example.com/");
+    BOOST_CHECK(uri_1 == uri_2);
+}
+
+BOOST_AUTO_TEST_CASE(equality_test_2) {
+    std::string uri_1("http://www.example.com/");
+    uri::uri uri_2("http://www.example.com/");
+    BOOST_CHECK(uri_1 == uri_2);
+}
+
+BOOST_AUTO_TEST_CASE(equality_test_3) {
+    uri::uri uri_1("http://www.example.com/");
+    std::string uri_2("http://www.example.com/");
+    BOOST_CHECK(uri_1 == uri_2.c_str());
+}
+
+BOOST_AUTO_TEST_CASE(equality_test_4) {
+    std::string uri_1("http://www.example.com/");
+    uri::uri uri_2("http://www.example.com/");
+    BOOST_CHECK(uri_1.c_str() == uri_2);
+}
+
 BOOST_AUTO_TEST_CASE(inequality_test) {
     uri::uri uri_1("http://www.example.com/");
     uri::uri uri_2("http://www.example.com/");