Merge pull request #1146 from microsoft/mk/fix-validate-source-file-loading-error

MaggieKimani1 · web-flow · commit 151149010a3d · 2023-01-31T18:53:16.000+03:00
Fix hidi validator error when loading unix paths
diff --git a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs
@@ -287,7 +287,7 @@ private static async Task<ReadResult> ParseOpenApi(string openApiFile, bool inli
                 {
                     RuleSet = ValidationRuleSet.GetDefaultRuleSet(),
                     LoadExternalRefs = inlineExternal,
-                    BaseUrl = openApiFile.StartsWith("http") ? new Uri(openApiFile) : new Uri("file:" + new FileInfo(openApiFile).DirectoryName + "\\")
+                    BaseUrl = openApiFile.StartsWith("http") ? new Uri(openApiFile) : new Uri("file:" + new FileInfo(openApiFile).DirectoryName + Path.DirectorySeparatorChar)
                 }
                 ).ReadAsync(stream);
 
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs
@@ -38,8 +38,8 @@ public async Task ReturnConvertedCSDLFile()
         }
         
         [Theory]
-        [InlineData("Todos.Todo.UpdateTodoById",null, 1)]
-        [InlineData("Todos.Todo.ListTodo",null, 1)]
+        [InlineData("Todos.Todo.UpdateTodo",null, 1)]
+        [InlineData("Todos.Todo.ListTodo", null, 1)]
         [InlineData(null, "Todos.Todo", 4)]
         public async Task ReturnFilteredOpenApiDocBasedOnOperationIdsAndInputCsdlDocument(string operationIds, string tags, int expectedPathCount)
         {

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ private static async Task<ReadResult> ParseOpenApi(string openApiFile, bool inli`
`287`	`287`	`{`
`288`	`288`	`RuleSet = ValidationRuleSet.GetDefaultRuleSet(),`
`289`	`289`	`LoadExternalRefs = inlineExternal,`
`290`		`- BaseUrl = openApiFile.StartsWith("http") ? new Uri(openApiFile) : new Uri("file:" + new FileInfo(openApiFile).DirectoryName + "\\")`
	`290`	`+ BaseUrl = openApiFile.StartsWith("http") ? new Uri(openApiFile) : new Uri("file:" + new FileInfo(openApiFile).DirectoryName + Path.DirectorySeparatorChar)`
`291`	`291`	`}`
`292`	`292`	`).ReadAsync(stream);`
`293`	`293`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public async Task ReturnConvertedCSDLFile()`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`[Theory]`
`41`		`- [InlineData("Todos.Todo.UpdateTodoById",null, 1)]`
`42`		`- [InlineData("Todos.Todo.ListTodo",null, 1)]`
	`41`	`+ [InlineData("Todos.Todo.UpdateTodo",null, 1)]`
	`42`	`+ [InlineData("Todos.Todo.ListTodo", null, 1)]`
`43`	`43`	`[InlineData(null, "Todos.Todo", 4)]`
`44`	`44`	`public async Task ReturnFilteredOpenApiDocBasedOnOperationIdsAndInputCsdlDocument(string operationIds, string tags, int expectedPathCount)`
`45`	`45`	`{`