cleaned up redundant Path.Combine

Author: matt W10

src/Stryker.Configuration/Options/Inputs/BaselineOutputInput.cs

@@ -1,3 +1,4 @@
+using System.IO;
 using Stryker.Abstractions.Baseline;
 using Stryker.Abstractions.Exceptions;
 
@@ -18,6 +19,11 @@ public string Validate(BaselineProvider baselineProvider, bool withBaseline)
                 throw new InputException("BaselineOutput can't be null or whitespace");
             }
 
+            if (!Path.IsPathFullyQualified(SuppliedInput))
+            {
+                throw new InputException($"BaselineOutput must be a fully qualified path, but was: {SuppliedInput}");
+            }
+
             return SuppliedInput;
         }
         return Default;

src/Stryker.Core/Stryker.Core.UnitTest/Baseline/Providers/DiskBaselineProviderTests.cs

@@ -25,7 +25,7 @@ public async Task ShouldWriteToDiskAsync()
         var options = new StrykerOptions()
         {
             ProjectPath = @"C:/Users/JohnDoe/Project/TestFolder",
-            BaselineOutputPath = "StrykerOutput"
+            BaselineOutputPath = @"C:/Users/JohnDoe/Project/TestFolder/StrykerOutput"
         };
         var sut = new DiskBaselineProvider(options, fileSystemMock);
 
@@ -46,7 +46,7 @@ public async Task ShouldWriteToConfiguredBaselineOutputPathAsync()
         var options = new StrykerOptions()
         {
             ProjectPath = @"C:/Users/JohnDoe/Project/TestFolder",
-            BaselineOutputPath = "custom-baseline"
+            BaselineOutputPath = @"C:/Users/JohnDoe/Project/TestFolder/custom-baseline"
         };
         var sut = new DiskBaselineProvider(options, fileSystemMock);
 
@@ -84,7 +84,7 @@ public async Task ShouldLoadReportFromConfiguredBaselineOutputPathAsync()
         var options = new StrykerOptions()
         {
             ProjectPath = @"C:/Users/JohnDoe/Project/TestFolder",
-            BaselineOutputPath = "custom-baseline"
+            BaselineOutputPath = @"C:/Users/JohnDoe/Project/TestFolder/custom-baseline"
         };
         var report = JsonReport.Build(options, ReportTestHelper.CreateProjectWith(), It.IsAny<ITestProjectsInfo>());
 
