Skip to content

Commit 3416927

Browse files
remcolamRemco Lam
andauthored
Fix some flaky integration tests (#2838)
Add usings to avoid resource contention. Co-authored-by: Remco Lam <[email protected]>
1 parent 5b62825 commit 3416927

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerIntegrationTests.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public async Task SwaggerEndpoint_ReturnsValidSwaggerJson(
3131
string swaggerRequestUri)
3232
{
3333
var testSite = new TestSite(startupType);
34-
var client = testSite.BuildClient();
34+
using var client = testSite.BuildClient();
3535

36-
var swaggerResponse = await client.GetAsync(swaggerRequestUri);
36+
using var swaggerResponse = await client.GetAsync(swaggerRequestUri);
3737

3838
swaggerResponse.EnsureSuccessStatusCode();
39-
var contentStream = await swaggerResponse.Content.ReadAsStreamAsync();
39+
using var contentStream = await swaggerResponse.Content.ReadAsStreamAsync();
4040
new OpenApiStreamReader().Read(contentStream, out OpenApiDiagnostic diagnostic);
4141
Assert.Empty(diagnostic.Errors);
4242
}
@@ -45,9 +45,9 @@ public async Task SwaggerEndpoint_ReturnsValidSwaggerJson(
4545
public async Task SwaggerEndpoint_ReturnsNotFound_IfUnknownSwaggerDocument()
4646
{
4747
var testSite = new TestSite(typeof(Basic.Startup));
48-
var client = testSite.BuildClient();
48+
using var client = testSite.BuildClient();
4949

50-
var swaggerResponse = await client.GetAsync("/swagger/v2/swagger.json");
50+
using var swaggerResponse = await client.GetAsync("/swagger/v2/swagger.json");
5151

5252
Assert.Equal(System.Net.HttpStatusCode.NotFound, swaggerResponse.StatusCode);
5353
}
@@ -56,9 +56,9 @@ public async Task SwaggerEndpoint_ReturnsNotFound_IfUnknownSwaggerDocument()
5656
public async Task SwaggerEndpoint_DoesNotReturnByteOrderMark()
5757
{
5858
var testSite = new TestSite(typeof(Basic.Startup));
59-
var client = testSite.BuildClient();
59+
using var client = testSite.BuildClient();
6060

61-
var swaggerResponse = await client.GetAsync("/swagger/v1/swagger.json");
61+
using var swaggerResponse = await client.GetAsync("/swagger/v1/swagger.json");
6262

6363
swaggerResponse.EnsureSuccessStatusCode();
6464
var contentBytes = await swaggerResponse.Content.ReadAsByteArrayAsync();
@@ -72,12 +72,12 @@ public async Task SwaggerEndpoint_DoesNotReturnByteOrderMark()
7272
public async Task SwaggerEndpoint_ReturnsCorrectPriceExample_ForDifferentCultures(string culture)
7373
{
7474
var testSite = new TestSite(typeof(Basic.Startup));
75-
var client = testSite.BuildClient();
75+
using var client = testSite.BuildClient();
7676

77-
var swaggerResponse = await client.GetAsync($"/swagger/v1/swagger.json?culture={culture}");
77+
using var swaggerResponse = await client.GetAsync($"/swagger/v1/swagger.json?culture={culture}");
7878

7979
swaggerResponse.EnsureSuccessStatusCode();
80-
var contentStream = await swaggerResponse.Content.ReadAsStreamAsync();
80+
using var contentStream = await swaggerResponse.Content.ReadAsStreamAsync();
8181
var currentCulture = CultureInfo.CurrentCulture;
8282
CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
8383
try
@@ -102,12 +102,12 @@ public async Task SwaggerMiddleware_CanBeConfiguredMultipleTimes(
102102
string expectedVersionProperty,
103103
string expectedVersionValue)
104104
{
105-
var client = new TestSite(typeof(Basic.Startup)).BuildClient();
105+
using var client = new TestSite(typeof(Basic.Startup)).BuildClient();
106106

107-
var response = await client.GetAsync(swaggerUrl);
107+
using var response = await client.GetAsync(swaggerUrl);
108108

109109
response.EnsureSuccessStatusCode();
110-
var contentStream = await response.Content.ReadAsStreamAsync();
110+
using var contentStream = await response.Content.ReadAsStreamAsync();
111111

112112
var json = await JsonSerializer.DeserializeAsync<JsonElement>(contentStream);
113113
Assert.Equal(expectedVersionValue, json.GetProperty(expectedVersionProperty).GetString());

0 commit comments

Comments
 (0)