Expose test/run directory paths in TestBase

Author: C0nquistadore

src/Dibix.Testing/TestBase.cs

@@ -56,6 +56,8 @@ internal TestOutputWriter TestOutputHelper
         }
         protected virtual bool AttachOutputObserver => false;
         protected virtual TextWriter Out => this.TestOutputHelper;
+        protected string RunDirectory => this.TestResultComposer.RunDirectory;
+        protected string TestDirectory => this.TestResultComposer.TestDirectory;
 
         /// <summary>
         /// By default, the test results directory is cleaned up by MSTest, after all tests of a run have passed.

src/Dibix.Testing/Utilities/TestResultComposer.cs

@@ -16,30 +16,31 @@ internal sealed class TestResultComposer
         private readonly TestContext _testContext;
         private readonly bool _useDedicatedTestResultsDirectory;
         private readonly string _defaultRunDirectory;
-        private readonly string _runDirectory;
-        private readonly string _testDirectory;
         private readonly string _expectedDirectory;
         private readonly string _actualDirectory;
         private readonly ICollection<string> _testRunFiles;
         private readonly ICollection<string> _testFiles;
 
+        public string RunDirectory { get; }
+        public string TestDirectory { get; }
+
         public TestResultComposer(TestContext testContext, bool useDedicatedTestResultsDirectory)
         {
             this._testContext = testContext;
             this._useDedicatedTestResultsDirectory = useDedicatedTestResultsDirectory;
             this._defaultRunDirectory = testContext.TestRunResultsDirectory;
             string dedicatedRunDirectory = BuildDedicatedRunDirectory(testContext);
-            this._runDirectory = this._useDedicatedTestResultsDirectory ? dedicatedRunDirectory : 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);
+            this.RunDirectory = this._useDedicatedTestResultsDirectory ? dedicatedRunDirectory : 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);
             this._testRunFiles = new HashSet<string>();
             this._testFiles = new HashSet<string>();
         }
 
         public string AddFile(string fileName)
         {
-            string path = Path.Combine(this._testDirectory, fileName);
+            string path = Path.Combine(this.TestDirectory, fileName);
             EnsureDirectory(path);
             this.RegisterFile(path, scopeIsTestRun: false);
             return path;
@@ -92,7 +93,7 @@ string FormatContent(EventLogEntry entry)
         private void EnsureFileComparisonContent(string directory, string extension, string content)
         {
             this.EnsureFileComparisonContent(Path.Combine(directory, $"{this._testContext.TestName}.{extension}"), content);
-            this.EnsureFileComparisonContent(Path.Combine(this._testDirectory, $"{new DirectoryInfo(directory).Name}.{extension}"), content);
+            this.EnsureFileComparisonContent(Path.Combine(this.TestDirectory, $"{new DirectoryInfo(directory).Name}.{extension}"), content);
         }
         private void EnsureFileComparisonContent(string path, string content)
         {
@@ -128,7 +129,7 @@ private void RegisterFile(string path, bool scopeIsTestRun)
         private void EnsureWinMergeStarter()
         {
             const string fileName = "winmerge.bat";
-            string path = Path.Combine(this._runDirectory, fileName);
+            string path = Path.Combine(this.RunDirectory, fileName);
 
             if (!this.ShouldRegisterTestRunFile(path))
                 return;
@@ -153,12 +154,12 @@ private void ZipTestOutput()
             if (!files.Any())
                 return;
 
-            string path = Path.Combine(this._testDirectory, $"{this._testContext.TestName}.zip");
+            string path = Path.Combine(this.TestDirectory, $"{this._testContext.TestName}.zip");
             using (ZipArchive archive = ZipFile.Open(path, ZipArchiveMode.Create))
             {
                 foreach (string file in files)
                 {
-                    int relativePathIndex = this._runDirectory.Length + 1;
+                    int relativePathIndex = this.RunDirectory.Length + 1;
                     string relativePath = file.Substring(relativePathIndex, file.Length - relativePathIndex);
                     archive.CreateEntryFromFile(file, relativePath);
                 }
@@ -180,7 +181,7 @@ private void CopyFiles(IEnumerable<string> files, string targetDirectory, bool i
         {
             foreach (string file in files)
             {
-                string relativeFilePath = file.Substring(this._runDirectory.Length + 1);
+                string relativeFilePath = file.Substring(this.RunDirectory.Length + 1);
                 string targetFilePath = Path.Combine(targetDirectory, relativeFilePath);
                 EnsureDirectory(targetFilePath);