Skip to content

✅ consequence changes af xunit extensions v10 #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gimlichael merged 1 commit into from
Apr 13, 2025
Merged

✅ consequence changes af xunit extensions v10 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<ItemGroup>
<PackageVersion Include="AutoFixture" Version="4.18.1" />
<PackageVersion Include="Backport.System.Threading.Lock" Version="3.1.4" />
<PackageVersion Include="Codebelt.Extensions.Xunit" Version="9.1.3" />
<PackageVersion Include="Codebelt.Extensions.Xunit.Hosting" Version="9.1.3" />
<PackageVersion Include="Codebelt.Extensions.Xunit.Hosting.AspNetCore" Version="9.1.3" />
<PackageVersion Include="Codebelt.Extensions.Xunit" Version="10.0.0" />
<PackageVersion Include="Codebelt.Extensions.Xunit.Hosting" Version="10.0.0" />
<PackageVersion Include="Codebelt.Extensions.Xunit.Hosting.AspNetCore" Version="10.0.0" />
<PackageVersion Include="Codebelt.Extensions.YamlDotNet" Version="9.0.0" />
<PackageVersion Include="Meziantou.Xunit.ParallelTestFramework" Version="2.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
Expand Down
9 changes: 4 additions & 5 deletions test/Cuemon.AspNetCore.Authentication.Tests/Basic/BasicAuthenticationHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ public async Task HandleAuthenticateAsync_ShouldReturnContent()
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
},
hostFixture: null))
}))
{
var client = webApp.Host.GetTestClient();
var bb = new BasicAuthorizationHeaderBuilder()
Expand Down Expand Up @@ -93,9 +92,9 @@ public async Task HandleAuthenticateAsync_ShouldReturn401WithUnauthorizedMessage
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var options = webApp.ServiceProvider.GetRequiredScopedService<IOptionsSnapshot<BasicAuthenticationOptions>>().Get(BasicAuthorizationHeader.Scheme);
var options = webApp.Host.Services.GetRequiredScopedService<IOptionsSnapshot<BasicAuthenticationOptions>>().Get(BasicAuthorizationHeader.Scheme);
var client = webApp.Host.GetTestClient();

var result = await client.GetAsync("/fake");
Expand Down Expand Up @@ -141,7 +140,7 @@ public async Task HandleAuthenticateAsync_EnsureAnonymousIsWorking()
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var client = webApp.Host.GetTestClient();

Expand Down
18 changes: 9 additions & 9 deletions test/Cuemon.AspNetCore.Authentication.Tests/Basic/BasicAuthenticationMiddlewareTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ public async Task InvokeAsync_ShouldThrowUnauthorizedException_InvalidCredential
}, app =>
{
app.UseBasicAuthentication();
}, hostFixture: null))
}))
{
var context = middleware.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.ServiceProvider.GetRequiredService<IOptions<BasicAuthenticationOptions>>();
var context = middleware.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.Host.Services.GetRequiredService<IOptions<BasicAuthenticationOptions>>();
var pipeline = middleware.Application.Build();

var ue = await Assert.ThrowsAsync<UnauthorizedException>(async () => await pipeline(context));
Expand Down Expand Up @@ -78,10 +78,10 @@ public async Task InvokeAsync_ShouldCaptureUnauthorizedException_InvalidCredenti
{
app.UseFaultDescriptorExceptionHandler();
app.UseBasicAuthentication();
}, hostFixture: null))
}))
{
var context = middleware.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.ServiceProvider.GetRequiredService<IOptions<BasicAuthenticationOptions>>();
var context = middleware.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.Host.Services.GetRequiredService<IOptions<BasicAuthenticationOptions>>();
var pipeline = middleware.Application.Build();

var bb = new BasicAuthorizationHeaderBuilder()
Expand Down Expand Up @@ -130,10 +130,10 @@ public async Task InvokeAsync_ShouldAuthenticateWhenApplyingAuthorizationHeader(
context.Response.StatusCode = 200;
return Task.CompletedTask;
});
}, hostFixture: null))
}))
{
var context = middleware.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.ServiceProvider.GetRequiredService<IOptions<BasicAuthenticationOptions>>();
var context = middleware.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.Host.Services.GetRequiredService<IOptions<BasicAuthenticationOptions>>();
var pipeline = middleware.Application.Build();

var ue = await Assert.ThrowsAsync<UnauthorizedException>(async () => await pipeline(context));
Expand Down
18 changes: 9 additions & 9 deletions test/Cuemon.AspNetCore.Authentication.Tests/Digest/DigestAccessAuthenticationHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ public async Task HandleAuthenticateAsync_ShouldReturnContent_WithQopAuthenticat
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{

var options = webApp.ServiceProvider.GetRequiredScopedService<IOptionsSnapshot<DigestAuthenticationOptions>>().Get(DigestAuthorizationHeader.Scheme);
var options = webApp.Host.Services.GetRequiredScopedService<IOptionsSnapshot<DigestAuthenticationOptions>>().Get(DigestAuthorizationHeader.Scheme);
var client = webApp.Host.GetTestClient();

var result = await client.GetAsync("/fake");
Expand Down Expand Up @@ -135,10 +135,10 @@ public async Task HandleAuthenticateAsync_ShouldReturnContent_QopAuthenticationI
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{

var options = webApp.ServiceProvider.GetRequiredScopedService<IOptionsSnapshot<DigestAuthenticationOptions>>().Get(DigestAuthorizationHeader.Scheme);
var options = webApp.Host.Services.GetRequiredScopedService<IOptionsSnapshot<DigestAuthenticationOptions>>().Get(DigestAuthorizationHeader.Scheme);
var client = webApp.Host.GetTestClient();

var result = await client.GetAsync("/fake");
Expand Down Expand Up @@ -214,10 +214,10 @@ public async Task HandleAuthenticateAsync_ShouldReturnContent_WithServerSideHa1S
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{

var options = webApp.ServiceProvider.GetRequiredScopedService<IOptionsSnapshot<DigestAuthenticationOptions>>().Get(DigestAuthorizationHeader.Scheme);
var options = webApp.Host.Services.GetRequiredScopedService<IOptionsSnapshot<DigestAuthenticationOptions>>().Get(DigestAuthorizationHeader.Scheme);
var client = webApp.Host.GetTestClient();

var result = await client.GetAsync("/fake");
Expand Down Expand Up @@ -289,9 +289,9 @@ public async Task HandleAuthenticateAsync_ShouldReturn401WithUnauthorizedMessage
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var options = webApp.ServiceProvider.GetRequiredScopedService<IOptionsSnapshot<DigestAuthenticationOptions>>().Get(DigestAuthorizationHeader.Scheme);
var options = webApp.Host.Services.GetRequiredScopedService<IOptionsSnapshot<DigestAuthenticationOptions>>().Get(DigestAuthorizationHeader.Scheme);
var client = webApp.Host.GetTestClient();

var result = await client.GetAsync("/fake");
Expand Down Expand Up @@ -331,7 +331,7 @@ public async Task HandleAuthenticateAsync_EnsureAnonymousIsWorking()
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var client = webApp.Host.GetTestClient();

Expand Down
24 changes: 12 additions & 12 deletions ...Cuemon.AspNetCore.Authentication.Tests/Digest/DigestAccessAuthenticationMiddlewareTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ public async Task InvokeAsync_ShouldNotBeAuthenticated()
{
app.UseExceptionMiddleware();
app.UseDigestAccessAuthentication();
}, hostFixture: null))
}))
{
var context = middleware.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.ServiceProvider.GetRequiredService<IOptions<DigestAuthenticationOptions>>();
var context = middleware.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.Host.Services.GetRequiredService<IOptions<DigestAuthenticationOptions>>();
var pipeline = middleware.Application.Build();

var ue = await Assert.ThrowsAsync<UnauthorizedException>(async () => await pipeline(context));
Expand Down Expand Up @@ -101,10 +101,10 @@ public async Task InvokeAsync_ShouldAuthenticateWhenApplyingAuthorizationHeader(
context.Response.StatusCode = 200;
return Task.CompletedTask;
});
}, hostFixture: null))
}))
{
var context = middleware.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.ServiceProvider.GetRequiredService<IOptions<DigestAuthenticationOptions>>();
var context = middleware.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.Host.Services.GetRequiredService<IOptions<DigestAuthenticationOptions>>();
var pipeline = middleware.Application.Build();

var ue = await Assert.ThrowsAsync<UnauthorizedException>(async () => await pipeline(context));
Expand Down Expand Up @@ -178,10 +178,10 @@ public async Task InvokeAsync_ShouldAuthenticateWhenApplyingAuthorizationHeaderN
context.Response.StatusCode = 200;
return Task.CompletedTask;
});
}, hostFixture: null))
}))
{
var context = middleware.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.ServiceProvider.GetRequiredService<IOptions<DigestAuthenticationOptions>>();
var context = middleware.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.Host.Services.GetRequiredService<IOptions<DigestAuthenticationOptions>>();
var pipeline = middleware.Application.Build();

var ue = await Assert.ThrowsAsync<UnauthorizedException>(async () => await pipeline(context));
Expand Down Expand Up @@ -253,10 +253,10 @@ public async Task InvokeAsync_ShouldAuthenticateWhenApplyingAuthorizationHeaderW
context.Response.StatusCode = 200;
return Task.CompletedTask;
});
}, hostFixture: null))
}))
{
var context = middleware.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.ServiceProvider.GetRequiredService<IOptions<DigestAuthenticationOptions>>();
var context = middleware.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.Host.Services.GetRequiredService<IOptions<DigestAuthenticationOptions>>();
var pipeline = middleware.Application.Build();

var ue = await Assert.ThrowsAsync<UnauthorizedException>(async () => await pipeline(context));
Expand Down
8 changes: 4 additions & 4 deletions test/Cuemon.AspNetCore.Authentication.Tests/Hmac/HmacAuthenticationHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public async Task HandleAuthenticateAsync_ShouldReturnContent()
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var client = webApp.Host.GetTestClient();

Expand Down Expand Up @@ -126,9 +126,9 @@ public async Task HandleAuthenticateAsync_ShouldReturn401WithUnauthorizedMessage
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var options = webApp.ServiceProvider.GetRequiredScopedService<IOptionsSnapshot<HmacAuthenticationOptions>>().Get(AuthenticationScheme);
var options = webApp.Host.Services.GetRequiredScopedService<IOptionsSnapshot<HmacAuthenticationOptions>>().Get(AuthenticationScheme);
var client = webApp.Host.GetTestClient();

client.DefaultRequestHeaders.Add(HeaderNames.Date, DateTime.UtcNow.ToString("R"));
Expand Down Expand Up @@ -183,7 +183,7 @@ public async Task HandleAuthenticateAsync_EnsureAnonymousIsWorking()
app.UseAuthorization();

app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var client = webApp.Host.GetTestClient();

Expand Down
6 changes: 3 additions & 3 deletions test/Cuemon.AspNetCore.Authentication.Tests/Hmac/HmacAuthenticationMiddlewareTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public async Task InvokeAsync_ShouldAuthenticateWhenApplyingAuthorizationHeader(
context.Response.StatusCode = 200;
return Task.CompletedTask;
});
}, hostFixture: null))
}))
{
var context = middleware.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.ServiceProvider.GetRequiredService<IOptions<HmacAuthenticationOptions>>();
var context = middleware.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;
var options = middleware.Host.Services.GetRequiredService<IOptions<HmacAuthenticationOptions>>();
var pipeline = middleware.Application.Build();

var ue = await Assert.ThrowsAsync<UnauthorizedException>(async () => await pipeline(context));
Expand Down
4 changes: 2 additions & 2 deletions test/Cuemon.AspNetCore.Authentication.Tests/Hmac/HmacAuthorizationHeaderBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public HmacAuthorizationHeaderBuilderTest(ITestOutputHelper output) : base(outpu
[Fact]
public void Build_ShouldGenerateValidAuthorizationHeader()
{
using var mw = WebHostTestFactory.Create(hostFixture: null);
var context = mw.ServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext;
using var mw = WebHostTestFactory.Create();
var context = mw.Host.Services.GetRequiredService<IHttpContextAccessor>().HttpContext;

var timestamp = DateTime.Parse("2022-07-10T12:50:42.2737531Z", CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind);

Expand Down
8 changes: 4 additions & 4 deletions test/Cuemon.AspNetCore.FunctionalTests/Diagnostics/ApplicationBuilderExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public async Task UseFaultDescriptorExceptionHandler_ShouldCaptureException_Rend
{
client.DefaultRequestHeaders.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json"));
return client.GetAsync("/");
}, hostFixture: null);
});

