Skip to content

Commit 9134e94

Browse files
BrennanConroyBrennanConroy
committed
startasync
1 parent dfcad52 commit 9134e94

File tree

5 files changed

+59
-59
lines changed

5 files changed

+59
-59
lines changed

‎src/Hosting/TestHost/test/ClientHandlerTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,8 @@ public async Task ClientHandlerCreateContextWithDefaultRequestParameters()
712712
.Build();
713713
var server = host.GetTestServer();
714714

715+
await host.StartAsync();
716+
715717
// The HttpContext will be created and the logger will make sure that the HttpRequest exists and contains reasonable values
716718
var result = await server.CreateClient().GetStringAsync("/");
717719
}

‎src/Hosting/TestHost/test/HttpContextBuilderTests.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public async Task ExpectedValuesAreAvailable()
2929
})
3030
.Build();
3131
var server = host.GetTestServer();
32+
33+
await host.StartAsync();
34+
3235
server.BaseAddress = new Uri("https://example.com/A/Path/");
3336
var context = await server.SendAsync(c =>
3437
{
@@ -67,6 +70,9 @@ public async Task UserAgentHeaderWorks()
6770
})
6871
.Build();
6972
var server = host.GetTestServer();
73+
74+
await host.StartAsync();
75+
7076
server.BaseAddress = new Uri("https://example.com/");
7177
var context = await server.SendAsync(c =>
7278
{
@@ -89,6 +95,9 @@ public async Task SingleSlashNotMovedToPathBase()
8995
})
9096
.Build();
9197
var server = host.GetTestServer();
98+
99+
await host.StartAsync();
100+
92101
var context = await server.SendAsync(c =>
93102
{
94103
c.Request.Path = "/";
@@ -117,6 +126,9 @@ public async Task MiddlewareOnlySetsHeaders()
117126
})
118127
.Build();
119128
var server = host.GetTestServer();
129+
130+
await host.StartAsync();
131+
120132
var context = await server.SendAsync(c => { });
121133

122134
Assert.Equal("TestValue", context.Response.Headers["TestHeader"]);
@@ -357,6 +369,8 @@ public async Task ClientHandlerCreateContextWithDefaultRequestParameters()
357369
.Build();
358370
var server = host.GetTestServer();
359371

372+
await host.StartAsync();
373+
360374
// The HttpContext will be created and the logger will make sure that the HttpRequest exists and contains reasonable values
361375
var ctx = await server.SendAsync(c => { });
362376
}

‎src/Hosting/TestHost/test/TestClientTests.cs‎

Lines changed: 35 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,16 @@ public async Task GetAsyncWorks()
2828
RequestDelegate appDelegate = ctx =>
2929
ctx.Response.WriteAsync(expected);
3030
using var host = new HostBuilder()
31-
3231
.ConfigureWebHost(webBuilder =>
33-
3432
{
35-
3633
webBuilder
37-
3834
.UseTestServer()
39-
4035
.Configure(app => app.Run(appDelegate));
41-
4236
})
43-
4437
.Build();
4538

39+
await host.StartAsync();
40+
4641
var server = host.GetTestServer();
4742
var client = server.CreateClient();
4843

@@ -67,19 +62,16 @@ public async Task NoTrailingSlash_NoPathBase()
6762
using var host = new HostBuilder()
6863

6964
.ConfigureWebHost(webBuilder =>
70-
7165
{
72-
7366
webBuilder
74-
7567
.UseTestServer()
76-
7768
.Configure(app => app.Run(appDelegate));
7869

7970
})
80-
8171
.Build();
8272

73+
await host.StartAsync();
74+
8375
var server = host.GetTestServer();
8476
var client = server.CreateClient();
8577

@@ -101,22 +93,18 @@ public async Task SingleTrailingSlash_NoPathBase()
10193
Assert.Equal("/", ctx.Request.Path.Value);
10294
return ctx.Response.WriteAsync(expected);
10395
};
104-
using var host = new HostBuilder()
10596

97+
using var host = new HostBuilder()
10698
.ConfigureWebHost(webBuilder =>
107-
10899
{
109-
110100
webBuilder
111-
112101
.UseTestServer()
113-
114102
.Configure(app => app.Run(appDelegate));
115-
116103
})
117-
118104
.Build();
119105

106+
await host.StartAsync();
107+
120108
var server = host.GetTestServer();
121109
var client = server.CreateClient();
122110

@@ -139,19 +127,15 @@ public async Task PutAsyncWorks()
139127
using var host = new HostBuilder()
140128

141129
.ConfigureWebHost(webBuilder =>
142-
143130
{
144-
145131
webBuilder
146-
147132
.UseTestServer()
148-
149133
.Configure(app => app.Run(appDelegate));
150-
151134
})
152-
153135
.Build();
154136

137+
await host.StartAsync();
138+
155139
var server = host.GetTestServer();
156140
var client = server.CreateClient();
157141

@@ -172,19 +156,15 @@ public async Task PostAsyncWorks()
172156
using var host = new HostBuilder()
173157

174158
.ConfigureWebHost(webBuilder =>
175-
176159
{
177-
178160
webBuilder
179-
180161
.UseTestServer()
181-
182162
.Configure(app => app.Run(appDelegate));
183-
184163
})
185-
186164
.Build();
187165

166+
await host.StartAsync();
167+
188168
var server = host.GetTestServer();
189169
var client = server.CreateClient();
190170

@@ -276,6 +256,8 @@ public async Task ClientStreamingWorks()
276256
})
277257
.Build();
278258

259+
await host.StartAsync();
260+
279261
var server = host.GetTestServer();
280262
var client = server.CreateClient();
281263

