- fixes conversion tests and makes method async

Author: baywet

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -92,7 +92,7 @@ string filterbycollection
                 version ??= OpenApiSpecVersion.OpenApi3_0;
 
                 stream = await GetStream(csdl, logger);
-                document = ConvertCsdlToOpenApi(stream);
+                document = await ConvertCsdlToOpenApi(stream);
             }
             else
             {
@@ -198,10 +198,10 @@ string filterbycollection
         /// </summary>
         /// <param name="csdl">The CSDL stream.</param>
         /// <returns>An OpenAPI document.</returns>
-        public static OpenApiDocument ConvertCsdlToOpenApi(Stream csdl)
+        public static async Task<OpenApiDocument> ConvertCsdlToOpenApi(Stream csdl)
         {
             using var reader = new StreamReader(csdl);
-            var csdlText = reader.ReadToEndAsync().GetAwaiter().GetResult();           
+            var csdlText = await reader.ReadToEndAsync();
             var edmModel = CsdlReader.Parse(XElement.Parse(csdlText).CreateReader());
 
             var settings = new OpenApiConvertSettings()

test/Microsoft.OpenApi.Tests/Services/OpenApiServiceTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Threading.Tasks;
 using Microsoft.OpenApi.Hidi;
 using Microsoft.OpenApi.Services;
 using Xunit;
@@ -12,36 +13,36 @@ namespace Microsoft.OpenApi.Tests.Services
     public class OpenApiServiceTests
     {
         [Fact]
-        public void ReturnConvertedCSDLFile()
+        public async Task ReturnConvertedCSDLFile()
         {
             // Arrange
             var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "UtilityFiles\\Todo.xml");
             var fileInput = new FileInfo(filePath);
             var csdlStream = fileInput.OpenRead();
 
             // Act
-            var openApiDoc = OpenApiService.ConvertCsdlToOpenApi(csdlStream);
-            var expectedPathCount = 5;
+            var openApiDoc = await OpenApiService.ConvertCsdlToOpenApi(csdlStream);
+            var expectedPathCount = 6;
 
             // Assert
             Assert.NotNull(openApiDoc);
             Assert.NotEmpty(openApiDoc.Paths);
-            Assert.Equal(openApiDoc.Paths.Count, expectedPathCount);
+            Assert.Equal(expectedPathCount, openApiDoc.Paths.Count);
         }
 
         [Theory]
         [InlineData("Todos.Todo.UpdateTodo",null, 1)]
         [InlineData("Todos.Todo.ListTodo",null, 1)]
         [InlineData(null, "Todos.Todo", 4)]
-        public void ReturnFilteredOpenApiDocBasedOnOperationIdsAndInputCsdlDocument(string operationIds, string tags, int expectedPathCount)
+        public async Task ReturnFilteredOpenApiDocBasedOnOperationIdsAndInputCsdlDocument(string operationIds, string tags, int expectedPathCount)
         {
             // Arrange
             var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "UtilityFiles\\Todo.xml");
             var fileInput = new FileInfo(filePath);
             var csdlStream = fileInput.OpenRead();
 
             // Act
-            var openApiDoc = OpenApiService.ConvertCsdlToOpenApi(csdlStream);
+            var openApiDoc = await OpenApiService.ConvertCsdlToOpenApi(csdlStream);
             var predicate = OpenApiFilterService.CreatePredicate(operationIds, tags);
             var subsetOpenApiDocument = OpenApiFilterService.CreateFilteredDocument(openApiDoc, predicate);