var body = await response.Content.ReadAsStringAsync();

Expand Down Expand Up @@ -342,7 +342,7 @@ public async Task UseFaultDescriptorExceptionHandler_ShouldCaptureException_Rend
{
client.DefaultRequestHeaders.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json"));
return client.GetAsync("/");
}, hostFixture: null);
});

var body = await response.Content.ReadAsStringAsync();

Expand Down Expand Up @@ -600,7 +600,7 @@ public async Task UseFaultDescriptorExceptionHandler_ShouldCaptureException_Rend
{
client.DefaultRequestHeaders.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
return client.GetAsync("/");
}, hostFixture: null);
});

var body = await response.Content.ReadAsStringAsync();

Expand Down Expand Up @@ -690,7 +690,7 @@ public async Task UseFaultDescriptorExceptionHandler_ShouldCaptureException_Rend
{
client.DefaultRequestHeaders.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
return client.GetAsync("/");
}, hostFixture: null);
});

var body = await response.Content.ReadAsStringAsync();

Expand Down
8 changes: 4 additions & 4 deletions test/Cuemon.AspNetCore.Mvc.FunctionalTests/Filters/Diagnostics/FaultDescriptorFilterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public async Task OnException_ShouldCaptureException_RenderAsProblemDetails_Usin
{
client.DefaultRequestHeaders.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json"));
return client.GetAsync("/statuscodes/XXX/serverError");
}, hostFixture: null);
});

