Ensure single dedicated test run directory per test run

Author: C0nquistadore

src/Dibix.Testing/Utilities/TestResultComposer.cs

@@ -4,7 +4,6 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using System.Reflection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
@@ -31,8 +30,7 @@ public TestResultComposer(TestContext testContext, bool useDedicatedTestResultsD
             this._testContext = testContext;
             this._useDedicatedTestResultsDirectory = useDedicatedTestResultsDirectory;
             this._defaultRunDirectory = testContext.TestRunResultsDirectory;
-            string dedicatedRunDirectory = BuildDedicatedRunDirectory(testContext);
-            this.RunDirectory = this._useDedicatedTestResultsDirectory ? dedicatedRunDirectory : this._defaultRunDirectory;
+            this.RunDirectory = this._useDedicatedTestResultsDirectory ? TestRun.GetTestRunDirectory(testContext) : this._defaultRunDirectory;
             this.TestDirectory = Path.Combine(this.RunDirectory, "TestResults", testContext.TestName);
             this._expectedDirectory = Path.Combine(this.RunDirectory, ExpectedDirectoryName);
             this._actualDirectory = Path.Combine(this.RunDirectory, ActualDirectoryName);
@@ -217,15 +215,6 @@ private static void EnsureDirectory(string path)
             Directory.CreateDirectory(directory);
         }
 
-        private static string BuildDedicatedRunDirectory(TestContext testContext)
-        {
-            Assembly assembly = TestImplementationResolver.ResolveTestAssembly(testContext);
-            string assemblyName = assembly.GetName().Name;
-            string directoryName = $"Run_{DateTime.Now:yyyy-MM-dd HH_mm_ss}";
-            string path = Path.Combine(Path.GetTempPath(), "TestResults", directoryName, assemblyName);
-            return path;
-        }
-
         // Exposing the original enum System.Diagnostics.EventLogEntryType in the AddLastEventLogEntries method, causes the coverlet.collector to hang.
         // Might be related to: https://github.com/coverlet-coverage/coverlet/issues/1044
         public enum EventLogEntryType

src/Dibix.Testing/Utilities/TestRun.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Reflection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Dibix.Testing
+{
+    internal static class TestRun
+    {
+        private static readonly ConcurrentDictionary<string, Lazy<string>> TestRunDirectoryMap = new ConcurrentDictionary<string, Lazy<string>>();
+
+        public static string GetTestRunDirectory(TestContext testContext)
+        {
+            // Unfortunately, MSTest does not provide a unique id to identity a test run, therefore we use the generated test run directory from MSTest
+            string testRunIdentifier = testContext.TestRunDirectory;
+            return TestRunDirectoryMap.GetOrAdd(testRunIdentifier, _ => new Lazy<string>(() => CreateTestRunDirectory(testContext))).Value;
+        }
+
+        private static string CreateTestRunDirectory(TestContext testContext)
+        {
+            Assembly assembly = TestImplementationResolver.ResolveTestAssembly(testContext);
+            string assemblyName = assembly.GetName().Name!;
+            string directoryName = $"Run_{DateTime.Now:yyyy-MM-dd HH_mm_ss}";
+            string path = Path.Combine(Path.GetTempPath(), "TestResults", directoryName, assemblyName);
+            return path;
+        }
+    }
+}