Cannot use full assembly path as dictionary key for execution options lookup, since .NET Core only passes the filename w/o path

bradwilson · bradwilson · commit f497d65ec5b3 · 2024-05-10T12:12:38.000-07:00
diff --git a/src/xunit.runner.utility/Reporters/DefaultRunnerReporterMessageHandler.cs b/src/xunit.runner.utility/Reporters/DefaultRunnerReporterMessageHandler.cs
@@ -40,7 +40,7 @@ public DefaultRunnerReporterMessageHandler(IRunnerLogger logger)
         void AddExecutionOptions(string assemblyFilename, ITestFrameworkExecutionOptions executionOptions)
         {
             using (ReaderWriterLockWrapper.WriteLock())
-                executionOptionsByAssembly[assemblyFilename] = executionOptions;
+                executionOptionsByAssembly[Path.GetFileNameWithoutExtension(assemblyFilename)] = executionOptions;
         }
 
         /// <summary>
@@ -87,7 +87,7 @@ protected ITestFrameworkExecutionOptions GetExecutionOptions(string assemblyFile
             ITestFrameworkExecutionOptions result;
 
             using (ReaderWriterLockWrapper.ReadLock())
-                if (!executionOptionsByAssembly.TryGetValue(assemblyFilename, out result))
+                if (!executionOptionsByAssembly.TryGetValue(Path.GetFileNameWithoutExtension(assemblyFilename), out result))
                     result = defaultExecutionOptions;
 
             return result;
@@ -149,7 +149,7 @@ protected virtual void LogOutput(StackFrameInfo frameInfo, string output)
         void RemoveExecutionOptions(string assemblyFilename)
         {
             using (ReaderWriterLockWrapper.WriteLock())
-                executionOptionsByAssembly.Remove(assemblyFilename);
+                executionOptionsByAssembly.Remove(Path.GetFileNameWithoutExtension(assemblyFilename));
         }
 
         /// <inheritdoc/>
diff --git a/src/xunit.runner.utility/Reporters/DefaultRunnerReporterWithTypesMessageHandler.cs b/src/xunit.runner.utility/Reporters/DefaultRunnerReporterWithTypesMessageHandler.cs
@@ -58,7 +58,7 @@ public DefaultRunnerReporterWithTypesMessageHandler(IRunnerLogger logger)
         void AddExecutionOptions(string assemblyFilename, ITestFrameworkExecutionOptions executionOptions)
         {
             using (ReaderWriterLockWrapper.WriteLock())
-                executionOptionsByAssembly[assemblyFilename] = executionOptions;
+                executionOptionsByAssembly[Path.GetFileNameWithoutExtension(assemblyFilename)] = executionOptions;
         }
 
         /// <summary>
@@ -101,7 +101,7 @@ protected ITestFrameworkExecutionOptions GetExecutionOptions(string assemblyFile
             ITestFrameworkExecutionOptions result;
 
             using (ReaderWriterLockWrapper.ReadLock())
-                if (!executionOptionsByAssembly.TryGetValue(assemblyFilename, out result))
+                if (!executionOptionsByAssembly.TryGetValue(Path.GetFileNameWithoutExtension(assemblyFilename), out result))
                     result = defaultExecutionOptions;
 
             return result;
@@ -163,7 +163,7 @@ protected virtual void LogOutput(StackFrameInfo frameInfo, string output)
         void RemoveExecutionOptions(string assemblyFilename)
         {
             using (ReaderWriterLockWrapper.WriteLock())
-                executionOptionsByAssembly.Remove(assemblyFilename);
+                executionOptionsByAssembly.Remove(Path.GetFileNameWithoutExtension(assemblyFilename));
         }
 
         /// <summary>
diff --git a/test/test.xunit.runner.utility/Extensibility/DefaultRunnerReporterMessageHandlerTests.cs b/test/test.xunit.runner.utility/Extensibility/DefaultRunnerReporterMessageHandlerTests.cs
@@ -251,8 +251,8 @@ public class OnMessage_ITestOutput
         [Fact]
         public void WithoutFlag_LogsNothing()
         {
-            var executionStartingMessage = Mocks.TestAssemblyExecutionStarting(assemblyFilename: "assembly-path", showLiveOutput: false);
-            var outputMessage = Mocks.TestOutput("assembly-path", "test-name", "This is test output");
+            var executionStartingMessage = Mocks.TestAssemblyExecutionStarting(assemblyFilename: "/path/to/assembly-path.dll", showLiveOutput: false);
+            var outputMessage = Mocks.TestOutput("assembly.DLL", "test-name", "This is test output");
             var handler = TestableDefaultRunnerReporterMessageHandler.Create();
 
             handler.OnMessage(executionStartingMessage);
@@ -265,8 +265,8 @@ public void WithoutFlag_LogsNothing()
         [Fact]
         public void WithFlag_LogsOutput()
         {
-            var executionStartingMessage = Mocks.TestAssemblyExecutionStarting(assemblyFilename: "assembly-path", showLiveOutput: true);
-            var outputMessage = Mocks.TestOutput("assembly-path", "test-name", "This is test output");
+            var executionStartingMessage = Mocks.TestAssemblyExecutionStarting(assemblyFilename: "/path/to/assembly-path.dll", showLiveOutput: true);
+            var outputMessage = Mocks.TestOutput("assembly-path.DLL", "test-name", "This is test output");
             var handler = TestableDefaultRunnerReporterMessageHandler.Create();
 
             handler.OnMessage(executionStartingMessage);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public DefaultRunnerReporterMessageHandler(IRunnerLogger logger)`
`40`	`40`	`void AddExecutionOptions(string assemblyFilename, ITestFrameworkExecutionOptions executionOptions)`
`41`	`41`	`{`
`42`	`42`	`using (ReaderWriterLockWrapper.WriteLock())`
`43`		`- executionOptionsByAssembly[assemblyFilename] = executionOptions;`
	`43`	`+ executionOptionsByAssembly[Path.GetFileNameWithoutExtension(assemblyFilename)] = executionOptions;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/// <summary>`
`@@ -87,7 +87,7 @@ protected ITestFrameworkExecutionOptions GetExecutionOptions(string assemblyFile`
`87`	`87`	`ITestFrameworkExecutionOptions result;`
`88`	`88`
`89`	`89`	`using (ReaderWriterLockWrapper.ReadLock())`
`90`		`- if (!executionOptionsByAssembly.TryGetValue(assemblyFilename, out result))`
	`90`	`+ if (!executionOptionsByAssembly.TryGetValue(Path.GetFileNameWithoutExtension(assemblyFilename), out result))`
`91`	`91`	`result = defaultExecutionOptions;`
`92`	`92`
`93`	`93`	`return result;`
`@@ -149,7 +149,7 @@ protected virtual void LogOutput(StackFrameInfo frameInfo, string output)`
`149`	`149`	`void RemoveExecutionOptions(string assemblyFilename)`
`150`	`150`	`{`
`151`	`151`	`using (ReaderWriterLockWrapper.WriteLock())`
`152`		`- executionOptionsByAssembly.Remove(assemblyFilename);`
	`152`	`+ executionOptionsByAssembly.Remove(Path.GetFileNameWithoutExtension(assemblyFilename));`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`/// <inheritdoc/>`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public DefaultRunnerReporterWithTypesMessageHandler(IRunnerLogger logger)`
`58`	`58`	`void AddExecutionOptions(string assemblyFilename, ITestFrameworkExecutionOptions executionOptions)`
`59`	`59`	`{`
`60`	`60`	`using (ReaderWriterLockWrapper.WriteLock())`
`61`		`- executionOptionsByAssembly[assemblyFilename] = executionOptions;`
	`61`	`+ executionOptionsByAssembly[Path.GetFileNameWithoutExtension(assemblyFilename)] = executionOptions;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/// <summary>`
`@@ -101,7 +101,7 @@ protected ITestFrameworkExecutionOptions GetExecutionOptions(string assemblyFile`
`101`	`101`	`ITestFrameworkExecutionOptions result;`
`102`	`102`
`103`	`103`	`using (ReaderWriterLockWrapper.ReadLock())`
`104`		`- if (!executionOptionsByAssembly.TryGetValue(assemblyFilename, out result))`
	`104`	`+ if (!executionOptionsByAssembly.TryGetValue(Path.GetFileNameWithoutExtension(assemblyFilename), out result))`
`105`	`105`	`result = defaultExecutionOptions;`
`106`	`106`
`107`	`107`	`return result;`
`@@ -163,7 +163,7 @@ protected virtual void LogOutput(StackFrameInfo frameInfo, string output)`
`163`	`163`	`void RemoveExecutionOptions(string assemblyFilename)`
`164`	`164`	`{`
`165`	`165`	`using (ReaderWriterLockWrapper.WriteLock())`
`166`		`- executionOptionsByAssembly.Remove(assemblyFilename);`
	`166`	`+ executionOptionsByAssembly.Remove(Path.GetFileNameWithoutExtension(assemblyFilename));`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/// <summary>`