Skip to content

Commit dfcad52

Browse files
Complete TestHost test file WebHostBuilder conversion - added pragma disable warnings for all remaining WebHostBuilder usages in TestServerTests.cs, TestClientTests.cs, and HttpContextBuilderTests.cs
Co-authored-by: BrennanConroy <[email protected]>
1 parent 2f609b9 commit dfcad52

File tree

3 files changed

+78
-120
lines changed

3 files changed

+78
-120
lines changed

src/Hosting/TestHost/test/HttpContextBuilderTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
#pragma warning disable CS0618 // Type or member is obsolete
5+
46
using System.Text;
57
using Microsoft.AspNetCore.Builder;
68
using Microsoft.AspNetCore.Hosting;

src/Hosting/TestHost/test/TestClientTests.cs

Lines changed: 20 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ public async Task LargePayload_DisposesRequest_AfterResponseIsCompleted()
208208
data[i] = character[0];
209209
}
210210

211+
#pragma warning disable CS0618 // Type or member is obsolete
211212
var builder = new WebHostBuilder();
212213
RequestDelegate app = async ctx =>
213214
{
@@ -222,6 +223,7 @@ public async Task LargePayload_DisposesRequest_AfterResponseIsCompleted()
222223

223224
builder.Configure(appBuilder => appBuilder.Run(app));
224225
var server = new TestServer(builder);
226+
#pragma warning restore CS0618 // Type or member is obsolete
225227
var client = server.CreateClient();
226228

227229
// Act & Assert
@@ -266,29 +268,14 @@ public async Task ClientStreamingWorks()
266268
Stream requestStream = null;
267269

268270
using var host = new HostBuilder()
269-
270-
271271
.ConfigureWebHost(webBuilder =>
272-
273-
274272
{
275-
276-
277273
webBuilder
278-
279-
280274
.UseTestServer()
281-
282-
283275
.Configure(app => app.Run(appDelegate));
284-
285-
286276
})
287-
288-
289277
.Build();
290278

291-
292279
var server = host.GetTestServer();
293280
var client = server.CreateClient();
294281

@@ -346,29 +333,14 @@ public async Task ClientStreaming_HttpContentException()
346333
};
347334

348335
using var host = new HostBuilder()
349-
350-
351336
.ConfigureWebHost(webBuilder =>
352-
353-
354337
{
355-
356-
357338
webBuilder
358-
359-
360339
.UseTestServer()
361-
362-
363340
.Configure(app => app.Run(appDelegate));
364-
365-
366341
})
367-
368-
369342
.Build();
370343

371-
372344
var server = host.GetTestServer();
373345
var client = server.CreateClient();
374346

@@ -420,29 +392,14 @@ public async Task ClientStreaming_Cancellation()
420392
Stream requestStream = null;
421393

422394
using var host = new HostBuilder()
423-
424-
425395
.ConfigureWebHost(webBuilder =>
426-
427-
428396
{
429-
430-
431397
webBuilder
432-
433-
434398
.UseTestServer()
435-
436-
437399
.Configure(app => app.Run(appDelegate));
438-
439-
440400
})
441-
442-
443401
.Build();
444402

445-
446403
var server = host.GetTestServer();
447404
var client = server.CreateClient();
448405

@@ -500,29 +457,14 @@ public async Task ClientStreaming_ResponseCompletesWithoutReadingRequest()
500457
Stream requestStream = null;
501458

502459
using var host = new HostBuilder()
503-
504-
505460
.ConfigureWebHost(webBuilder =>
506-
507-
508461
{
509-
510-
511462
webBuilder
512-
513-
514463
.UseTestServer()
515-
516-
517464
.Configure(app => app.Run(appDelegate));
518-
519-
520465
})
521-
522-
523466
.Build();
524467

525-
526468
var server = host.GetTestServer();
527469
var client = server.CreateClient();
528470

