Further improve stacktrace output

smoogipoo · Nov 11, 2024 · 846bc9b · 846bc9b
1 parent 5c2d7fc
commit 846bc9b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 28 deletions.
diff --git a/osu.Framework/Testing/Drawables/Steps/AssertButton.cs b/osu.Framework/Testing/Drawables/Steps/AssertButton.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Diagnostics;
+using System.Runtime.ExceptionServices;
 using System.Text;
+using NUnit.Framework;
 using osuTK.Graphics;
 
 namespace osu.Framework.Testing.Drawables.Steps
@@ -38,7 +40,7 @@ private void checkAssert()
                 if (GetFailureMessage != null)
                     builder.Append($": {GetFailureMessage()}");
 
-                throw new TracedException(builder.ToString(), CallStack);
+                throw ExceptionDispatchInfo.SetRemoteStackTrace(new AssertionException(builder.ToString()), CallStack.ToString());
             }
         }
 

diff --git a/osu.Framework/Testing/Drawables/Steps/TracedException.cs b/osu.Framework/Testing/Drawables/Steps/TracedException.cs
diff --git a/osu.Framework/Testing/Drawables/Steps/UntilStepButton.cs b/osu.Framework/Testing/Drawables/Steps/UntilStepButton.cs
@@ -3,7 +3,9 @@
 
 using System;
 using System.Diagnostics;
+using System.Runtime.ExceptionServices;
 using System.Text;
+using NUnit.Framework;
 using osu.Framework.Graphics;
 using osuTK.Graphics;
 
@@ -59,7 +61,7 @@ private void checkAssert()
                 if (GetFailureMessage != null)
                     builder.Append($": {GetFailureMessage()}");
 
-                throw new TracedException(builder.ToString(), CallStack);
+                throw ExceptionDispatchInfo.SetRemoteStackTrace(new AssertionException(builder.ToString()), CallStack.ToString());
             }
 
             Action?.Invoke();

diff --git a/osu.Framework/Testing/TestScene.cs b/osu.Framework/Testing/TestScene.cs
@@ -331,7 +331,7 @@ protected void AddUntilStep([CanBeNull] string description, [NotNull] Func<bool>
             {
                 Text = description ?? @"Until",
                 IsSetupStep = addStepsAsSetupSteps,
-                CallStack = new StackTrace(1),
+                CallStack = new StackTrace(1, true),
                 Assertion = waitUntilTrueDelegate,
             });
         }
@@ -344,7 +344,7 @@ protected void AddUntilStep<T>([CanBeNull] string description, [NotNull] ActualV
             {
                 Text = description ?? @"Until",
                 IsSetupStep = addStepsAsSetupSteps,
-                CallStack = new StackTrace(1),
+                CallStack = new StackTrace(1, true),
                 Assertion = () =>
                 {
                     lastResult = constraint().Resolve().ApplyTo(actualValue());
@@ -389,12 +389,13 @@ protected void AddAssert([NotNull] string description, [NotNull] Func<bool> asse
                 Text = description,
                 IsSetupStep = addStepsAsSetupSteps,
                 ExtendedDescription = extendedDescription,
-                CallStack = new StackTrace(1),
+                CallStack = new StackTrace(1, true),
                 Assertion = assert,
             });
         }
 
-        protected void AddAssert<T>([NotNull] string description, [NotNull] ActualValueDelegate<T> actualValue, [NotNull] Func<IResolveConstraint> constraint, [CanBeNull] string extendedDescription = null)
+        protected void AddAssert<T>([NotNull] string description, [NotNull] ActualValueDelegate<T> actualValue, [NotNull] Func<IResolveConstraint> constraint,
+                                    [CanBeNull] string extendedDescription = null)
         {
             ConstraintResult lastResult = null;
 
@@ -403,7 +404,7 @@ protected void AddAssert<T>([NotNull] string description, [NotNull] ActualValueD
                 Text = description,
                 IsSetupStep = addStepsAsSetupSteps,
                 ExtendedDescription = extendedDescription,
-                CallStack = new StackTrace(1),
+                CallStack = new StackTrace(1, true),
                 Assertion = () =>
                 {
                     lastResult = constraint().Resolve().ApplyTo(actualValue());