feature(cop#97): XUnit v3 support

Author: jhartmann123

.github/workflows/pipeline.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: mcr.microsoft.com/dotnet/sdk:8.0
+    container: mcr.microsoft.com/dotnet/sdk:9.0
     steps:
     - uses: actions/checkout@v2
     - name: Restore dependencies

.gitlab-ci.yml

@@ -1,7 +1,10 @@
 include:
-  - project: 'fusonic/devops/images/gitlab-ci-tools'
-    file: 'dotnet_test.yml'
-    ref: '5.10'
+  - component: $CI_SERVER_FQDN/fusonic/devops/components/dotnet-test/dotnet-test@1.0.0
+    inputs:
+      sln-path: Extensions.sln
+  - component: $CI_SERVER_FQDN/fusonic/devops/components/dotnet-test/dotnet-check-warnings@1.0.0
+    inputs:
+      sln-path: Extensions.sln
   - project: "fusonic/devops/images/gitlab-ci-tools"
     file: "release_tool.yml"
     ref: "5.10"
@@ -12,7 +15,7 @@ stages:
   - publish
 
 variables:
-  BUILD_IMAGE: mcr.microsoft.com/dotnet/sdk:8.0
+  BUILD_IMAGE: mcr.microsoft.com/dotnet/sdk:9.0
 
 default:
   interruptible: true
@@ -38,28 +41,14 @@ build:
   rules:
     - when: always
 
-test:
-  stage: test
-  image: ${BUILD_IMAGE}
-  extends: .dotnet-test
+dotnet:test:
   services:
-    - name: postgres:15.4
+    - name: postgres:17
       alias: postgres
   variables:
     POSTGRES_PASSWORD: admin
-    BACKEND_SRC_DIR: src/**
-    SLN_PATH: Extensions.sln
     ConnectionStrings__Npgsql: Host=postgres;Database=test_npgsql;Username=postgres;Password=admin
     ConnectionStrings__Hangfire: Host=postgres;Database=test_hangfire;Username=postgres;Password=admin
-  rules:
-    - when: always
-
-dotnet:check-warnings:
-  stage: test
-  extends: .dotnet:check-warnings
-  image: ${BUILD_IMAGE}
-  variables:
-    SLN_PATH: Extensions.sln
 
 release:lint-merge-request:
   stage: test

README.md

@@ -10,7 +10,7 @@ The project on Github.com is updated on a daily basis, but does not include any
 If we see broader community engagement in the future, we may consider switching our primary development to Github.
 
 Fusonic Extensions follows the official yearly .NET release cycle.
-Latest Fusonic Extensions main branch targets .NET 8.0.
+Latest Fusonic Extensions main branch targets .NET 9.0.
 
 
 Packages

docs/UnitTests/README.md

@@ -122,18 +122,10 @@ The basic idea behind those is that every test gets its own database copy. This
 
 A test base for your database tests is available called `DatabaseUnitTest`. Type parameters are the test fixture optionally the `DbContext`. Example base classes in your test lib:
 ```cs
-public abstract class TestBase : TestBase<TestFixture>
-{
-    protected TestBase(TestFixture fixture) : base(fixture)
-    { }
-}
+public abstract class TestBase(TestFixture fixture) : TestBase<TestFixture>(fixture);
 
-public abstract class TestBase<TFixture> : DatabaseUnitTest<AppDbContext, TFixture>
-    where TFixture : TestFixture
-{
-    protected TestBase(TFixture fixture) : base(fixture)
-    { }
-}
+public abstract class TestBase<TFixture>(TFixture fixture) : DatabaseUnitTest<AppDbContext, TFixture>(fixture)
+    where TFixture : TestFixture;
 ```
 
 The `DatabaseUnitTest` provides the methods `Query` and `QueryAsync`. This is basically shortcut to resolving the `DbContext` and using it. So instead of writing
@@ -323,8 +315,8 @@ To solve this, you can either throttle your tests, or increase the max. connecti
 To increase the max. connections of your postgres test instance, just pass the parameter max_connections. Example for a docker compose file:
 ```yaml
 postgres_test:
-  image: postgres:14
-  command: -c max_connections=300
+  image: postgres:17
+  command: -c max_connections=500
   ports:
     - "5433:5432"
   volumes:
@@ -339,15 +331,15 @@ postgres_test:
 Alternatively, if you want to throttle your tests instead, you can to this easily with a semaphore in your test base:
 
 ```cs
-public class TestBase : IAsyncLifetime
-
+public class TestBase : IAsyncDisposable
+{
     private static readonly SemaphoreSlim Throttle = new(64);
     public async Task InitializeAsync() => await Throttle.WaitAsync();
 
-    public virtual Task DisposeAsync()
+    public ValueTask DisposeAsync()
     {
         _ = Throttle.Release();
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 }
 ```

src/AspNetCore/src/OpenTelemetry/MediatorTracer.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See LICENSE file in the project root for license information.
 
 using System.Diagnostics;
-using OpenTelemetry.Trace;
 
 namespace Fusonic.Extensions.AspNetCore.OpenTelemetry;
 
@@ -30,7 +29,7 @@ public static async Task<T> TraceRequest<T>(Type handlerType, string displayName
             if (activity != null)
             {
                 activity.SetStatus(ActivityStatusCode.Error, ex.Message);
-                activity.RecordException(ex);
+                activity.AddException(ex);
             }
 
             throw;

src/AspNetCore/test/AspNetCore.Tests.csproj

@@ -1,5 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
     <PropertyGroup>
+        <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
         <AssemblyName>Fusonic.Extensions.AspNetCore.Tests</AssemblyName>
         <RootNamespace>Fusonic.Extensions.AspNetCore.Tests</RootNamespace>
@@ -11,14 +12,17 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector">
+        <PackageReference Include="FluentAssertions" />
+        <PackageReference Include="FluentAssertions.Analyzers">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" />
+        <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
+        <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
         <PackageReference Include="NSubstitute" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.v3.core" />
+        <PackageReference Include="xunit.analyzers" />
         <PackageReference Include="xunit.runner.visualstudio">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/AspNetCore/test/Blazor/BlazorRenderingServiceTests.cs

@@ -4,9 +4,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Web;
-using FluentAssertions;
 using Fusonic.Extensions.AspNetCore.Blazor;
-using Xunit;
 
 namespace Fusonic.Extensions.AspNetCore.Tests.Blazor;
 

src/AspNetCore/test/Blazor/TestComponent.razor

@@ -1,5 +1,4 @@
 @using Fusonic.Extensions.AspNetCore.Blazor
-@using Fusonic.Extensions.AspNetCore.Razor
 
 <body>@Model.Name</body>
 

src/AspNetCore/test/Blazor/TestCultureComponent.razor

@@ -1,5 +1,4 @@
 @using Fusonic.Extensions.AspNetCore.Blazor
-@using Fusonic.Extensions.AspNetCore.Razor
 
 <html>
 <head>

src/AspNetCore/test/Http/CacheHeaderMiddlewareTests.cs

@@ -4,7 +4,6 @@
 using Fusonic.Extensions.AspNetCore.Http.Middlewares;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Net.Http.Headers;
-using Xunit;
 
 namespace Fusonic.Extensions.AspNetCore.Tests.Http;
 
@@ -17,25 +16,25 @@ public async Task SetDefaultHeaderIfNoSpecificRouteIsSet()
         var httpContext = new DefaultHttpContext();
         var nextCalled = false;
 
-        var middleware = new CacheHeaderMiddleware(new RequestDelegate(_ =>
+        var middleware = new CacheHeaderMiddleware(_ =>
         {
             nextCalled = true;
             return Task.CompletedTask;
-        }), new CacheHeaderOptions()
+        }, new CacheHeaderOptions
         {
             DefaultHeader = defaultHeader
         });
 
         await middleware.Invoke(httpContext);
-        Assert.Equal(defaultHeader, httpContext.Response.GetTypedHeaders().CacheControl);
-        Assert.True(nextCalled);
+        httpContext.Response.GetTypedHeaders().CacheControl.Should().Be(defaultHeader);
+        nextCalled.Should().BeTrue();
 
         // Does not override existing header
         nextCalled = false;
-        var newHeader = new CacheControlHeaderValue { NoCache = false, MaxAge = TimeSpan.FromDays(10) };
+        
         await middleware.Invoke(httpContext);
-        Assert.Equal(defaultHeader, httpContext.Response.GetTypedHeaders().CacheControl);
-        Assert.True(nextCalled);
+        httpContext.Response.GetTypedHeaders().CacheControl.Should().Be(defaultHeader);
+        nextCalled.Should().BeTrue();
     }
 
     [Fact]
@@ -56,21 +55,21 @@ public async Task SetRouteHeaderIfRouteMatches()
         });
 
         await middleware.Invoke(httpContext);
-        Assert.Equal(defaultHeader, httpContext.Response.GetTypedHeaders().CacheControl);
-        Assert.True(nextCalled);
+        httpContext.Response.GetTypedHeaders().CacheControl.Should().Be(defaultHeader);
+        nextCalled.Should().BeTrue();
 
         nextCalled = false;
         httpContext = new DefaultHttpContext();
         httpContext.Request.Path = "/MyFancyRoute/xyz/random";
         await middleware.Invoke(httpContext);
-        Assert.Equal(routeHeader, httpContext.Response.GetTypedHeaders().CacheControl);
-        Assert.True(nextCalled);
+        httpContext.Response.GetTypedHeaders().CacheControl.Should().Be(routeHeader);
+        nextCalled.Should().BeTrue();
 
         // Check route matching ignores case (Ordinal ignore case)
         httpContext = new DefaultHttpContext();
         httpContext.Request.Path = "/myFancyRoute/xyz/random";
         await middleware.Invoke(httpContext);
-        Assert.Equal(routeHeader, httpContext.Response.GetTypedHeaders().CacheControl);
+        httpContext.Response.GetTypedHeaders().CacheControl.Should().Be(routeHeader);
     }
 
     [Fact]
@@ -80,10 +79,10 @@ public void ConfigureValueForRoutes()
         var value = new CacheControlHeaderValue();
         options.ConfigureValueForRoutes(value, ["/a", "/b"]);
 
-        Assert.Equal(2, options.Routes.Count);
-        Assert.Equal(options.Routes["/a"], value);
-        Assert.Equal(options.Routes["/b"], value);
-        Assert.Null(options.DefaultHeader);
+        options.Routes.Should().HaveCount(2);
+        options.Routes["/a"].Should().Be(value);
+        options.Routes["/b"].Should().Be(value);
+        options.DefaultHeader.Should().BeNull();
     }
 
     [Fact]
@@ -93,9 +92,9 @@ public void ConfigureNoCacheForRoutes()
         options.ConfigureNoCacheForRoutes(["/a", "/b"]);
 
         var noCache = new CacheControlHeaderValue { NoStore = true, NoCache = true };
-        Assert.Equal(2, options.Routes.Count);
-        Assert.Equal(noCache, options.Routes["/a"]);
-        Assert.Equal(noCache, options.Routes["/b"]);
-        Assert.Null(options.DefaultHeader);
+        options.Routes.Should().HaveCount(2);
+        options.Routes["/a"].Should().Be(noCache);
+        options.Routes["/b"].Should().Be(noCache);
+        options.DefaultHeader.Should().BeNull();
     }
 }