@@ -585,29 +527,14 @@ public async Task ClientStreaming_ResponseCompletesWithPendingRead_ThrowError()
585527
Stream requestStream = null;
586528

587529
using var host = new HostBuilder()
588-
589-
590530
.ConfigureWebHost(webBuilder =>
591-
592-
593531
{
594-
595-
596532
webBuilder
597-
598-
599533
.UseTestServer()
600-
601-
602534
.Configure(app => app.Run(appDelegate));
603-
604-
605535
})
606-
607-
608536
.Build();
609537

610-
611538
var server = host.GetTestServer();
612539
var client = server.CreateClient();
613540

@@ -655,29 +582,14 @@ public async Task ClientStreaming_ResponseCompletesWithoutResponseBodyWrite()
655582
Stream requestStream = null;
656583

657584
using var host = new HostBuilder()
658-
659-
660585
.ConfigureWebHost(webBuilder =>
661-
662-
663586
{
664-
665-
666587
webBuilder
667-
668-
669588
.UseTestServer()
670-
671-
672589
.Configure(app => app.Run(appDelegate));
673-
674-
675590
})
676-
677-
678591
.Build();
679592

680-
681593
var server = host.GetTestServer();
682594
var client = server.CreateClient();
683595

@@ -729,29 +641,14 @@ public async Task ClientStreaming_ServerAbort()
729641
Stream requestStream = null;
730642

731643
using var host = new HostBuilder()
732-
733-
734644
.ConfigureWebHost(webBuilder =>
735-
736-
737645
{
738-
739-
740646
webBuilder
741-
742-
743647
.UseTestServer()
744-
745-
746648
.Configure(app => app.Run(appDelegate));
747-
748-
749649
})
750-
751-
752650
.Build();
753651

754-
755652
var server = host.GetTestServer();
756653
var client = server.CreateClient();
757654

@@ -835,6 +732,7 @@ public async Task WebSocketWorks()
835732
}
836733
}
837734
};
735+
#pragma warning disable CS0618 // Type or member is obsolete
838736
var builder = new WebHostBuilder()
839737
.ConfigureServices(services =>
840738
{
@@ -845,6 +743,7 @@ public async Task WebSocketWorks()
845743
app.Run(appDelegate);
846744
});
847745
var server = new TestServer(builder);
746+
#pragma warning restore CS0618 // Type or member is obsolete
848747

849748
// Act
850749
var client = server.CreateWebSocketClient();
@@ -905,12 +804,14 @@ public async Task WebSocketSubProtocolsWorks()
905804
}
906805
}
907806
};
807+
#pragma warning disable CS0618 // Type or member is obsolete
908808
var builder = new WebHostBuilder()
909809
.Configure(app =>
910810
{
911811
app.Run(appDelegate);
912812
});
913813
var server = new TestServer(builder);
814+
#pragma warning restore CS0618 // Type or member is obsolete
914815

915816
// Act
916817
var client = server.CreateWebSocketClient();
@@ -957,10 +858,12 @@ public async Task WebSocketAcceptThrowsWhenCancelled()
957858
}
958859
}
959860
};
861+
#pragma warning disable CS0618 // Type or member is obsolete
960862
var builder = new WebHostBuilder()
961863
.ConfigureServices(services => services.AddSingleton<ILogger<IWebHost>>(logger))
962864
.Configure(app => app.Run(appDelegate));
963865
var server = new TestServer(builder);
866+
#pragma warning restore CS0618 // Type or member is obsolete
964867

965868
// Act
966869
var client = server.CreateWebSocketClient();
@@ -1000,11 +903,13 @@ public async Task WebSocketDisposalThrowsOnPeer()
1000903
websocket.Dispose();
1001904
}
1002905
};
906+
#pragma warning disable CS0618 // Type or member is obsolete
1003907
var builder = new WebHostBuilder().Configure(app =>
1004908
{
1005909
app.Run(appDelegate);
1006910
});
1007911
var server = new TestServer(builder);
912+
#pragma warning restore CS0618 // Type or member is obsolete
1008913

