Dedicated test output directory improvements

Author: C0nquistadore

Directory.Build.props

@@ -13,6 +13,7 @@
     <DebugType>embedded</DebugType>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">true</ContinuousIntegrationBuild>
+    <DefineConstants Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(DefineConstants);CI_BUILD</DefineConstants>
 
     <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
 

src/Dibix.Testing/TestBase.cs

@@ -61,22 +61,26 @@ internal TestOutputWriter TestOutputHelper
         /// It might be desired to keep the test output even if all tests have passed, i.E. for investigation purposes.
         /// Setting this property to true, will store the output in the temp directory, so they are still available after each run.
         /// </summary>
+#if CI_BUILD
         protected virtual bool UseDedicatedTestResultsDirectory => true;
+#else
+        protected virtual bool UseDedicatedTestResultsDirectory => false;
+#endif
         private TestResultComposer TestResultComposer
         {
             get => SafeGetProperty(ref this._testResultComposer);
             set => this._testResultComposer = value;
         }
-        #endregion
+#endregion
 
-        #region Constructor
+#region Constructor
         protected TestBase()
         {
             this._assembly = this.GetType().Assembly;
         }
-        #endregion
+#endregion
 
-        #region Public Methods
+#region Public Methods
         [TestInitialize]
         public async Task OnTestInitialize()
         {
@@ -86,9 +90,9 @@ public async Task OnTestInitialize()
 
             await this.OnTestInitialized().ConfigureAwait(false);
         }
-        #endregion
+#endregion
 
-        #region Protected Methods
+#region Protected Methods
         protected virtual Task OnTestInitialized() => Task.CompletedTask;
 
         protected void WriteLine(string message) => this.TestOutputHelper.WriteLine(message);
@@ -152,9 +156,9 @@ protected static TException AssertThrows<TException>(Action action) where TExcep
         protected static Task Retry(Func<Task<bool>> retryMethod, TimeSpan timeout) => Retry(retryMethod, x => x, timeout);
         protected static Task<TResult> Retry<TResult>(Func<Task<TResult>> retryMethod, Func<TResult, bool> condition) => Retry(retryMethod, condition, TimeSpan.FromMinutes(30));
         protected static Task<TResult> Retry<TResult>(Func<Task<TResult>> retryMethod, Func<TResult, bool> condition, TimeSpan timeout) => retryMethod.Retry(condition, (int)TimeSpan.FromSeconds(1).TotalMilliseconds, (int)timeout.TotalMilliseconds);
-        #endregion
+#endregion
 
-        #region Private Methods
+#region Private Methods
         private void OnFirstChanceException(object sender, FirstChanceExceptionEventArgs e)
         {
             if (e.Exception is UnitTestAssertException)
@@ -198,9 +202,9 @@ private static T SafeGetProperty<T>(ref T field, [CallerMemberName] string prope
 
             return field;
         }
-        #endregion
+#endregion
 
-        #region IDisposable Members
+#region IDisposable Members
         public void Dispose()
         {
             this.Dispose(true);
@@ -215,6 +219,6 @@ protected virtual void Dispose(bool disposing)
                 TestResultComposer.Complete();
             }
         }
-        #endregion
+#endregion
     }
 }

src/Dibix.Testing/Utilities/TestResultComposer.cs

@@ -40,6 +40,7 @@ public TestResultComposer(TestContext testContext, bool useDedicatedTestResultsD
         public string AddFile(string fileName)
         {
             string path = Path.Combine(this._testDirectory, fileName);
+            EnsureDirectory(path);
             this.RegisterFile(path, scopeIsTestRun: false);
             return path;
         }
@@ -100,7 +101,6 @@ private void RegisterFile(string path, bool scopeIsTestRun)
             if (files.Contains(path))
                 throw new InvalidOperationException($"Test result file already registered: {path}");
 
-            EnsureDirectory(path);
             this._testContext.AddResultFile(path);
             files.Add(path);
         }
@@ -140,6 +140,7 @@ private static void WriteContentToFile(string path, string content)
             if (File.Exists(path))
                 throw new InvalidOperationException($"Path exists already: {path}");
 
+            EnsureDirectory(path);
             File.WriteAllText(path, content);
         }
 
@@ -195,8 +196,9 @@ private static string BuildDedicatedRunDirectory(TestContext testContext)
         {
             Assembly assembly = TestImplementationResolver.ResolveTestAssembly(testContext);
             string assemblyName = assembly.GetName().Name;
-            string directoryName = new DirectoryInfo(testContext.TestRunDirectory).Name;
-            string path = Path.Combine(Path.GetTempPath(), assemblyName, directoryName);
+            string testRunDirectoryName = new DirectoryInfo(testContext.TestRunDirectory).Name;
+            string directoryName = $"Run_{testRunDirectoryName.Split(' ').Last()}";
+            string path = Path.Combine(Path.GetTempPath(), "TestResults", directoryName, assemblyName);
             return path;
         }
     }