More sacrifices made

Author: darrelmiller

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -55,18 +55,19 @@ public static async Task TransformOpenApiDocument(
             CancellationToken cancellationToken
            )
         {
+            if (string.IsNullOrEmpty(openapi) && string.IsNullOrEmpty(csdl))
+            {
+                throw new ArgumentException("Please input a file path or URL");
+            }
 
             try
             {
-                if (string.IsNullOrEmpty(openapi) && string.IsNullOrEmpty(csdl))
-                {
-                    throw new ArgumentException("Please input a file path or URL");
-                }
                 if (output == null)
                 {
                     var inputExtension = GetInputPathExtension(openapi, csdl);
                     output = new FileInfo($"./output{inputExtension}");
                 };
+
                 if (cleanoutput && output.Exists)
                 {
                     output.Delete();
@@ -87,7 +88,11 @@ CancellationToken cancellationToken
             catch (TaskCanceledException)
             {
                 Console.Error.WriteLine("CTRL+C pressed, aborting the operation.");
-            }            
+            }
+            catch (IOException)
+            {
+                throw;
+            }
             catch (Exception ex)
             {
                 throw new InvalidOperationException($"Could not transform the document, reason: {ex.Message}", ex);
@@ -239,12 +244,13 @@ public static async Task ValidateOpenApiDocument(
             ILogger logger, 
             CancellationToken cancellationToken)
         {
+            if (string.IsNullOrEmpty(openapi))
+            {
+                throw new ArgumentNullException(nameof(openapi));
+            }
+
             try
             {
-                if (string.IsNullOrEmpty(openapi))
-                {
-                    throw new ArgumentNullException(nameof(openapi));
-                }
                 using var stream = await GetStream(openapi, logger, cancellationToken);
 
                 var result = await ParseOpenApi(openapi, false, logger, stream);

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

@@ -142,20 +142,38 @@ public async Task ShowCommandGeneratesMermaidMarkdownFileFromCsdlWithMermaidDiag
             Assert.Contains("graph LR", output);
         }
 
+        [Fact]
+        public async Task ThrowIfOpenApiUrlIsNotProvidedWhenValidating()
+        {
+            await Assert.ThrowsAsync<ArgumentNullException>(async () =>
+                await OpenApiService.ValidateOpenApiDocument("", new Logger<OpenApiService>(new LoggerFactory()), new CancellationToken()));
+        }
+
+
         [Fact]
         public async Task ThrowIfURLIsNotResolvableWhenValidating()
         {
-            var message = Assert.ThrowsAsync<InvalidOperationException>(async () =>
+            await Assert.ThrowsAsync<InvalidOperationException>(async () =>
                 await OpenApiService.ValidateOpenApiDocument("https://example.org/itdoesnmatter", new Logger<OpenApiService>(new LoggerFactory()), new CancellationToken()));
         }
 
         [Fact]
         public async Task ThrowIfFileDoesNotExistWhenValidating()
         {
-            var message = Assert.ThrowsAsync<InvalidOperationException>(async () =>
+            await Assert.ThrowsAsync<InvalidOperationException>(async () =>
                 await OpenApiService.ValidateOpenApiDocument("aFileThatBetterNotExist.fake", new Logger<OpenApiService>(new LoggerFactory()), new CancellationToken()));
         }
 
+        [Fact]
+        public async Task ValidateCommandProcessesOpenApi()
+        {
+            // create a dummy ILogger instance for testing
+            await OpenApiService.ValidateOpenApiDocument("UtilityFiles\\SampleOpenApi.yml", new Logger<OpenApiService>(new LoggerFactory()), new CancellationToken());
+
+            Assert.True(true);
+        }
+
+
         [Fact]
         public async Task TransformCommandConvertsOpenApi()
         {
@@ -167,6 +185,14 @@ public async Task TransformCommandConvertsOpenApi()
             Assert.NotEmpty(output);
         }
 
+        [Fact]
+        public async Task ThrowTransformCommandIfOpenApiAndCsdlAreEmpty()
+        {
+            await Assert.ThrowsAsync<ArgumentException>(async () =>
+                await OpenApiService.TransformOpenApiDocument(null, null, null, null, true, null, null, false, null, false, false, null, null, null, new Logger<OpenApiService>(new LoggerFactory()), new CancellationToken()));
+
+        }
+
         [Fact]
         public void InvokeTransformCommand()
         {