feat(execution): Refactor OverrideResult method for improved validation and exception handling

Author: thomhurst

TUnit.Core/TestContext.Execution.cs

@@ -68,58 +68,56 @@ bool ITestExecution.ReportResult
     // Internal implementation methods
     internal void OverrideResult(TestState state, string reason)
     {
-        // Validation: Reason must not be empty
-        if (string.IsNullOrWhiteSpace(reason))
+        lock (Lock)
         {
-            throw new ArgumentException("Override reason cannot be empty or whitespace.", nameof(reason));
-        }
+            if (string.IsNullOrWhiteSpace(reason))
+            {
+                throw new ArgumentException("Override reason cannot be empty or whitespace.", nameof(reason));
+            }
 
-        // Validation: Prevent double-override
-        if (Result?.IsOverridden == true)
-        {
-            throw new InvalidOperationException(
-                $"Result has already been overridden to {Result.State} with reason: '{Result.OverrideReason}'. " +
-                "Cannot override a result multiple times.");
-        }
+            if (Result?.IsOverridden == true)
+            {
+                throw new InvalidOperationException(
+                    $"Result has already been overridden to {Result.State} with reason: '{Result.OverrideReason}'. " +
+                    "Cannot override a result multiple times. Check Result.IsOverridden before calling OverrideResult().");
+            }
 
-        // Validation: Only allow final states
-        if (state is TestState.NotStarted or TestState.WaitingForDependencies or TestState.Queued or TestState.Running)
-        {
-            throw new ArgumentException(
-                $"Cannot override to intermediate state '{state}'. " +
-                "Only final states (Passed, Failed, Skipped, Timeout, Cancelled) are allowed.",
-                nameof(state));
-        }
+            if (state is TestState.NotStarted or TestState.WaitingForDependencies or TestState.Queued or TestState.Running)
+            {
+                throw new ArgumentException(
+                    $"Cannot override to intermediate state '{state}'. " +
+                    "Only final states (Passed, Failed, Skipped, Timeout, Cancelled) are allowed.",
+                    nameof(state));
+            }
 
-        // Preserve the original exception if one exists
-        var originalException = Result?.Exception;
+            var originalException = Result?.Exception;
 
-        // When overriding to Failed without an original exception, create a synthetic one
-        Exception? exceptionForResult;
-        if (state == TestState.Failed)
-        {
-            exceptionForResult = originalException ?? new InvalidOperationException($"Test overridden to failed: {reason}");
-        }
-        else
-        {
-            exceptionForResult = null;
-        }
+            Exception? exceptionForResult;
+            if (state == TestState.Failed)
+            {
+                exceptionForResult = originalException ?? new InvalidOperationException($"Test overridden to failed: {reason}");
+            }
+            else
+            {
+                exceptionForResult = null;
+            }
 
-        Result = new TestResult
-        {
-            State = state,
-            OverrideReason = reason,
-            IsOverridden = true,
-            OriginalException = originalException,
-            Start = TestStart ?? DateTimeOffset.UtcNow,
-            End = DateTimeOffset.UtcNow,
-            Duration = DateTimeOffset.UtcNow - (TestStart ?? DateTimeOffset.UtcNow),
-            Exception = exceptionForResult,
-            ComputerName = Environment.MachineName,
-            TestContext = this
-        };
-
-        InternalExecutableTest.State = state;
+            Result = new TestResult
+            {
+                State = state,
+                OverrideReason = reason,
+                IsOverridden = true,
+                OriginalException = originalException,
+                Start = TestStart ?? DateTimeOffset.UtcNow,
+                End = DateTimeOffset.UtcNow,
+                Duration = DateTimeOffset.UtcNow - (TestStart ?? DateTimeOffset.UtcNow),
+                Exception = exceptionForResult,
+                ComputerName = Environment.MachineName,
+                TestContext = this
+            };
+
+            InternalExecutableTest.State = state;
+        }
     }
 
     internal void AddLinkedCancellationToken(CancellationToken cancellationToken)