Merge pull request #25 from martincostello/Fix-Port-Handling

Fix default port handling

Author: martincostello

src/HttpClientInterception/HttpClientInterceptorOptions.cs

@@ -410,6 +410,11 @@ private static string BuildKey(HttpInterceptionResponse interceptor)
                 keyPrefix += "IGNOREQUERY;";
             }
 
+            if (!interceptor.HasCustomPort)
+            {
+                builderForKey.Port = -1;
+            }
+
             return $"{keyPrefix};{interceptor.Method.Method}:{builderForKey}";
         }
 

src/HttpClientInterception/HttpInterceptionResponse.cs

@@ -34,6 +34,8 @@ internal sealed class HttpInterceptionResponse
 
         internal IEnumerable<KeyValuePair<string, IEnumerable<string>>> ContentHeaders { get; set; }
 
+        internal bool HasCustomPort { get; set; }
+
         internal bool IgnoreHost { get; set; }
 
         internal bool IgnorePath { get; set; }

src/HttpClientInterception/HttpRequestInterceptionBuilder.cs

@@ -43,6 +43,8 @@ public class HttpRequestInterceptionBuilder
 
         private Version _version;
 
+        private bool _hasCustomPort;
+
         private bool _ignoreHost;
 
         private bool _ignorePath;
@@ -135,6 +137,7 @@ public HttpRequestInterceptionBuilder ForHost(string host)
         public HttpRequestInterceptionBuilder ForPort(int port)
         {
             _uriBuilder.Port = port;
+            _hasCustomPort = port != -1;
             return this;
         }
 
@@ -629,6 +632,7 @@ internal HttpInterceptionResponse Build()
                 ContentFactory = _contentFactory ?? EmptyContentFactory,
                 ContentStream = _contentStream,
                 ContentMediaType = _mediaType,
+                HasCustomPort = _hasCustomPort,
                 IgnoreHost = _ignoreHost,
                 IgnorePath = _ignorePath,
                 IgnoreQuery = _ignoreQuery,

src/HttpClientInterception/Matching/RegistrationMatcher.cs

@@ -65,6 +65,11 @@ private static string GetUriStringForMatch(HttpInterceptionResponse registration
         {
             var builder = new UriBuilder(uri ?? registration.RequestUri);
 
+            if (!registration.HasCustomPort)
+            {
+                builder.Port = -1;
+            }
+
             if (registration.IgnoreHost)
             {
                 builder.Host = "*";

tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs

@@ -39,7 +39,6 @@ public InterceptionBenchmarks()
             builder
                 .Requests()
                 .ForHttps()
-                .ForPort(443)
                 .ForHost("files.domain.com")
                 .ForPath("setup.exe")
                 .ForQuery(string.Empty)

tests/HttpClientInterception.Tests/HttpRequestInterceptionBuilderTests.cs

@@ -1040,6 +1040,81 @@ public static void RegisterWith_Validates_Parameters()
             Assert.Throws<ArgumentNullException>("options", () => builder.RegisterWith(null));
         }
 
+        [Fact]
+        public static async Task Using_The_Same_Builder_For_Multiple_Registrations_On_The_Same_Host_Retains_Default_Port()
+        {
+            // Arrange
+            var options = new HttpClientInterceptorOptions()
+            {
+                ThrowOnMissingRegistration = true
+            };
+
+            var builder = new HttpRequestInterceptionBuilder()
+                .ForHttps()
+                .ForHost("api.github.com")
+                .ForPath("orgs/justeat")
+                .RegisterWith(options);
+
+            // Change to a different scheme without an explicit port
+            builder = builder
+                .ForHttp()
+                .RegisterWith(options);
+
+            // Act and Assert
+            await HttpAssert.GetAsync(options, "http://api.github.com/orgs/justeat");
+            await HttpAssert.GetAsync(options, "http://api.github.com:80/orgs/justeat");
+            await HttpAssert.GetAsync(options, "https://api.github.com/orgs/justeat");
+            await HttpAssert.GetAsync(options, "https://api.github.com:443/orgs/justeat");
+        }
+
+        [Fact]
+        public static async Task Using_The_Same_Builder_For_Multiple_Registrations_With_Custom_Ports()
+        {
+            // Arrange
+            var options = new HttpClientInterceptorOptions()
+            {
+                ThrowOnMissingRegistration = true
+            };
+
+            var builder = new HttpRequestInterceptionBuilder()
+                .ForPort(123)
+                .ForHttps()
+                .ForHost("api.github.com")
+                .ForPath("orgs/justeat")
+                .RegisterWith(options);
+
+            // Change to a different scheme without changing the port
+            builder = builder
+                .ForHttp()
+                .RegisterWith(options);
+
+            // Change the port and not the scheme
+            builder = builder
+                .ForPort(456)
+                .RegisterWith(options);
+
+            // Change the scheme and use an explicit port
+            builder = builder
+                .ForHttps()
+                .ForPort(443)
+                .RegisterWith(options);
+
+            // Restore default scheme and port
+            builder = builder
+                .ForHttp()
+                .ForPort(-1)
+                .RegisterWith(options);
+
+            // Act and Assert
+            await HttpAssert.GetAsync(options, "https://api.github.com:123/orgs/justeat");
+            await HttpAssert.GetAsync(options, "http://api.github.com:123/orgs/justeat");
+            await HttpAssert.GetAsync(options, "http://api.github.com:456/orgs/justeat");
+            await HttpAssert.GetAsync(options, "https://api.github.com/orgs/justeat");
+            await HttpAssert.GetAsync(options, "https://api.github.com:443/orgs/justeat");
+            await HttpAssert.GetAsync(options, "http://api.github.com/orgs/justeat");
+            await HttpAssert.GetAsync(options, "http://api.github.com:80/orgs/justeat");
+        }
+
         private sealed class CustomObject
         {
             internal enum Color