I am confidence I have enough tests now

microsoft · Jan 16, 2023 · 7638805 · 7638805
1 parent 96fae88
commit 7638805
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs
@@ -505,7 +505,7 @@ private static string GetInputPathExtension(string openapi = null, string csdl =
             return extension;
         }
 
-        internal static async Task ShowOpenApiDocument(string openapi, string csdl, string csdlFilter, FileInfo output, ILogger logger, CancellationToken cancellationToken)
+        internal static async Task<string> ShowOpenApiDocument(string openapi, string csdl, string csdlFilter, FileInfo output, ILogger logger, CancellationToken cancellationToken)
         {
             try
             {
@@ -542,6 +542,8 @@ internal static async Task ShowOpenApiDocument(string openapi, string csdl, stri
                         process.StartInfo.FileName = output.FullName;
                         process.StartInfo.UseShellExecute = true;
                         process.Start();
+
+                        return output.FullName;
                     }
                     else  // Write diagram as Markdown document to output file
                     {
@@ -551,6 +553,7 @@ internal static async Task ShowOpenApiDocument(string openapi, string csdl, stri
                             WriteTreeDocumentAsMarkdown(openapi ?? csdl, document, writer);
                         }
                         logger.LogTrace("Created markdown document with diagram ");
+                        return output.FullName;
                     }                      
                 }
             }
@@ -562,6 +565,7 @@ internal static async Task ShowOpenApiDocument(string openapi, string csdl, stri
             {
                 throw new InvalidOperationException($"Could not generate the document, reason: {ex.Message}", ex);
             }
+            return null;
         }
 
         private static void LogErrors(ILogger logger, ReadResult result)

diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs
@@ -84,11 +84,13 @@ public void ReturnOpenApiConvertSettingsWhenSettingsFileIsProvided(string filePa
         [Fact]
         public void ShowCommandGeneratesMermaidDiagramAsMarkdown()
         {
-            var openApiDoc = new OpenApiDocument();
-            openApiDoc.Info = new OpenApiInfo
+            var openApiDoc = new OpenApiDocument
             {
-                Title = "Test",
-                Version = "1.0.0"
+                Info = new OpenApiInfo
+                {
+                    Title = "Test",
+                    Version = "1.0.0"
+                }
             };
             var stream = new MemoryStream();
             using var writer = new StreamWriter(stream);
@@ -101,13 +103,15 @@ public void ShowCommandGeneratesMermaidDiagramAsMarkdown()
         }
 
         [Fact]
-        public void ShowCommandGeneratesMermaidDiagramAsHtml ()
+        public void ShowCommandGeneratesMermaidDiagramAsHtml()
         {
-            var openApiDoc = new OpenApiDocument();
-            openApiDoc.Info = new OpenApiInfo
+            var openApiDoc = new OpenApiDocument
             {
-                Title = "Test",
-                Version = "1.0.0"
+                Info = new OpenApiInfo
+                {
+                    Title = "Test",
+                    Version = "1.0.0"
+                }
             };
             var stream = new MemoryStream();
             using var writer = new StreamWriter(stream);
@@ -118,7 +122,7 @@ public void ShowCommandGeneratesMermaidDiagramAsHtml ()
             var output = reader.ReadToEnd();
             Assert.Contains("graph LR", output);
         }
-
+        
 
         [Fact]
         public async Task ShowCommandGeneratesMermaidMarkdownFileWithMermaidDiagram()
@@ -131,6 +135,13 @@ public async Task ShowCommandGeneratesMermaidMarkdownFileWithMermaidDiagram()
             Assert.Contains("graph LR", output);
         }
 
+        [Fact]
+        public async Task ShowCommandGeneratesMermaidHtmlFileWithMermaidDiagram()
+        {
+            var filePath = await OpenApiService.ShowOpenApiDocument("UtilityFiles\\SampleOpenApi.yml", null, null, null, new Logger<OpenApiService>(new LoggerFactory()), new CancellationToken());
+            Assert.True(File.Exists(filePath));
+        }
+
         [Fact]
         public async Task ShowCommandGeneratesMermaidMarkdownFileFromCsdlWithMermaidDiagram()
         {
@@ -185,6 +196,7 @@ public async Task TransformCommandConvertsOpenApi()
             Assert.NotEmpty(output);
         }
 
+
         [Fact]
         public async Task TransformCommandConvertsOpenApiWithDefaultOutputname()
         {
@@ -195,6 +207,16 @@ public async Task TransformCommandConvertsOpenApiWithDefaultOutputname()
             Assert.NotEmpty(output);
         }
 
+        [Fact]
+        public async Task TransformCommandConvertsCsdlWithDefaultOutputname()
+        {
+            // create a dummy ILogger instance for testing
+            await OpenApiService.TransformOpenApiDocument(null, "UtilityFiles\\Todo.xml", null, null, true, null, null, false, null, false, false, null, null, null, new Logger<OpenApiService>(new LoggerFactory()), new CancellationToken());
+
+            var output = File.ReadAllText("output.yml");
+            Assert.NotEmpty(output);
+        }
+
         [Fact]
         public async Task TransformCommandConvertsOpenApiWithDefaultOutputnameAndSwitchFormat()
         {