fix: Updated TUnit implementation

samtrion · samtrion · commit 4495e080582f · 2025-08-18T13:45:47.000+02:00
diff --git a/src/NetEvolve.Extensions.TUnit/Internal/CategoryTraitBaseAttribute.cs b/src/NetEvolve.Extensions.TUnit/Internal/CategoryTraitBaseAttribute.cs
@@ -1,6 +1,7 @@
 ﻿namespace NetEvolve.Extensions.TUnit.Internal;
 
 using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
 using global::TUnit.Core.Interfaces;
 
 /// <summary>
@@ -15,20 +16,25 @@ public abstract class CategoryTraitBaseAttribute : Attribute, ITestDiscoveryEven
     /// </summary>
     public string Category { get; }
 
+    /// <inheritdoc cref="IEventReceiver.Order" />
+    public int Order => 0;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="CategoryTraitBaseAttribute"/> class.
     /// </summary>
     /// <param name="category"></param>
     protected CategoryTraitBaseAttribute(string category) => Category = category;
 
     /// <inheritdoc/>
-    public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)
+    public ValueTask OnTestDiscovered(DiscoveredTestContext context)
     {
-        if (discoveredTestContext is null)
+        if (context is null)
         {
-            return;
+            return ValueTask.CompletedTask;
         }
 
-        discoveredTestContext.AddCategory(Category);
+        context.AddCategory(Category);
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/NetEvolve.Extensions.TUnit/Internal/CategoryWithIdTraitBaseAttribute.cs b/src/NetEvolve.Extensions.TUnit/Internal/CategoryWithIdTraitBaseAttribute.cs
@@ -1,5 +1,7 @@
 ﻿namespace NetEvolve.Extensions.TUnit.Internal;
 
+using System.Threading.Tasks;
+using global::TUnit.Core;
 using global::TUnit.Core.Interfaces;
 
 /// <summary>
@@ -31,6 +33,9 @@ public abstract class CategoryWithIdTraitBaseAttribute : Attribute, ITestDiscove
     /// </summary>
     public string? Id { get; }
 
+    /// <inheritdoc cref="IEventReceiver.Order" />
+    public int Order => 0;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="CategoryWithIdTraitBaseAttribute"/> class.
     /// </summary>
@@ -54,17 +59,19 @@ protected CategoryWithIdTraitBaseAttribute(string category, long id)
     }
 
     /// <inheritdoc/>
-    public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)
+    public ValueTask OnTestDiscovered(DiscoveredTestContext context)
     {
-        if (discoveredTestContext is null)
+        if (context is null)
         {
-            return;
+            return ValueTask.CompletedTask;
         }
 
-        discoveredTestContext.AddCategory(Category);
+        context.AddCategory(Category);
         if (!string.IsNullOrWhiteSpace(Id))
         {
-            discoveredTestContext.AddProperty(Category, Id);
+            context.AddProperty(Category, Id);
         }
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/src/NetEvolve.Extensions.TUnit/Internal/NamedCategoryTraitBaseAttribute.cs b/src/NetEvolve.Extensions.TUnit/Internal/NamedCategoryTraitBaseAttribute.cs
@@ -17,6 +17,9 @@ public abstract class NamedCategoryTraitBaseAttribute : Attribute, ITestDiscover
     /// </summary>
     public string Id { get; }
 
+    /// <inheritdoc cref="IEventReceiver.Order" />
+    public int Order => 0;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="NamedCategoryTraitBaseAttribute"/> class.
     /// </summary>
@@ -29,16 +32,18 @@ protected NamedCategoryTraitBaseAttribute(string category, string id)
     }
 
     /// <inheritdoc/>
-    public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)
+    public ValueTask OnTestDiscovered(DiscoveredTestContext context)
     {
-        if (discoveredTestContext is null)
+        if (context is null)
         {
-            return;
+            return ValueTask.CompletedTask;
         }
 
         if (!string.IsNullOrWhiteSpace(Id))
         {
-            discoveredTestContext.AddProperty(Category, Id);
+            context.AddProperty(Category, Id);
         }
+
+        return ValueTask.CompletedTask;
     }
 }
diff --git a/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.MSTest.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.MSTest.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.NUnit.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.NUnit.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet8_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet8_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt
@@ -87,6 +87,7 @@ namespace NetEvolve.Extensions.TUnit.Internal
     {
         protected CategoryTraitBaseAttribute(string category) { }
         public string Category { get; }
+        public int Order { get; }
         public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
     }
     public abstract class CategoryWithIdTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver
@@ -95,13 +96,15 @@ namespace NetEvolve.Extensions.TUnit.Internal
         protected CategoryWithIdTraitBaseAttribute(string category, string? id) { }
         public string Category { get; }
         public string? Id { get; }
