#2377: Test logs get mixed across test cases

bradwilson · bradwilson · commit 1fac6f8d8899 · 2024-06-16T15:06:42.000-07:00
diff --git a/src/xunit.execution/Sdk/Frameworks/Runners/XunitTestClassRunner.cs b/src/xunit.execution/Sdk/Frameworks/Runners/XunitTestClassRunner.cs
@@ -225,7 +225,10 @@ protected override bool TryGetConstructorArgument(ConstructorInfo constructor, i
         {
             if (parameter.ParameterType == typeof(ITestOutputHelper))
             {
-                argumentValue = new TestOutputHelper();
+                // To solve https://github.com/xunit/xunit/issues/2377 we're putting a placeholder Func here,
+                // and hardcoding the resolution of that in XunitTestRunner.cs. In v3, we generally support
+                // using Funcs, because we resolve this via the TestContext (so it's already fixed there).
+                argumentValue = () => new TestOutputHelper();
                 return true;
             }
 
diff --git a/src/xunit.execution/Sdk/Frameworks/Runners/XunitTestRunner.cs b/src/xunit.execution/Sdk/Frameworks/Runners/XunitTestRunner.cs
@@ -54,12 +54,13 @@ protected override async Task<Tuple<decimal, string>> InvokeTestAsync(ExceptionA
             var output = string.Empty;
 
             TestOutputHelper testOutputHelper = null;
-            foreach (object obj in ConstructorArguments)
-            {
-                testOutputHelper = obj as TestOutputHelper;
-                if (testOutputHelper != null)
+            for (int idx = 0; idx < ConstructorArguments.Length; ++idx)
+                if (ConstructorArguments[idx] is Func<TestOutputHelper>)
+                {
+                    testOutputHelper = new TestOutputHelper();
+                    ConstructorArguments[idx] = testOutputHelper;
                     break;
-            }
+                }
 
             if (testOutputHelper != null)
                 testOutputHelper.Initialize(MessageBus, Test);

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,10 @@ protected override bool TryGetConstructorArgument(ConstructorInfo constructor, i`
`225`	`225`	`{`
`226`	`226`	`if (parameter.ParameterType == typeof(ITestOutputHelper))`
`227`	`227`	`{`
`228`		`- argumentValue = new TestOutputHelper();`
	`228`	`+ // To solve https://github.com/xunit/xunit/issues/2377 we're putting a placeholder Func here,`
	`229`	`+ // and hardcoding the resolution of that in XunitTestRunner.cs. In v3, we generally support`
	`230`	`+ // using Funcs, because we resolve this via the TestContext (so it's already fixed there).`
	`231`	`+ argumentValue = () => new TestOutputHelper();`
`229`	`232`	`return true;`
`230`	`233`	`}`
`231`	`234`