diff options
Diffstat (limited to 'src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs')
| -rw-r--r-- | src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs | 101 |
1 files changed, 75 insertions, 26 deletions
diff --git a/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs b/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs index a372b1b385..c6865a4eee 100644 --- a/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs +++ b/src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs @@ -50,6 +50,7 @@ namespace System.Net.Http.Functional.Tests hops:1) }, }; public readonly static object[][] Http2Servers = Configuration.Http.Http2Servers; + public readonly static object[][] Http2NoPushServers = Configuration.Http.Http2NoPushServers; public readonly static object[][] RedirectStatusCodes = { new object[] { 300 }, @@ -67,7 +68,9 @@ namespace System.Net.Http.Functional.Tests GetMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "CUSTOM1"); public readonly static IEnumerable<object[]> HttpMethodsThatDontAllowContent = GetMethods("HEAD", "TRACE"); - + + private static bool IsWindows10Version1607OrGreater => PlatformDetection.IsWindows10Version1607OrGreater; + private static IEnumerable<object[]> GetMethods(params string[] methods) { foreach (string method in methods) @@ -834,6 +837,8 @@ namespace System.Net.Http.Functional.Tests Assert.True(bytesRead < buffer.Length, "bytesRead should be less than buffer.Length"); } } + + return null; }); } }); @@ -854,6 +859,7 @@ namespace System.Net.Http.Functional.Tests Task server1 = LoopbackServer.AcceptSocketAsync(socket1, async (s, stream, reader, writer) => { await unblockServers.Task; + return null; }); // Second server connects and sends some but not all headers @@ -862,6 +868,7 @@ namespace System.Net.Http.Functional.Tests while (!string.IsNullOrEmpty(await reader.ReadLineAsync())) ; await writer.WriteAsync($"HTTP/1.1 200 OK\r\n"); await unblockServers.Task; + return null; }); // Third server connects and sends all headers and some but not all of the body @@ -873,6 +880,7 @@ namespace System.Net.Http.Functional.Tests await unblockServers.Task; await writer.WriteAsync("1234567890"); s.Shutdown(SocketShutdown.Send); + return null; }); // Make three requests @@ -1215,6 +1223,8 @@ namespace System.Net.Http.Functional.Tests Assert.True(contentDisposed, "Expected request content to be disposed"); Assert.Equal("abcdefghij", await response.Content.ReadAsStringAsync()); } + + return null; }); }); } @@ -1276,6 +1286,8 @@ namespace System.Net.Http.Functional.Tests Assert.True(contentDisposed, "Expected request content to be disposed"); Assert.Equal("abcdefghij", await response.Content.ReadAsStringAsync()); } + + return null; }); }); } @@ -1490,6 +1502,7 @@ namespace System.Net.Http.Functional.Tests } [Theory, MemberData(nameof(Http2Servers))] + [ActiveIssue(10958, PlatformID.Windows)] public async Task SendAsync_RequestVersion20_ResponseVersion20IfHttp2Supported(Uri server) { // We don't currently have a good way to test whether HTTP/2 is supported without @@ -1533,6 +1546,24 @@ namespace System.Net.Http.Functional.Tests } } + [ConditionalTheory(nameof(IsWindows10Version1607OrGreater)), MemberData(nameof(Http2NoPushServers))] + public async Task SendAsync_RequestVersion20_ResponseVersion20(Uri server) + { + _output.WriteLine(server.AbsoluteUri.ToString()); + var request = new HttpRequestMessage(HttpMethod.Get, server); + request.Version = new Version(2, 0); + + var handler = new HttpClientHandler(); + using (var client = new HttpClient(handler)) + { + using (HttpResponseMessage response = await client.SendAsync(request)) + { + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.Equal(new Version(2, 0), response.Version); + } + } + } + private async Task<Version> SendRequestAndGetRequestVersionAsync(Version requestVersion) { Version receivedRequestVersion = null; @@ -1546,36 +1577,27 @@ namespace System.Net.Http.Functional.Tests { Task<HttpResponseMessage> getResponse = client.SendAsync(request); - await LoopbackServer.AcceptSocketAsync(server, async (s, stream, reader, writer) => - { - string statusLine = reader.ReadLine(); - while (!string.IsNullOrEmpty(reader.ReadLine())) ; - - if (statusLine.Contains("/1.0")) - { - receivedRequestVersion = new Version(1, 0); - } - else if (statusLine.Contains("/1.1")) - { - receivedRequestVersion = new Version(1, 1); - } - else - { - Assert.True(false, "Invalid HTTP request version"); - } - - await writer.WriteAsync( - $"HTTP/1.1 200 OK\r\n" + - $"Date: {DateTimeOffset.UtcNow:R}\r\n" + - "Content-Length: 0\r\n" + - "\r\n"); - s.Shutdown(SocketShutdown.Send); - }); + List<string> receivedRequest = await LoopbackServer.ReadRequestAndSendResponseAsync(server); using (HttpResponseMessage response = await getResponse) { Assert.Equal(HttpStatusCode.OK, response.StatusCode); } + + string statusLine = receivedRequest[0]; + if (statusLine.Contains("/1.0")) + { + receivedRequestVersion = new Version(1, 0); + } + else if (statusLine.Contains("/1.1")) + { + receivedRequestVersion = new Version(1, 1); + } + else + { + Assert.True(false, "Invalid HTTP request version"); + } + } }); @@ -1676,5 +1698,32 @@ namespace System.Net.Http.Functional.Tests } } #endregion + + #region Uri wire transmission encoding tests + [Fact] + public async Task SendRequest_UriPathHasReservedChars_ServerReceivedExpectedPath() + { + await LoopbackServer.CreateServerAsync(async (server, rootUrl) => + { + var uri = new Uri($"http://{rootUrl.Host}:{rootUrl.Port}/test[]"); + _output.WriteLine(uri.AbsoluteUri.ToString()); + var request = new HttpRequestMessage(HttpMethod.Get, uri); + string statusLine = string.Empty; + + using (var client = new HttpClient()) + { + Task<HttpResponseMessage> getResponse = client.SendAsync(request); + + List<string> receivedRequest = await LoopbackServer.ReadRequestAndSendResponseAsync(server); + + using (HttpResponseMessage response = await getResponse) + { + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + Assert.True(receivedRequest[0].Contains(uri.PathAndQuery), $"statusLine should contain {uri.PathAndQuery}"); + } + } + }); + } + #endregion } } |