Fix construction of path in OpenApiParser

Author: StefH

src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs

@@ -102,8 +102,8 @@ private MappingModel MapOperationToMappingModel(string path, string httpMethod,
             Guid = Guid.NewGuid(),
             Request = new RequestModel
             {
-                Methods = new[] { httpMethod },
-                Path = MapBasePath(servers) + MapPathWithParameters(path, pathParameters),
+                Methods = [httpMethod],
+                Path = PathUtils.Combine(MapBasePath(servers), MapPathWithParameters(path, pathParameters)),
                 Params = MapQueryParameters(queryParameters),
                 Headers = MapRequestHeaders(headers),
                 Body = requestBodyModel

src/WireMock.Net.OpenApiParser/Properties/AssemblyInfo.cs

@@ -0,0 +1,5 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]

src/WireMock.Net.OpenApiParser/Utils/PathUtils.cs

@@ -0,0 +1,27 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.OpenApiParser.Utils;
+
+internal static class PathUtils
+{
+    internal static string Combine(params string[] paths)
+    {
+        if (paths.Length == 0)
+        {
+            return string.Empty;
+        }
+
+        var result = paths[0].Trim().TrimEnd('/');
+
+        for (int i = 1; i < paths.Length; i++)
+        {
+            var nextPath = paths[i].Trim().TrimStart('/').TrimEnd('/');
+            if (!string.IsNullOrEmpty(nextPath))
+            {
+                result += '/' + nextPath;
+            }
+        }
+
+        return result;
+    }
+}

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

@@ -84,20 +84,20 @@ public virtual void WriteMappingFile(string path, string text)
     public virtual byte[] ReadResponseBodyAsFile(string path)
     {
         Guard.NotNullOrEmpty(path);
-        path = PathUtils.CleanPath(path)!;
+        path = FilePathUtils.CleanPath(path)!;
         // If the file exists at the given path relative to the MappingsFolder, then return that.
         // Else the path will just be as-is.
-        return File.ReadAllBytes(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
+        return File.ReadAllBytes(File.Exists(FilePathUtils.Combine(GetMappingFolder(), path)) ? FilePathUtils.Combine(GetMappingFolder(), path) : path);
     }
 
     /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
     public virtual string ReadResponseBodyAsString(string path)
     {
         Guard.NotNullOrEmpty(path);
-        path = PathUtils.CleanPath(path)!;
+        path = FilePathUtils.CleanPath(path)!;
         // In case the path is a filename, the path will be adjusted to the MappingFolder.
         // Else the path will just be as-is.
-        return File.ReadAllText(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
+        return File.ReadAllText(File.Exists(FilePathUtils.Combine(GetMappingFolder(), path)) ? FilePathUtils.Combine(GetMappingFolder(), path) : path);
     }
 
     /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
@@ -124,7 +124,7 @@ public virtual void WriteFile(string folder, string filename, byte[] bytes)
         Guard.NotNullOrEmpty(filename);
         Guard.NotNull(bytes);
 
-        File.WriteAllBytes(PathUtils.Combine(folder, filename), bytes);
+        File.WriteAllBytes(FilePathUtils.Combine(folder, filename), bytes);
     }
 
     /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>

src/WireMock.Net/Util/PathUtils.cs src/WireMock.Net/Util/FilePathUtils.cs

@@ -5,7 +5,7 @@
 
 namespace WireMock.Util;
 
-internal static class PathUtils
+internal static class FilePathUtils
 {
     /// <summary>
     /// Robust handling of the user defined path.
@@ -23,7 +23,7 @@ internal static class PathUtils
     /// <param name="path">The path to remove the loading DirectorySeparatorChars</param>
     public static string? RemoveLeadingDirectorySeparators(string? path)
     {
-        return path?.TrimStart(new[] { Path.DirectorySeparatorChar });
+        return path?.TrimStart(Path.DirectorySeparatorChar);
     }
 
     /// <summary>

test/WireMock.Net.Tests/OpenApiParser/PathUtilsTests.cs

@@ -0,0 +1,40 @@
+// Copyright © WireMock.Net
+
+#if !(NET452 || NET461 || NETCOREAPP3_1)
+using FluentAssertions;
+using WireMock.Net.OpenApiParser.Utils;
+using Xunit;
+
+namespace WireMock.Net.Tests.OpenApiParser;
+
+public class PathUtilsTests
+{
+    [Theory]
+    [InlineData(new string[] { }, "")]
+    [InlineData(new[] { "path1" }, "path1")]
+    [InlineData(new[] { "/path1" }, "/path1")]
+    [InlineData(new[] { "/path1/" }, "/path1")]
+    public void Combine_ShouldReturnCombinedPathTest1(string[] paths, string expected)
+    {
+        // Act
+        var result = PathUtils.Combine(paths);
+
+        // Assert
+        result.Should().Be(expected);
+    }
+
+    [Theory]
+    [InlineData("/path1", "path2")]
+    [InlineData("/path1/", "path2")]
+    [InlineData("/path1", "/path2")]
+    [InlineData("/path1", "path2/")]
+    public void Combine_ShouldReturnCombinedPathTest2(params string[] paths)
+    {
+        // Act
+        var result = PathUtils.Combine(paths);
+
+        // Assert
+        result.Should().Be("/path1/path2");
+    }
+}
+#endif

test/WireMock.Net.Tests/OpenApiParser/payroc-openapi-spec.yaml

@@ -8,7 +8,7 @@ info:
     url: https://docs.payroc.com/api
     email: helpdesk@payroc.com
 servers:
-  - url: https://api.payroc.com/v1
+  - url: https://api.payroc.com/v1/
     description: External URL
 security:
   - bearerAuth: []

test/WireMock.Net.Tests/Util/PathUtilsTests.cs test/WireMock.Net.Tests/Util/FilePathUtilsTests.cs

@@ -7,15 +7,15 @@
 
 namespace WireMock.Net.Tests.Util;
 
-public class PathUtilsTests
+public class FilePathUtilsTests
 {
     [Theory]
     [InlineData(@"subdirectory/MyXmlResponse.xml")]
     [InlineData(@"subdirectory\MyXmlResponse.xml")]
     public void PathUtils_CleanPath(string path)
     {
         // Act
-        var cleanPath = PathUtils.CleanPath(path);
+        var cleanPath = FilePathUtils.CleanPath(path);
 
         // Assert
         Check.That(cleanPath).Equals("subdirectory" + Path.DirectorySeparatorChar + "MyXmlResponse.xml");
@@ -34,10 +34,10 @@ public void PathUtils_CleanPath(string path)
     public void PathUtils_CleanPath_RemoveLeadingDirectorySeparators(string path, string expected)
     {
         // Arrange
-        var cleanPath = PathUtils.CleanPath(path);
+        var cleanPath = FilePathUtils.CleanPath(path);
 
         // Act
-        var withoutDirectorySeparators = PathUtils.RemoveLeadingDirectorySeparators(cleanPath);
+        var withoutDirectorySeparators = FilePathUtils.RemoveLeadingDirectorySeparators(cleanPath);
 
         // Assert
         Check.That(withoutDirectorySeparators).Equals(expected);