var body = await response.Content.ReadAsStringAsync();
TestOutput.WriteLine(body);
Expand Down Expand Up @@ -311,7 +311,7 @@ public async Task OnException_ShouldCaptureException_RenderAsDefault_UsingJson(F
{
client.DefaultRequestHeaders.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json"));
return client.GetAsync("/statuscodes/XXX/serverError");
}, hostFixture: null);
});

var body = await response.Content.ReadAsStringAsync();
TestOutput.WriteLine(body);
Expand Down Expand Up @@ -584,7 +584,7 @@ public async Task OnException_ShouldCaptureException_RenderAsProblemDetails_Usin
{
client.DefaultRequestHeaders.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
return client.GetAsync("/statuscodes/XXX/serverError");
}, hostFixture: null);
});

var body = await response.Content.ReadAsStringAsync();
TestOutput.WriteLine(body);
Expand Down Expand Up @@ -831,7 +831,7 @@ public async Task OnException_ShouldCaptureException_RenderAsDefault_UsingXml(Fa
{
client.DefaultRequestHeaders.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/xml"));
return client.GetAsync("/statuscodes/XXX/serverError");
}, hostFixture: null);
});

var body = await response.Content.ReadAsStringAsync();
TestOutput.WriteLine(body);
Expand Down
4 changes: 2 additions & 2 deletions test/Cuemon.AspNetCore.Mvc.Tests/Filters/Cacheable/HttpCacheableFilterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public async Task GetEtag_ShouldReturnOkWithEtagAndSubsequentlyNotModified(strin
{
app.UseRouting();
app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var client = filter.Host.GetTestClient();
var result = await client.GetAsync(relativeEndpoint);
Expand Down Expand Up @@ -64,7 +64,7 @@ public async Task GetLastModified_ShouldReturnOkWithLastModifiedAndSubsequentlyN
{
app.UseRouting();
app.UseEndpoints(routes => { routes.MapControllers(); });
}, hostFixture: null))
}))
{
var client = filter.Host.GetTestClient();
var result = await client.GetAsync("/fake/getCacheByLastModified");
Expand Down
Loading
Loading