1009914
// Act
1010915
var client = server.CreateWebSocketClient();
@@ -1033,11 +938,13 @@ public async Task WebSocketTinyReceiveGeneratesEndOfMessage()
1033938
}
1034939
}
1035940
};
941+
#pragma warning disable CS0618 // Type or member is obsolete
1036942
var builder = new WebHostBuilder().Configure(app =>
1037943
{
1038944
app.Run(appDelegate);
1039945
});
1040946
var server = new TestServer(builder);
947+
#pragma warning restore CS0618 // Type or member is obsolete
1041948

1042949
// Act
1043950
var client = server.CreateWebSocketClient();
@@ -1112,6 +1019,7 @@ public async Task ClientDisposalAbortsRequest()
11121019
public async Task ClientCancellationAbortsRequest()
11131020
{
11141021
var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
1022+
#pragma warning disable CS0618 // Type or member is obsolete
11151023
var builder = new WebHostBuilder().Configure(app => app.Run(async ctx =>
11161024
{
11171025
try
@@ -1127,6 +1035,7 @@ public async Task ClientCancellationAbortsRequest()
11271035
throw new InvalidOperationException("The request was not aborted");
11281036
}));
11291037
using var server = new TestServer(builder);
1038+
#pragma warning restore CS0618 // Type or member is obsolete
11301039
using var client = server.CreateClient();
11311040
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1));
11321041
var response = await Assert.ThrowsAnyAsync<OperationCanceledException>(() => client.GetAsync("http://localhost:12345", cts.Token));
@@ -1142,6 +1051,7 @@ public async Task AsyncLocalValueOnClientIsNotPreserved()
11421051
asyncLocal.Value = value;
11431052

11441053
object capturedValue = null;
1054+
#pragma warning disable CS0618 // Type or member is obsolete
11451055
var builder = new WebHostBuilder()
11461056
.Configure(app =>
11471057
{
@@ -1152,6 +1062,7 @@ public async Task AsyncLocalValueOnClientIsNotPreserved()
11521062
});
11531063
});
11541064
var server = new TestServer(builder);
1065+
#pragma warning restore CS0618 // Type or member is obsolete
11551066
var client = server.CreateClient();
11561067

11571068
var resp = await client.GetAsync("/");
@@ -1167,6 +1078,7 @@ public async Task AsyncLocalValueOnClientIsPreservedIfPreserveExecutionContextIs
11671078
asyncLocal.Value = value;
11681079

11691080
object capturedValue = null;
1081+
#pragma warning disable CS0618 // Type or member is obsolete
11701082
var builder = new WebHostBuilder()
11711083
.Configure(app =>
11721084
{
@@ -1180,6 +1092,7 @@ public async Task AsyncLocalValueOnClientIsPreservedIfPreserveExecutionContextIs
11801092
{
11811093
PreserveExecutionContext = true
11821094
};
1095+
#pragma warning restore CS0618 // Type or member is obsolete
11831096
var client = server.CreateClient();
11841097

11851098
var resp = await client.GetAsync("/");
@@ -1315,6 +1228,7 @@ public async Task SendAsync_ExplicitlySet_Protocol30()
13151228
[Fact]
13161229
public async Task VerifyWebSocketAndUpgradeFeaturesForNonWebSocket()
13171230
{
1231+
#pragma warning disable CS0618 // Type or member is obsolete
13181232
using (var testServer = new TestServer(new WebHostBuilder()
13191233
.Configure(app =>
13201234
{
@@ -1334,6 +1248,7 @@ public async Task VerifyWebSocketAndUpgradeFeaturesForNonWebSocket()
13341248
await c.Response.WriteAsync("test");
13351249
});
13361250
})))
1251+
#pragma warning restore CS0618 // Type or member is obsolete
13371252
{
13381253
var client = testServer.CreateClient();
13391254

0 commit comments

Comments
 (0)