code cleanup

MaggieKimani1 · MaggieKimani1 · commit 5dc7876eca65 · 2024-11-26T16:36:27.000+03:00
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs
@@ -3,11 +3,9 @@
 
 using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
 using Microsoft.OpenApi.Services;
 using Microsoft.OpenApi.Tests.UtilityFiles;
 using Moq;
-using SharpYaml.Tokens;
 using Xunit;
 
 namespace Microsoft.OpenApi.Hidi.Tests
diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System.CommandLine;
@@ -335,7 +335,7 @@ public async Task InvokeShowCommandAsync()
             var openApi = Path.Combine(".", "UtilityFiles", "SampleOpenApi.yml");
             var args = new[] { "show", "-d", openApi, "-o", "sample.md" };
             var parseResult = rootCommand.Parse(args);
-            var handler = rootCommand.Subcommands.Where(c => c.Name == "show").First().Handler;
+            var handler = rootCommand.Subcommands.First(c => c.Name == "show").Handler;
             var context = new InvocationContext(parseResult);
 
             await handler!.InvokeAsync(context);
@@ -351,7 +351,7 @@ public async Task InvokePluginCommandAsync()
             var manifest = Path.Combine(".", "UtilityFiles", "exampleapimanifest.json");
             var args = new[] { "plugin", "-m", manifest, "--of", AppDomain.CurrentDomain.BaseDirectory };
             var parseResult = rootCommand.Parse(args);
-            var handler = rootCommand.Subcommands.Where(c => c.Name == "plugin").First().Handler;
+            var handler = rootCommand.Subcommands.First(c => c.Name == "plugin").Handler;
             var context = new InvocationContext(parseResult);
 
             await handler!.InvokeAsync(context);
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+﻿using System.Linq;
 using FluentAssertions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader;
@@ -63,7 +63,7 @@ public void JustHostNoDefault()
                 """;
             var result = OpenApiDocument.Parse(input, "yaml");
 
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("//www.foo.com", server.Url);
         }
@@ -88,7 +88,7 @@ public void NoBasePath()
             };
 
             var result = OpenApiDocument.Parse(input, "yaml", settings);
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("http://www.foo.com", server.Url);
         }
@@ -107,7 +107,7 @@ public void JustBasePathNoDefault()
                 """;
             var result = OpenApiDocument.Parse(input, "yaml");
 
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("/baz", server.Url);
         }
@@ -132,7 +132,7 @@ public void JustSchemeWithCustomHost()
 
             var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("http://bing.com/foo", server.Url);
         }
@@ -157,7 +157,7 @@ public void JustSchemeWithCustomHostWithEmptyPath()
 
             var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("http://bing.com", server.Url);
         }
@@ -181,7 +181,7 @@ public void JustBasePathWithCustomHost()
 
             var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("https://bing.com/api", server.Url);
         }
@@ -205,7 +205,7 @@ public void JustHostWithCustomHost()
 
             var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("https://www.example.com", server.Url);
         }
@@ -229,7 +229,7 @@ public void JustHostWithCustomHostWithApi()
             };
 
             var result = OpenApiDocument.Parse(input, "yaml", settings);
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("https://prod.bing.com", server.Url);
         }
@@ -255,7 +255,7 @@ public void MultipleServers()
             };
 
             var result = OpenApiDocument.Parse(input, "yaml", settings);
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Equal(2, result.OpenApiDocument.Servers.Count);
             Assert.Equal("http://dev.bing.com/api", server.Url);
             Assert.Equal("https://dev.bing.com/api", result.OpenApiDocument.Servers.Last().Url);
@@ -281,7 +281,7 @@ public void LocalHostWithCustomHost()
 
             var result = OpenApiDocument.Parse(input, "yaml", settings);
 
-            var server = result.OpenApiDocument.Servers.First();
+            var server = result.OpenApiDocument.Servers[0];
             Assert.Single(result.OpenApiDocument.Servers);
             Assert.Equal("https://localhost:23232", server.Url);
         }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
@@ -396,7 +396,6 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
             var outputWriter = new StringWriter(CultureInfo.InvariantCulture);
             var writer = new OpenApiJsonWriter(outputWriter, new() { InlineLocalReferences = true });
             actual.OpenApiDocument.SerializeAsV31(writer);
-            var serialized = outputWriter.ToString();
         }
 
         [Fact]
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiInfoTests.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.IO;
 using System.Linq;
 using FluentAssertions;
