Added an improvement to the equality operation to be able to compare the URI query, independently of the order of the URI query arguments.

Author: glynos

include/network/uri/uri.hpp

@@ -312,29 +312,31 @@ std::size_t hash_value(const uri &uri_)
     return seed;
 }
 
-inline
-bool operator == (const uri &lhs, const uri &rhs) {
-    return boost::equal(lhs, rhs);
-}
+//inline
+//bool operator == (const uri &lhs, const uri &rhs) {
+//    return boost::equal(lhs, rhs);
+//}
+
+bool operator == (const uri &lhs, const uri &rhs);
 
 inline
 bool operator == (const uri &lhs, const uri::string_type &rhs) {
-    return boost::equal(lhs, rhs);
+	return lhs == uri(rhs);
 }
 
 inline
 bool operator == (const uri::string_type &lhs, const uri &rhs) {
-    return boost::equal(lhs, rhs);
+	return uri(lhs) == rhs;
 }
 
 inline
 bool operator == (const uri &lhs, const uri::value_type *rhs) {
-    return boost::equal(lhs, boost::as_literal(rhs));
+	return lhs == uri(rhs);
 }
 
 inline
 bool operator == (const uri::value_type *lhs, const uri &rhs) {
-    return boost::equal(boost::as_literal(lhs), rhs);
+	return uri(lhs) == rhs;
 }
 
 inline

libs/network/src/uri/uri.cpp

@@ -5,3 +5,30 @@
 
 
 #include <network/uri/uri.ipp>
+#include <network/uri/uri.hpp>
+#include <map>
+
+#include <iterator>
+#include <iostream>
+
+namespace network {
+bool operator == (const uri &lhs, const uri &rhs) {
+	bool equal = boost::equal(
+		std::make_pair(std::begin(lhs.scheme_range()), std::begin(lhs.path_range())),
+		std::make_pair(std::begin(rhs.scheme_range()), std::begin(rhs.path_range())));
+	if (equal)
+	{
+		// TODO: test normalized paths
+		equal = boost::equal(lhs.path_range(), rhs.path_range());
+	}
+
+	if (equal)
+	{
+		// test query order
+		std::map<uri::string_type, uri::string_type> lhs_query_params, rhs_query_params;
+		equal = (query_map(lhs, lhs_query_params) ==	query_map(rhs, rhs_query_params));
+	}
+
+	return equal;
+}
+} // namespace network

libs/network/test/uri/uri_test.cpp

@@ -363,6 +363,12 @@ BOOST_AUTO_TEST_CASE(equality_test_4) {
     BOOST_CHECK(uri_1.c_str() == uri_2);
 }
 
+BOOST_AUTO_TEST_CASE(equality_test_reordered_query) {
+	network::uri uri_1("http://www.example.com/?a=1&b=2");
+	network::uri uri_2("http://www.example.com/?b=2&a=1");
+    BOOST_CHECK(uri_1 == uri_2);
+}
+
 BOOST_AUTO_TEST_CASE(inequality_test) {
     network::uri uri_1("http://www.example.com/");
     network::uri uri_2("http://www.example.com/");
@@ -454,6 +460,7 @@ BOOST_AUTO_TEST_CASE(issue_67_test) {
 }
 
 BOOST_AUTO_TEST_CASE(from_parts_1) {
+	std::cout << __FUNCTION__ << std::endl;
     BOOST_CHECK_EQUAL(network::uri("http://www.example.com/path?query#fragment"),
                       network::from_parts(network::uri("http://www.example.com"), "/path", "query", "fragment"));
 }