Updated requests test to check the port number.

glynos · glynos · commit 5e68836ce857 · 2013-09-02T21:37:33.000+02:00
diff --git a/http/src/network/http/v2/client/request.hpp b/http/src/network/http/v2/client/request.hpp
@@ -127,7 +127,17 @@ namespace network {
 	}
 
 	std::uint16_t port() const {
-	  assert(destination_.port());
+	  assert(destination_.scheme());
+	  assert((string_type(*destination_.scheme()) == "http") ||
+		 (string_type(*destination_.scheme()) == "https"));
+	  if (!destination_.port()) {
+	    if (string_type(*destination_.scheme()) == "http") {
+	      return 80;
+	    }
+	    else if (string_type(*destination_.scheme()) == "https") {
+	      return 443;
+	    }
+	  }
 	  return *destination_.port<std::uint16_t>();
 	}
 
diff --git a/http/test/v2/client/request_test.cpp b/http/test/v2/client/request_test.cpp
@@ -123,3 +123,18 @@ TEST(request_test, remove_duplicate_headers) {
   ++headers_it;
   ASSERT_TRUE(headers_it == std::end(headers));
 }
+
+TEST(request_test, port) {
+  http::request instance{network::uri{"http://www.example.com:8000/path/to/resource/index.html"}};
+  ASSERT_EQ(8000, instance.port());
+}
+
+TEST(request_test, http_default_port) {
+  http::request instance{network::uri{"http://www.example.com/path/to/resource/index.html"}};
+  ASSERT_EQ(80, instance.port());
+}
+
+TEST(request_test, https_default_port) {
+  http::request instance{network::uri{"https://www.example.com/path/to/resource/index.html"}};
+  ASSERT_EQ(443, instance.port());
+}