@@ -22,7 +22,7 @@ public void ParseBasicInfoShouldSucceed()
             using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicInfo.yaml"));
             var yamlStream = new YamlStream();
             yamlStream.Load(new StreamReader(stream));
-            var yamlNode = yamlStream.Documents.First().RootNode;
+            var yamlNode = yamlStream.Documents[0].RootNode;
 
             var diagnostic = new OpenApiDiagnostic();
             var context = new ParsingContext(diagnostic);
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiLicenseTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiLicenseTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.IO;
@@ -25,7 +25,7 @@ public void ParseLicenseWithSpdxIdentifierShouldSucceed()
             using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "licenseWithSpdxIdentifier.yaml"));
             var yamlStream = new YamlStream();
             yamlStream.Load(new StreamReader(stream));
-            var yamlNode = yamlStream.Documents.First().RootNode;
+            var yamlNode = yamlStream.Documents[0].RootNode;
 
             var diagnostic = new OpenApiDiagnostic();
             var context = new ParsingContext(diagnostic);
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -1118,7 +1118,7 @@ public void GlobalSecurityRequirementShouldReferenceSecurityScheme()
         {
             var result = OpenApiDocument.Load(System.IO.Path.Combine(SampleFolderPath, "securedApi.yaml"));
 
-            var securityRequirement = result.OpenApiDocument.SecurityRequirements.First();
+            var securityRequirement = result.OpenApiDocument.SecurityRequirements[0];
 
             securityRequirement.Keys.First().Should().BeEquivalentTo(result.OpenApiDocument.Components.SecuritySchemes.First().Value,
                 options => options.Excluding(x => x.Reference));
@@ -1331,10 +1331,9 @@ public void ParseDocWithRefsUsingProxyReferencesSucceeds()
 
             // Act
             var doc = OpenApiDocument.Load(stream, "yaml").OpenApiDocument;
-            var actualParam = doc.Paths["/pets"].Operations[OperationType.Get].Parameters.First();
+            var actualParam = doc.Paths["/pets"].Operations[OperationType.Get].Parameters[0];
             var outputDoc = doc.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0).MakeLineBreaksEnvironmentNeutral();
-            var output = actualParam.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
-            var expectedParam = expected.Paths["/pets"].Operations[OperationType.Get].Parameters.First();
+            var expectedParam = expected.Paths["/pets"].Operations[OperationType.Get].Parameters[0];
 
             // Assert
             actualParam.Should().BeEquivalentTo(expectedParam, options => options
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.IO;
@@ -63,9 +63,6 @@ public void ParseAdvancedExampleShouldSucceed()
                 }
             };
 
-            var actualRoot = example.Value["versions"][0]["status"].Root;
-            var expectedRoot = expected.Value["versions"][0]["status"].Root;
-
             diagnostic.Errors.Should().BeEmpty();
 
             example.Should().BeEquivalentTo(expected, options => options.IgnoringCyclicReferences()
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
 using System.IO;
@@ -26,7 +26,7 @@ public void OperationWithSecurityRequirementShouldReferenceSecurityScheme()
         {
             var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "securedOperation.yaml"));
 
-            var securityScheme = result.OpenApiDocument.Paths["/"].Operations[OperationType.Get].Security.First().Keys.First();
+            var securityScheme = result.OpenApiDocument.Paths["/"].Operations[OperationType.Get].Security[0].Keys.First();
 
             securityScheme.Should().BeEquivalentTo(result.OpenApiDocument.Components.SecuritySchemes.First().Value, 
                 options => options.Excluding(x => x.Reference));
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
@@ -36,7 +36,7 @@ public void ParsePrimitiveSchemaShouldSucceed()
             using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "primitiveSchema.yaml"));
             var yamlStream = new YamlStream();
             yamlStream.Load(new StreamReader(stream));
-            var yamlNode = yamlStream.Documents.First().RootNode;
+            var yamlNode = yamlStream.Documents[0].RootNode;
 
             var diagnostic = new OpenApiDiagnostic();
             var context = new ParsingContext(diagnostic);
@@ -66,10 +66,9 @@ public void ParseExampleStringFragmentShouldSucceed()
   ""foo"": ""bar"",
   ""baz"": [ 1,2]
 }";
-            var diagnostic = new OpenApiDiagnostic();
 
             // Act
