@@ -54,7 +54,7 @@ public async Task UseUrls_HelloWorld_ClientSuccess()
54
54
. ConfigureServices ( AddTestLogging ) ;
55
55
56
56
using ( var host = builder . Build ( ) )
57
- using ( var client = new HttpClient ( ) )
57
+ using ( var client = CreateClient ( ) )
58
58
{
59
59
await host . StartAsync ( ) ;
60
60
@@ -183,10 +183,7 @@ public async Task Listen_Http3AndSocketsCoexistOnSameEndpoint_AltSvcEnabled_Upgr
183
183
using var host = builder . Build ( ) ;
184
184
await host . StartAsync ( ) . DefaultTimeout ( ) ;
185
185
186
- var httpClientHandler = new HttpClientHandler ( ) ;
187
- httpClientHandler . ServerCertificateCustomValidationCallback = HttpClientHandler . DangerousAcceptAnyServerCertificateValidator ;
188
-
189
- using ( var client = new HttpClient ( httpClientHandler ) )
186
+ using ( var client = CreateClient ( ) )
190
187
{
191
188
// Act
192
189
var request1 = new HttpRequestMessage ( HttpMethod . Get , $ "https://127.0.0.1:{ host . GetPort ( ) } /") ;
@@ -221,43 +218,44 @@ public async Task Listen_Http3AndSocketsCoexistOnSameEndpoint_AltSvcEnabled_Upgr
221
218
222
219
private static async Task CallHttp3AndHttp1EndpointsAsync ( int http3Port , int http1Port )
223
220
{
224
- // HTTP/3
225
- using ( var client = new HttpClient ( ) )
221
+ using ( var client = CreateClient ( ) )
226
222
{
227
- var request = new HttpRequestMessage ( HttpMethod . Get , $ "https://127.0.0.1:{ http3Port } /") ;
228
- request . Version = HttpVersion . Version30 ;
229
- request . VersionPolicy = HttpVersionPolicy . RequestVersionExact ;
223
+ // HTTP/3
224
+ var request1 = new HttpRequestMessage ( HttpMethod . Get , $ "https://127.0.0.1:{ http3Port } /") ;
225
+ request1 . Version = HttpVersion . Version30 ;
226
+ request1 . VersionPolicy = HttpVersionPolicy . RequestVersionExact ;
230
227
231
228
// Act
232
- var response = await client . SendAsync ( request ) . DefaultTimeout ( ) ;
229
+ var response1 = await client . SendAsync ( request1 ) . DefaultTimeout ( ) ;
233
230
234
231
// Assert
235
- response . EnsureSuccessStatusCode ( ) ;
236
- Assert . Equal ( HttpVersion . Version30 , response . Version ) ;
237
- var responseText = await response . Content . ReadAsStringAsync ( ) . DefaultTimeout ( ) ;
238
- Assert . Equal ( "hello, world" , responseText ) ;
239
- }
240
-
241
- // HTTP/1.1
242
- var httpClientHandler = new HttpClientHandler ( ) ;
243
- httpClientHandler . ServerCertificateCustomValidationCallback = HttpClientHandler . DangerousAcceptAnyServerCertificateValidator ;
232
+ response1 . EnsureSuccessStatusCode ( ) ;
233
+ Assert . Equal ( HttpVersion . Version30 , response1 . Version ) ;
234
+ var responseText1 = await response1 . Content . ReadAsStringAsync ( ) . DefaultTimeout ( ) ;
235
+ Assert . Equal ( "hello, world" , responseText1 ) ;
244
236
245
- using ( var client = new HttpClient ( httpClientHandler ) )
246
- {
247
237
// HTTP/1.1
248
- var request = new HttpRequestMessage ( HttpMethod . Get , $ "https://127.0.0.1:{ http1Port } /") ;
238
+ var request2 = new HttpRequestMessage ( HttpMethod . Get , $ "https://127.0.0.1:{ http1Port } /") ;
249
239
250
240
// Act
251
- var response = await client . SendAsync ( request ) . DefaultTimeout ( ) ;
241
+ var response2 = await client . SendAsync ( request2 ) . DefaultTimeout ( ) ;
252
242
253
243
// Assert
254
- response . EnsureSuccessStatusCode ( ) ;
255
- Assert . Equal ( HttpVersion . Version11 , response . Version ) ;
256
- var responseText = await response . Content . ReadAsStringAsync ( ) . DefaultTimeout ( ) ;
257
- Assert . Equal ( "hello, world" , responseText ) ;
244
+ response2 . EnsureSuccessStatusCode ( ) ;
245
+ Assert . Equal ( HttpVersion . Version11 , response2 . Version ) ;
246
+ var responseText2 = await response2 . Content . ReadAsStringAsync ( ) . DefaultTimeout ( ) ;
247
+ Assert . Equal ( "hello, world" , responseText2 ) ;
258
248
}
259
249
}
260
250
251
+ private static HttpClient CreateClient ( )
252
+ {
253
+ var httpHandler = new HttpClientHandler ( ) ;
254
+ httpHandler . ServerCertificateCustomValidationCallback = HttpClientHandler . DangerousAcceptAnyServerCertificateValidator ;
255
+
256
+ return new HttpClient ( httpHandler ) ;
257
+ }
258
+
261
259
public static IHostBuilder GetHostBuilder ( long ? maxReadBufferSize = null )
262
260
{
263
261
return new HostBuilder ( )
0 commit comments