Merge pull request #1504 from microsoft/bugfix/conflicting-path

bugfix/conflicting path

Author: baywet

src/Microsoft.OpenApi/Validations/Rules/OpenApiPathsRules.cs

@@ -36,7 +36,7 @@ public static class OpenApiPathsRules
                     }
                 });
 
-        private static readonly Regex regexPath = new Regex("\\{([^/]+)\\}", RegexOptions.Compiled, TimeSpan.FromMilliseconds(100));
+        private static readonly Regex regexPath = new Regex("\\{([^/}]+)\\}", RegexOptions.Compiled, TimeSpan.FromMilliseconds(100));
         /// <summary>
         /// A relative path to an individual endpoint. The field name MUST begin with a slash.
         /// </summary>

test/Microsoft.OpenApi.Tests/Validations/OpenApiPathsValidationTests.cs

@@ -45,5 +45,38 @@ public void ValidatePathsAreUnique()
             errors.Should().NotBeEmpty();
             errors.Select(e => e.Message).Should().BeEquivalentTo(error);
         }
+        [Fact]
+        public void ValidatePathsAreUniqueDoesNotConsiderMultiParametersAsIdentical()
+        {
+            // Arrange
+            var paths = new OpenApiPaths
+            {
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height},fittingMode='{fittingMode}')",new OpenApiPathItem() },
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height})",new OpenApiPathItem() },
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width})", new OpenApiPathItem() },
+            };
+
+            // Act
+            var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            errors.Should().BeEmpty();
+        }
+        [Fact]
+        public void ValidatePathsAreUniqueConsidersMultiParametersAsIdentical()
+        {
+            // Arrange
+            var paths = new OpenApiPaths
+            {
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={height})",new OpenApiPathItem() },
+                {"/drives/{drive-id}/items/{driveItem-id}/workbook/worksheets/{workbookWorksheet-id}/charts/{workbookChart-id}/image(width={width},height={size})",new OpenApiPathItem() },
+            };
+
+            // Act
+            var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
+
+            // Assert
+            errors.Should().NotBeEmpty();
+        }
     }
 }