-            var openApiAny = OpenApiModelFactory.Parse<OpenApiAny>(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic);
+            var openApiAny = OpenApiModelFactory.Parse<OpenApiAny>(input, OpenApiSpecVersion.OpenApi3_0, out var diagnostic);
 
             // Assert
             diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic());
@@ -90,10 +89,9 @@ public void ParseEnumFragmentShouldSucceed()
   ""foo"",
   ""baz""
 ]";
-            var diagnostic = new OpenApiDiagnostic();
 
             // Act
-            var openApiAny = OpenApiModelFactory.Parse<OpenApiAny>(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic);
+            var openApiAny = OpenApiModelFactory.Parse<OpenApiAny>(input, OpenApiSpecVersion.OpenApi3_0, out var diagnostic);
 
             // Assert
             diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic());
@@ -116,10 +114,9 @@ public void ParsePathFragmentShouldSucceed()
     '200':
       description: Ok
 ";
-            var diagnostic = new OpenApiDiagnostic();
 
             // Act
-            var openApiAny = OpenApiModelFactory.Parse<OpenApiPathItem>(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic, "yaml");
+            var openApiAny = OpenApiModelFactory.Parse<OpenApiPathItem>(input, OpenApiSpecVersion.OpenApi3_0, out var diagnostic, "yaml");
 
             // Assert
             diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic());
@@ -151,7 +148,7 @@ public void ParseDictionarySchemaShouldSucceed()
             {
                 var yamlStream = new YamlStream();
                 yamlStream.Load(new StreamReader(stream));
-                var yamlNode = yamlStream.Documents.First().RootNode;
+                var yamlNode = yamlStream.Documents[0].RootNode;
 
                 var diagnostic = new OpenApiDiagnostic();
                 var context = new ParsingContext(diagnostic);
@@ -183,7 +180,7 @@ public void ParseBasicSchemaWithExampleShouldSucceed()
             using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicSchemaWithExample.yaml"));
             var yamlStream = new YamlStream();
             yamlStream.Load(new StreamReader(stream));
-            var yamlNode = yamlStream.Documents.First().RootNode;
+            var yamlNode = yamlStream.Documents[0].RootNode;
 
             var diagnostic = new OpenApiDiagnostic();
             var context = new ParsingContext(diagnostic);
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System;
@@ -1582,8 +1582,6 @@ public void SerializeDocumentWithReferenceButNoComponents()
                 }
             };
 
-            var reference = document.Paths["/"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema.Reference;
-
             // Act
             var actual = document.Serialize(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Json);
 
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -149,13 +149,13 @@ public void CallbackReferenceResolutionWorks()
             Assert.NotEmpty(_externalCallbackReference.PathItems);
             Assert.Single(_externalCallbackReference.PathItems);
             Assert.Equal("{$request.body#/callbackUrl}", _externalCallbackReference.PathItems.First().Key.Expression);
-            Assert.Equal(OperationType.Post, _externalCallbackReference.PathItems.FirstOrDefault().Value.Operations.FirstOrDefault().Key);;
+            Assert.Equal(OperationType.Post, _externalCallbackReference.PathItems.FirstOrDefault().Value.Operations.FirstOrDefault().Key);
 
             // Local reference resolution works
             Assert.NotEmpty(_localCallbackReference.PathItems);
             Assert.Single(_localCallbackReference.PathItems);
             Assert.Equal("{$request.body#/callbackUrl}", _localCallbackReference.PathItems.First().Key.Expression);
-            Assert.Equal(OperationType.Post, _localCallbackReference.PathItems.FirstOrDefault().Value.Operations.FirstOrDefault().Key); ;
+            Assert.Equal(OperationType.Post, _localCallbackReference.PathItems.FirstOrDefault().Value.Operations.FirstOrDefault().Key);
         }
 
         [Theory]
diff --git a/test/Microsoft.OpenApi.Trimming.Tests/Microsoft.OpenApi.Trimming.Tests.csproj b/test/Microsoft.OpenApi.Trimming.Tests/Microsoft.OpenApi.Trimming.Tests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
     <TrimmerRootAssembly Include="Microsoft.OpenApi" />
-    <!-- TODO: Microsoft.OpenApi.Readers has not been configured for native AoT. -->
+    <!-- TODO: Microsoft.OpenApi.YamlReader has not been configured for native AoT. -->
   </ItemGroup>
 
 </Project>