@@ -341,6 +323,8 @@ public async Task ClientStreaming_HttpContentException()
341323
})
342324
.Build();
343325

326+
await host.StartAsync();
327+
344328
var server = host.GetTestServer();
345329
var client = server.CreateClient();
346330

@@ -400,6 +384,8 @@ public async Task ClientStreaming_Cancellation()
400384
})
401385
.Build();
402386

387+
await host.StartAsync();
388+
403389
var server = host.GetTestServer();
404390
var client = server.CreateClient();
405391

@@ -465,6 +451,8 @@ public async Task ClientStreaming_ResponseCompletesWithoutReadingRequest()
465451
})
466452
.Build();
467453

454+
await host.StartAsync();
455+
468456
var server = host.GetTestServer();
469457
var client = server.CreateClient();
470458

@@ -536,6 +524,9 @@ public async Task ClientStreaming_ResponseCompletesWithPendingRead_ThrowError()
536524
.Build();
537525

538526
var server = host.GetTestServer();
527+
528+
await host.StartAsync();
529+
539530
var client = server.CreateClient();
540531

541532
var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345");
@@ -590,6 +581,8 @@ public async Task ClientStreaming_ResponseCompletesWithoutResponseBodyWrite()
590581
})
591582
.Build();
592583

584+
await host.StartAsync();
585+
593586
var server = host.GetTestServer();
594587
var client = server.CreateClient();
595588

@@ -650,6 +643,9 @@ public async Task ClientStreaming_ServerAbort()
650643
.Build();
651644

652645
var server = host.GetTestServer();
646+
647+
await host.StartAsync();
648+
653649
var client = server.CreateClient();
654650

655651
var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345");
@@ -989,21 +985,16 @@ public async Task ClientDisposalAbortsRequest()
989985

990986
// Act
991987
using var host = new HostBuilder()
992-
993988
.ConfigureWebHost(webBuilder =>
994-
995989
{
996-
997990
webBuilder
998-
999991
.UseTestServer()
1000-
1001992
.Configure(app => app.Run(appDelegate));
1002-
1003993
})
1004-
1005994
.Build();
1006995

996+
await host.StartAsync();
997+
1007998
var server = host.GetTestServer();
1008999
var client = server.CreateClient();
10091000
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost:12345");
@@ -1112,21 +1103,16 @@ public async Task SendAsync_Default_Protocol11()
11121103
await ctx.Response.WriteAsync(expected);
11131104
};
11141105
using var host = new HostBuilder()
1115-
11161106
.ConfigureWebHost(webBuilder =>
1117-
11181107
{
1119-
11201108
webBuilder
1121-
11221109
.UseTestServer()
1123-
11241110
.Configure(app => app.Run(appDelegate));
1125-
11261111
})
1127-
11281112
.Build();
11291113

1114+
await host.StartAsync();
1115+
11301116
var server = host.GetTestServer();
11311117
var client = server.CreateClient();
11321118
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost:12345");
@@ -1153,21 +1139,16 @@ public async Task SendAsync_ExplicitlySet_Protocol20()
11531139
await ctx.Response.WriteAsync(expected);
11541140
};
11551141
using var host = new HostBuilder()
1156-
11571142
.ConfigureWebHost(webBuilder =>
1158-
11591143
{
1160-
11611144
webBuilder
1162-
11631145
.UseTestServer()
1164-
11651146
.Configure(app => app.Run(appDelegate));
1166-
11671147
})
1168-
11691148
.Build();
11701149

1150+
await host.StartAsync();
1151+
11711152
var server = host.GetTestServer();
11721153
var client = server.CreateClient();
11731154
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost:12345");
@@ -1195,21 +1176,16 @@ public async Task SendAsync_ExplicitlySet_Protocol30()
11951176
await ctx.Response.WriteAsync(expected);
11961177
};
11971178
using var host = new HostBuilder()
1198-
11991179
.ConfigureWebHost(webBuilder =>
1200-
12011180
{
1202-
12031181
webBuilder
1204-
12051182
.UseTestServer()
1206-
12071183
.Configure(app => app.Run(appDelegate));
1208-
12091184
})
1210-
12111185
.Build();
12121186

1187+
await host.StartAsync();
1188+
12131189
var server = host.GetTestServer();
12141190
var client = server.CreateClient();
12151191
var request = new HttpRequestMessage(HttpMethod.Get, "http://localhost:12345");

‎src/Hosting/TestHost/test/TestServerTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,8 @@ public async Task ManuallySetHostWinsOverInferredHostFromRequestUri(string uri)
848848
})
849849
.Build();
850850

851+
await host.StartAsync();
852+
851853
var server = host.GetTestServer();
852854
var client = server.CreateClient();
853855

‎src/Hosting/TestHost/test/WebSocketClientTests.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public async Task ConnectAsync_ShouldSetRequestProperties(string requestUri, str
4141
})
4242
.Build();
4343

44+
await host.StartAsync();
45+
4446
var testServer = host.GetTestServer();
4547
var client = testServer.CreateWebSocketClient();
4648

@@ -89,6 +91,8 @@ public async Task CanAcceptWebSocket()
8991
})
9092
.Build();
9193

94+
await host.StartAsync();
95+
9296
var testServer = host.GetTestServer();
9397
var client = testServer.CreateWebSocketClient();
9498

@@ -129,6 +133,8 @@ public async Task VerifyWebSocketAndUpgradeFeatures()
129133
})
130134
.Build();
131135

136+
await host.StartAsync();
137+
132138
var testServer = host.GetTestServer();
133139
var client = testServer.CreateWebSocketClient();
134140

0 commit comments

Comments
 (0)