+        public int Order { get; }
         public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
     }
     public abstract class NamedCategoryTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver
     {
         protected NamedCategoryTraitBaseAttribute(string category, string id) { }
         public string Category { get; }
         public string Id { get; }
+        public int Order { get; }
         public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
     }
 }
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet9_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt b/tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/_snapshots/DotNet9_0/PublicApiTests.PublicApi_HasNotChanged_Expected.verified.txt
@@ -87,6 +87,7 @@ namespace NetEvolve.Extensions.TUnit.Internal
     {
         protected CategoryTraitBaseAttribute(string category) { }
         public string Category { get; }
+        public int Order { get; }
         public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
     }
     public abstract class CategoryWithIdTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver
@@ -95,13 +96,15 @@ namespace NetEvolve.Extensions.TUnit.Internal
         protected CategoryWithIdTraitBaseAttribute(string category, string? id) { }
         public string Category { get; }
         public string? Id { get; }
+        public int Order { get; }
         public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
     }
     public abstract class NamedCategoryTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver
     {
         protected NamedCategoryTraitBaseAttribute(string category, string id) { }
         public string Category { get; }
         public string Id { get; }
+        public int Order { get; }
         public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }
     }
 }
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.Unit/AttributeTestsBase.cs b/tests/NetEvolve.Extensions.TUnit.Tests.Unit/AttributeTestsBase.cs
@@ -19,7 +19,7 @@ protected static IEnumerable<KeyValuePair<string, string>> GetTraits([CallerMemb
 
         var context = TestContext.Current;
 
-        return GetCategories(context).Union(GetProperties(context)).Distinct().ToList();
+        return [.. GetCategories(context).Union(GetProperties(context)).Distinct()];
     }
 
     private static IEnumerable<KeyValuePair<string, string>> GetCategories(TestContext context) =>
diff --git a/tests/NetEvolve.Extensions.TUnit.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.TUnit.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.XUnit.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.XUnit.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs b/tests/NetEvolve.Extensions.XUnit.Tests.Unit/AttributeTestsBase.cs
@@ -40,15 +40,17 @@ protected IEnumerable<KeyValuePair<string, string>> GetTraits([CallerMemberName]
         }
 
         var messageSink = new NullMessageSink();
-        return GetTraits(methodInfo.CustomAttributes, messageSink)
-            .Union(GetTraits(classType.CustomAttributes, messageSink))
-            .Union(GetTraits(classType.Assembly.CustomAttributes, messageSink))
-            .Distinct()
-            .Where(kvp =>
-                !kvp.Key.Equals("TestGroup", StringComparison.OrdinalIgnoreCase)
-                && !kvp.Value.Equals("TestGroup", StringComparison.OrdinalIgnoreCase)
-            )
-            .ToList();
+        return
+        [
+            .. GetTraits(methodInfo.CustomAttributes, messageSink)
+                .Union(GetTraits(classType.CustomAttributes, messageSink))
+                .Union(GetTraits(classType.Assembly.CustomAttributes, messageSink))
+                .Distinct()
+                .Where(kvp =>
+                    !kvp.Key.Equals("TestGroup", StringComparison.OrdinalIgnoreCase)
+                    && !kvp.Value.Equals("TestGroup", StringComparison.OrdinalIgnoreCase)
+                ),
+        ];
     }
 
     private static List<KeyValuePair<string, string>> GetTraits(
diff --git a/tests/NetEvolve.Extensions.XUnit.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.XUnit.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/Predefined.cs b/tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);
diff --git a/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/Predefined.cs b/tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/Predefined.cs
@@ -11,7 +11,7 @@ internal static class Predefined
     public static void Init()
     {
         Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+            (__, projectDirectory, type, method) =>
             {
                 var directory = Path.Combine(projectDirectory, "..", "_snapshots", Namer.TargetFrameworkNameAndVersion);
                 _ = Directory.CreateDirectory(directory);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`namespace NetEvolve.Extensions.TUnit.Internal;`
`2`	`2`
	`3`	`+using System.Threading.Tasks;`
	`4`	`+using global::TUnit.Core;`
`3`	`5`	`using global::TUnit.Core.Interfaces;`
`4`	`6`
`5`	`7`	`/// <summary>`
`@@ -31,6 +33,9 @@ public abstract class CategoryWithIdTraitBaseAttribute : Attribute, ITestDiscove`
`31`	`33`	`/// </summary>`
`32`	`34`	`public string? Id { get; }`
`33`	`35`
	`36`	`+ /// <inheritdoc cref="IEventReceiver.Order" />`
	`37`	`+ public int Order => 0;`
	`38`	`+`
`34`	`39`	`/// <summary>`
`35`	`40`	`/// Initializes a new instance of the <see cref="CategoryWithIdTraitBaseAttribute"/> class.`
`36`	`41`	`/// </summary>`
`@@ -54,17 +59,19 @@ protected CategoryWithIdTraitBaseAttribute(string category, long id)`
`54`	`59`	`}`
`55`	`60`
`56`	`61`	`/// <inheritdoc/>`
`57`		`- public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)`
	`62`	`+ public ValueTask OnTestDiscovered(DiscoveredTestContext context)`
`58`	`63`	`{`
`59`		`- if (discoveredTestContext is null)`
	`64`	`+ if (context is null)`
`60`	`65`	`{`
`61`		`- return;`
	`66`	`+ return ValueTask.CompletedTask;`
`62`	`67`	`}`
`63`	`68`
`64`		`- discoveredTestContext.AddCategory(Category);`
	`69`	`+ context.AddCategory(Category);`
`65`	`70`	`if (!string.IsNullOrWhiteSpace(Id))`
`66`	`71`	`{`
`67`		`- discoveredTestContext.AddProperty(Category, Id);`
	`72`	`+ context.AddProperty(Category, Id);`
`68`	`73`	`}`
	`74`	`+`
	`75`	`+ return ValueTask.CompletedTask;`
`69`	`76`	`}`
`70`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ public abstract class NamedCategoryTraitBaseAttribute : Attribute, ITestDiscover`
`17`	`17`	`/// </summary>`
`18`	`18`	`public string Id { get; }`
`19`	`19`
	`20`	`+ /// <inheritdoc cref="IEventReceiver.Order" />`
	`21`	`+ public int Order => 0;`
	`22`	`+`
`20`	`23`	`/// <summary>`
`21`	`24`	`/// Initializes a new instance of the <see cref="NamedCategoryTraitBaseAttribute"/> class.`
`22`	`25`	`/// </summary>`
`@@ -29,16 +32,18 @@ protected NamedCategoryTraitBaseAttribute(string category, string id)`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`/// <inheritdoc/>`
`32`		`- public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)`
	`35`	`+ public ValueTask OnTestDiscovered(DiscoveredTestContext context)`
`33`	`36`	`{`
`34`		`- if (discoveredTestContext is null)`
	`37`	`+ if (context is null)`
`35`	`38`	`{`
`36`		`- return;`
	`39`	`+ return ValueTask.CompletedTask;`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`if (!string.IsNullOrWhiteSpace(Id))`
`40`	`43`	`{`
`41`		`- discoveredTestContext.AddProperty(Category, Id);`
	`44`	`+ context.AddProperty(Category, Id);`
`42`	`45`	`}`
	`46`	`+`
	`47`	`+ return ValueTask.CompletedTask;`
`43`	`48`	`}`
`44`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ internal static class Predefined`
`11`	`11`	`public static void Init()`
`12`	`12`	`{`
`13`	`13`	`Verifier.DerivePathInfo(`
`14`		`- (sourceFile, projectDirectory, type, method) =>`
	`14`	`+ (__, projectDirectory, type, method) =>`
`15`	`15`	`{`
`16`	`16`	`var directory = Path.Combine(projectDirectory, "_snapshots", Namer.TargetFrameworkNameAndVersion);`
`17`	`17`	`_ = Directory.CreateDirectory(directory);`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ namespace NetEvolve.Extensions.TUnit.Internal`
`87`	`87`	`{`
`88`	`88`	`protected CategoryTraitBaseAttribute(string category) { }`
`89`	`89`	`public string Category { get; }`
	`90`	`+ public int Order { get; }`
`90`	`91`	`public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }`
`91`	`92`	`}`
`92`	`93`	`public abstract class CategoryWithIdTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver`
`@@ -95,13 +96,15 @@ namespace NetEvolve.Extensions.TUnit.Internal`
`95`	`96`	`protected CategoryWithIdTraitBaseAttribute(string category, string? id) { }`
`96`	`97`	`public string Category { get; }`
`97`	`98`	`public string? Id { get; }`
	`99`	`+ public int Order { get; }`
`98`	`100`	`public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }`
`99`	`101`	`}`
`100`	`102`	`public abstract class NamedCategoryTraitBaseAttribute : System.Attribute, TUnit.Core.Interfaces.IEventReceiver, TUnit.Core.Interfaces.ITestDiscoveryEventReceiver`
`101`	`103`	`{`
`102`	`104`	`protected NamedCategoryTraitBaseAttribute(string category, string id) { }`
`103`	`105`	`public string Category { get; }`
`104`	`106`	`public string Id { get; }`
	`107`	`+ public int Order { get; }`
`105`	`108`	`public void OnTestDiscovery(TUnit.Core.DiscoveredTestContext discoveredTestContext) { }`
`106`	`109`	`}`
`107`	`110`	`}`