@@ -103,7 +103,7 @@ public async Task ShouldHandleFileNotFoundExceptionOnLoadAsync()
     {
         // Arrange
         var fileSystemMock = new MockFileSystem();
-        var options = new StrykerOptions { ProjectPath = "C:/Dev", BaselineOutputPath = "StrykerOutput" };
+        var options = new StrykerOptions { ProjectPath = "C:/Dev", BaselineOutputPath = "C:/Dev/StrykerOutput" };
         var sut = new DiskBaselineProvider(options, fileSystemMock);
 
         // Act
@@ -120,7 +120,7 @@ public async Task ShouldLoadReportFromDiskAsync()
         var options = new StrykerOptions()
         {
             ProjectPath = @"C:/Users/JohnDoe/Project/TestFolder",
-            BaselineOutputPath = "StrykerOutput"
+            BaselineOutputPath = @"C:/Users/JohnDoe/Project/TestFolder/StrykerOutput"
         };
         var report = JsonReport.Build(options, ReportTestHelper.CreateProjectWith(), It.IsAny<ITestProjectsInfo>());
 

src/Stryker.Core/Stryker.Core.UnitTest/Options/Inputs/BaselineOutputInputTests.cs

@@ -1,3 +1,4 @@
+using System.IO;
 using Shouldly;
 using Stryker.Abstractions.Baseline;
 using Stryker.Abstractions.Exceptions;
@@ -30,11 +31,23 @@ public void ShouldThrow_WhenDiskBaselineAndNotSupplied(string input)
     [TestMethod]
     public void ShouldReturnSuppliedValue_WhenDiskBaseline()
     {
-        var target = new BaselineOutputInput { SuppliedInput = "custom-baseline" };
+        // a path that is fully qualified on whatever OS the tests run on
+        var fullPath = Path.GetFullPath("custom-baseline");
+        var target = new BaselineOutputInput { SuppliedInput = fullPath };
 
         var result = target.Validate(BaselineProvider.Disk, withBaseline: true);
 
-        result.ShouldBe("custom-baseline");
+        result.ShouldBe(fullPath);
+    }
+
+    [TestMethod]
+    [DataRow("custom-baseline")]
+    [DataRow("relative/baseline")]
+    public void ShouldThrow_WhenDiskBaselineAndNotFullyQualified(string input)
+    {
+        var target = new BaselineOutputInput { SuppliedInput = input };
+
+        Should.Throw<InputException>(() => target.Validate(BaselineProvider.Disk, withBaseline: true));
     }
 
     [TestMethod]

src/Stryker.Core/Stryker.Core.UnitTest/Options/StrykerInputsTests.cs

@@ -176,7 +176,7 @@ public void NotUsingDashboardBaselineStorageWithBaselineOrDashboardReporterShoul
         _target.BaselineProviderInput.SuppliedInput = "disk";
         _target.WithBaselineInput.SuppliedInput = true;
         _target.ProjectVersionInput.SuppliedInput = "develop";
-        _target.BaselineOutputInput.SuppliedInput = "StrykerOutput";
+        _target.BaselineOutputInput.SuppliedInput = Path.GetFullPath("StrykerOutput");
 
         var result = _target.ValidateAll();
 
@@ -198,8 +198,8 @@ public void WithBaselineShouldNotThrow_2743() // https://github.com/stryker-muta
     {
         _target.ProjectVersionInput.SuppliedInput = "1";
         _target.WithBaselineInput.SuppliedInput = true;
-        // the disk baseline output is mandatory and is set from the output path by the CLI before validation
-        _target.BaselineOutputInput.SuppliedInput = "StrykerOutput";
+        // the disk baseline output is mandatory and is set from the output path (a full path) by the CLI before validation
+        _target.BaselineOutputInput.SuppliedInput = Path.GetFullPath("StrykerOutput");
 
         Should.NotThrow(() => _target.ValidateAll());
     }
@@ -226,11 +226,12 @@ public void ShouldSetBaselineOutputPathWhenSupplied()
     {
         _target.ProjectVersionInput.SuppliedInput = "1";
         _target.WithBaselineInput.SuppliedInput = true;
-        _target.BaselineOutputInput.SuppliedInput = "custom-baseline";
+        var fullPath = Path.GetFullPath("custom-baseline");
+        _target.BaselineOutputInput.SuppliedInput = fullPath;
 
         var result = _target.ValidateAll();
 
-        result.BaselineOutputPath.ShouldBe("custom-baseline");
+        result.BaselineOutputPath.ShouldBe(fullPath);
     }
 
     [TestMethod]

src/Stryker.Core/Stryker.Core/Baseline/Providers/DiskBaselineProvider.cs

@@ -27,8 +27,9 @@ public DiskBaselineProvider(IStrykerOptions options, IFileSystem fileSystem = nu
 
     public async Task<IJsonReport> Load(string version)
     {
+        // at this point, BaseLineOutputPath is a fully qualified path
         var reportPath = FilePathUtils.NormalizePathSeparators(
-            Path.Combine(_options.ProjectPath, _options.BaselineOutputPath, version, "stryker-report.json"));
+            Path.Combine(_options.BaselineOutputPath, version, "stryker-report.json"));
 
         if (_fileSystem.File.Exists(reportPath))
         {
@@ -43,8 +44,9 @@ public async Task<IJsonReport> Load(string version)
 
     public async Task Save(IJsonReport report, string version)
     {
+        // at this point, BaseLineOutputPath is a fully qualified path
         var reportDirectory = FilePathUtils.NormalizePathSeparators(
-            Path.Combine(_options.ProjectPath, _options.BaselineOutputPath, version));
+            Path.Combine(_options.BaselineOutputPath, version));
 
         _fileSystem.Directory.CreateDirectory(reportDirectory);