Cannot use full assembly path as dictionary key for execution options…

… lookup, since .NET Core only passes the filename w/o path
xunit · May 10, 2024 · f497d65 · f497d65
1 parent c2f2d47
commit f497d65
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
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);