ParallelGroup Order Property (#1825)

* ParallelGroup Order Property * Equality members
thomhurst · Feb 12, 2025 · 8c96327 · 8c96327
1 parent 1164f6c
commit 8c96327
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/TUnit.Core/Attributes/ParallelGroupAttribute.cs b/TUnit.Core/Attributes/ParallelGroupAttribute.cs
@@ -4,12 +4,14 @@ namespace TUnit.Core;
 
 public class ParallelGroupAttribute(string group) : TUnitAttribute, ITestDiscoveryEventReceiver
 {
-    public int Order => 0;
+    int IEventReceiver.Order => 0;
+
+    public int Order { get; set; }
 
     public string Group { get; } = group;
 
     public void OnTestDiscovery(DiscoveredTestContext discoveredTestContext)
     {
-        discoveredTestContext.SetParallelConstraint(new ParallelGroupConstraint(Group));
+        discoveredTestContext.SetParallelConstraint(new ParallelGroupConstraint(Group, Order));
     }
 }
diff --git a/TUnit.Core/ParallelGroupConstraint.cs b/TUnit.Core/ParallelGroupConstraint.cs
@@ -2,10 +2,30 @@
 
 namespace TUnit.Core;
 
-public record ParallelGroupConstraint(string Group) : IParallelConstraint,
+public record ParallelGroupConstraint(string Group, int Order) : IParallelConstraint,
     IComparable<ParallelGroupConstraint>,
     IComparable
 {
+    public virtual bool Equals(ParallelGroupConstraint? other)
+    {
+        if (other is null)
+        {
+            return false;
+        }
+
+        if (ReferenceEquals(this, other))
+        {
+            return true;
+        }
+
+        return Group == other.Group;
+    }
+
+    public override int GetHashCode()
+    {
+        return Group.GetHashCode();
+    }
+
     public int CompareTo(ParallelGroupConstraint? other)
     {
         return string.Compare(Group, other?.Group, StringComparison.Ordinal);

diff --git a/TUnit.Engine/Extensions/TestContextExtensions.cs b/TUnit.Engine/Extensions/TestContextExtensions.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 using Microsoft.Testing.Platform.Extensions.TestFramework;
@@ -64,7 +65,7 @@ await testContext.GetService<TestRegistrar>().RegisterInstance(newTest,
             Parallel = [newTest],
             NotInParallel = new PriorityQueue<DiscoveredTest, int>(),
             KeyedNotInParallel = new Dictionary<ConstraintKeysCollection, PriorityQueue<DiscoveredTest, int>>(),
-            ParallelGroups = new Dictionary<string, List<DiscoveredTest>>()
+            ParallelGroups = new ConcurrentDictionary<ParallelGroupConstraint, List<DiscoveredTest>>()
         }, null, testContext.GetService<ExecuteRequestContext>());
     }
 

diff --git a/TUnit.Engine/Models/GroupedTests.cs b/TUnit.Engine/Models/GroupedTests.cs
@@ -1,4 +1,5 @@
-using TUnit.Core;
+using System.Collections.Concurrent;
+using TUnit.Core;
 
 namespace TUnit.Engine.Models;
 
@@ -8,5 +9,5 @@ internal record GroupedTests
     public required PriorityQueue<DiscoveredTest, int> NotInParallel { get; init; }
     public required IDictionary<ConstraintKeysCollection, PriorityQueue<DiscoveredTest, int>> KeyedNotInParallel { get; init; }
     public required IList<DiscoveredTest> Parallel { get; init; }
-    public required IDictionary<string, List<DiscoveredTest>> ParallelGroups { get; set; }
+    public required ConcurrentDictionary<ParallelGroupConstraint, List<DiscoveredTest>> ParallelGroups { get; set; }
 }
diff --git a/TUnit.Engine/Services/TestGrouper.cs b/TUnit.Engine/Services/TestGrouper.cs
@@ -11,7 +11,7 @@ public GroupedTests OrganiseTests(IReadOnlyCollection<DiscoveredTest> testCases)
         var notInParallel = new PriorityQueue<DiscoveredTest, int>();
         var keyedNotInParallel = new ConcurrentDictionary<ConstraintKeysCollection, PriorityQueue<DiscoveredTest, int>>();
         var parallel = new List<DiscoveredTest>();
-        var parallelGroups = new ConcurrentDictionary<string, List<DiscoveredTest>>();
+        var parallelGroups = new ConcurrentDictionary<ParallelGroupConstraint, List<DiscoveredTest>>();
 
         foreach (var discoveredTest in testCases)
         {
@@ -35,7 +35,7 @@ public GroupedTests OrganiseTests(IReadOnlyCollection<DiscoveredTest> testCases)
             }
             else if (discoveredTest.TestDetails.ParallelConstraint is ParallelGroupConstraint parallelGroupConstraint)
             {
-                parallelGroups.GetOrAdd(parallelGroupConstraint.Group, _ => []).Add(discoveredTest);
+                parallelGroups.GetOrAdd(parallelGroupConstraint, _ => []).Add(discoveredTest);
             }
             else
             {

diff --git a/TUnit.Engine/Services/TestsExecutor.cs b/TUnit.Engine/Services/TestsExecutor.cs
@@ -1,4 +1,5 @@
-using EnumerableAsyncProcessor.Extensions;
+using System.Collections.Concurrent;
+using EnumerableAsyncProcessor.Extensions;
 using Microsoft.Testing.Platform.CommandLine;
 using Microsoft.Testing.Platform.Extensions.TestFramework;
 using Microsoft.Testing.Platform.Requests;
@@ -83,10 +84,10 @@ await testsToProcess.Values
             .ProcessInParallel(_maximumParallelTests);
     }
 
-    private async Task ProcessParallelGroups(IDictionary<string, List<DiscoveredTest>> groups,
+    private async Task ProcessParallelGroups(ConcurrentDictionary<ParallelGroupConstraint, List<DiscoveredTest>> groups,
         ITestExecutionFilter? filter, ExecuteRequestContext context)
     {
-        foreach (var (_, value) in groups)
+        foreach (var (_, value) in groups.OrderBy(x => x.Key.Order))
         {
             await ProcessParallelTests(value, filter, context);
         }