From 9901516a285afd10ba0f13b378f38acdc11a5dd4 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Tue, 3 Oct 2023 20:23:27 +1100 Subject: [PATCH] make indents consistent --- .../OpenApiPrimaryErrorMessageExtension.cs | 41 +- ...penApiPrimaryErrorMessageExtensionTests.cs | 83 +-- .../Visitors/InheritanceTests.cs | 664 +++++++++--------- 3 files changed, 397 insertions(+), 391 deletions(-) diff --git a/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs index 9a92e0d6e..ed328c433 100644 --- a/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs +++ b/src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs @@ -15,31 +15,34 @@ namespace Microsoft.OpenApi.MicrosoftExtensions; /// public class OpenApiPrimaryErrorMessageExtension : IOpenApiExtension { - /// - /// Name of the extension as used in the description. - /// - public static string Name => "x-ms-primary-error-message"; - /// + /// + /// Name of the extension as used in the description. + /// + public static string Name => "x-ms-primary-error-message"; + + /// public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion) { - if(writer is null) throw new ArgumentNullException(nameof(writer)); - writer.WriteValue(IsPrimaryErrorMessage); + if (writer is null) throw new ArgumentNullException(nameof(writer)); + writer.WriteValue(IsPrimaryErrorMessage); } - /// - /// Whether this property is the primary error message to use on error types. - /// - public bool IsPrimaryErrorMessage { get; set; } - /// + + /// + /// Whether this property is the primary error message to use on error types. + /// + public bool IsPrimaryErrorMessage { get; set; } + + /// /// Parses the to . /// /// The source object. /// The . - public static OpenApiPrimaryErrorMessageExtension Parse(IOpenApiAny source) - { - if (source is not OpenApiBoolean rawObject) throw new ArgumentOutOfRangeException(nameof(source)); - return new OpenApiPrimaryErrorMessageExtension + public static OpenApiPrimaryErrorMessageExtension Parse(IOpenApiAny source) + { + if (source is not OpenApiBoolean rawObject) throw new ArgumentOutOfRangeException(nameof(source)); + return new OpenApiPrimaryErrorMessageExtension { - IsPrimaryErrorMessage = rawObject.Value - }; - } + IsPrimaryErrorMessage = rawObject.Value + }; + } } diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs index 89c427935..15a6e8659 100644 --- a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs +++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs @@ -12,44 +12,47 @@ namespace Microsoft.OpenApi.OData.OpenApiExtensions.Tests; public class OpenApiPrimaryErrorMessageExtensionTests { - [Fact] - public void ExtensionNameMatchesExpected() - { - // Act - string name = OpenApiPrimaryErrorMessageExtension.Name; - string expectedName = "x-ms-primary-error-message"; - - // Assert - Assert.Equal(expectedName, name); - } - [Fact] - public void WritesValue() - { - // Arrange - OpenApiPrimaryErrorMessageExtension extension = new() { - IsPrimaryErrorMessage = true - }; - using TextWriter sWriter = new StringWriter(); - OpenApiJsonWriter writer = new(sWriter); - - // Act - extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); - - // Assert - Assert.True(extension.IsPrimaryErrorMessage); - Assert.Equal("true", result); - } - [Fact] - public void ParsesValue() - { - // Arrange - var value = new OpenApiBoolean(true); - - // Act - var extension = OpenApiPrimaryErrorMessageExtension.Parse(value); - - // Assert - Assert.True(extension.IsPrimaryErrorMessage); - } + [Fact] + public void ExtensionNameMatchesExpected() + { + // Act + string name = OpenApiPrimaryErrorMessageExtension.Name; + string expectedName = "x-ms-primary-error-message"; + + // Assert + Assert.Equal(expectedName, name); + } + + [Fact] + public void WritesValue() + { + // Arrange + OpenApiPrimaryErrorMessageExtension extension = new() + { + IsPrimaryErrorMessage = true + }; + using TextWriter sWriter = new StringWriter(); + OpenApiJsonWriter writer = new(sWriter); + + // Act + extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); + string result = sWriter.ToString(); + + // Assert + Assert.True(extension.IsPrimaryErrorMessage); + Assert.Equal("true", result); + } + + [Fact] + public void ParsesValue() + { + // Arrange + var value = new OpenApiBoolean(true); + + // Act + var extension = OpenApiPrimaryErrorMessageExtension.Parse(value); + + // Assert + Assert.True(extension.IsPrimaryErrorMessage); + } } diff --git a/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs b/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs index 2f883711a..6a8286c1d 100644 --- a/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Visitors/InheritanceTests.cs @@ -8,336 +8,336 @@ namespace Microsoft.OpenApi.Tests.Visitors { - public class InheritanceTests - { - [Fact] - public void ExpectedVirtualsInvolved() - { - OpenApiVisitorBase visitor = null; - - visitor = new TestVisitor(); - - visitor.Enter(default); - visitor.Visit(default(OpenApiDocument)); - visitor.Visit(default(OpenApiInfo)); - visitor.Visit(default(OpenApiContact)); - visitor.Visit(default(OpenApiLicense)); - visitor.Visit(default(IList)); - visitor.Visit(default(OpenApiServer)); - visitor.Visit(default(OpenApiPaths)); - visitor.Visit(default(OpenApiPathItem)); - visitor.Visit(default(OpenApiServerVariable)); - visitor.Visit(default(IDictionary)); - visitor.Visit(default(OpenApiOperation)); - visitor.Visit(default(IList)); - visitor.Visit(default(OpenApiParameter)); - visitor.Visit(default(OpenApiRequestBody)); - visitor.Visit(default(IDictionary)); - visitor.Visit(default(IDictionary)); - visitor.Visit(default(OpenApiResponse)); - visitor.Visit(default(OpenApiResponses)); - visitor.Visit(default(IDictionary)); - visitor.Visit(default(OpenApiMediaType)); - visitor.Visit(default(OpenApiEncoding)); - visitor.Visit(default(IDictionary)); - visitor.Visit(default(OpenApiComponents)); - visitor.Visit(default(OpenApiExternalDocs)); - visitor.Visit(default(OpenApiSchema)); - visitor.Visit(default(IDictionary)); - visitor.Visit(default(OpenApiLink)); - visitor.Visit(default(OpenApiCallback)); - visitor.Visit(default(OpenApiTag)); - visitor.Visit(default(OpenApiHeader)); - visitor.Visit(default(OpenApiOAuthFlow)); - visitor.Visit(default(OpenApiSecurityRequirement)); - visitor.Visit(default(OpenApiSecurityScheme)); - visitor.Visit(default(OpenApiExample)); - visitor.Visit(default(IList)); - visitor.Visit(default(IList)); - visitor.Visit(default(IOpenApiExtensible)); - visitor.Visit(default(IOpenApiExtension)); - visitor.Visit(default(IList)); - visitor.Visit(default(IDictionary)); - visitor.Visit(default(IDictionary)); - visitor.Visit(default(IOpenApiReferenceable)); - visitor.Exit(); - Assert.True(42 < ((TestVisitor)visitor).CallStack.Count()); - } - - internal protected class TestVisitor : OpenApiVisitorBase - { - public Stack CallStack { get; } = new Stack(); - - private string EncodeCall([CallerMemberName] string name="", [CallerLineNumber]int lineNumber = 0) - { - var encoding = $"{name}:{lineNumber}"; - CallStack.Push(encoding); - return encoding; - } - - public override void Enter(string segment) - { - EncodeCall(); - base.Enter(segment); - } - - public override void Exit() - { - EncodeCall(); - base.Exit(); - } - - public override void Visit(OpenApiDocument doc) - { - EncodeCall(); - base.Visit(doc); - } - - public override void Visit(OpenApiInfo info) - { - EncodeCall(); - base.Visit(info); - } - - public override void Visit(OpenApiContact contact) - { - EncodeCall(); - base.Visit(contact); - } - - public override void Visit(OpenApiLicense license) - { - EncodeCall(); - base.Visit(license); - } - - public override void Visit(IList servers) - { - EncodeCall(); - base.Visit(servers); - } - - public override void Visit(OpenApiServer server) - { - EncodeCall(); - base.Visit(server); - } - - public override void Visit(OpenApiPaths paths) - { - EncodeCall(); - base.Visit(paths); - } - - public override void Visit(OpenApiPathItem pathItem) - { - EncodeCall(); - base.Visit(pathItem); - } - - public override void Visit(OpenApiServerVariable serverVariable) - { - EncodeCall(); - base.Visit(serverVariable); - } - - public override void Visit(IDictionary operations) - { - EncodeCall(); - base.Visit(operations); - } - - public override void Visit(OpenApiOperation operation) - { - EncodeCall(); - base.Visit(operation); - } - - public override void Visit(IList parameters) - { - EncodeCall(); - base.Visit(parameters); - } - - public override void Visit(OpenApiParameter parameter) - { - EncodeCall(); - base.Visit(parameter); - } - - public override void Visit(OpenApiRequestBody requestBody) - { - EncodeCall(); - base.Visit(requestBody); - } - - public override void Visit(IDictionary headers) - { - EncodeCall(); - base.Visit(headers); - } - - public override void Visit(IDictionary callbacks) - { - EncodeCall(); - base.Visit(callbacks); - } - - public override void Visit(OpenApiResponse response) - { - EncodeCall(); - base.Visit(response); - } - - public override void Visit(OpenApiResponses response) - { - EncodeCall(); - base.Visit(response); - } - - public override void Visit(IDictionary content) - { - EncodeCall(); - base.Visit(content); - } - - public override void Visit(OpenApiMediaType mediaType) - { - EncodeCall(); - base.Visit(mediaType); - } - - public override void Visit(OpenApiEncoding encoding) - { - EncodeCall(); - base.Visit(encoding); - } - - public override void Visit(IDictionary examples) - { - EncodeCall(); - base.Visit(examples); - } - - public override void Visit(OpenApiComponents components) - { - EncodeCall(); - base.Visit(components); - } - - public override void Visit(OpenApiExternalDocs externalDocs) - { - EncodeCall(); - base.Visit(externalDocs); - } - - public override void Visit(OpenApiSchema schema) - { - EncodeCall(); - base.Visit(schema); - } - - public override void Visit(IDictionary links) - { - EncodeCall(); - base.Visit(links); - } - - public override void Visit(OpenApiLink link) - { - EncodeCall(); - base.Visit(link); - } - - public override void Visit(OpenApiCallback callback) - { - EncodeCall(); - base.Visit(callback); - } - - public override void Visit(OpenApiTag tag) - { - EncodeCall(); - base.Visit(tag); - } - - public override void Visit(OpenApiHeader tag) - { - EncodeCall(); - base.Visit(tag); - } - - public override void Visit(OpenApiOAuthFlow openApiOAuthFlow) - { - EncodeCall(); - base.Visit(openApiOAuthFlow); - } - - public override void Visit(OpenApiSecurityRequirement securityRequirement) - { - EncodeCall(); - base.Visit(securityRequirement); - } - - public override void Visit(OpenApiSecurityScheme securityScheme) - { - EncodeCall(); - base.Visit(securityScheme); - } - - public override void Visit(OpenApiExample example) - { - EncodeCall(); - base.Visit(example); - } - - public override void Visit(IList openApiTags) - { - EncodeCall(); - base.Visit(openApiTags); - } - - public override void Visit(IList openApiSecurityRequirements) - { - EncodeCall(); - base.Visit(openApiSecurityRequirements); - } - - public override void Visit(IOpenApiExtensible openApiExtensible) - { - EncodeCall(); - base.Visit(openApiExtensible); - } - - public override void Visit(IOpenApiExtension openApiExtension) - { - EncodeCall(); - base.Visit(openApiExtension); - } - - public override void Visit(IList example) - { - EncodeCall(); - base.Visit(example); - } - - public override void Visit(IDictionary serverVariables) - { - EncodeCall(); - base.Visit(serverVariables); - } - - public override void Visit(IDictionary encodings) - { - EncodeCall(); - base.Visit(encodings); - } - - public override void Visit(IOpenApiReferenceable referenceable) - { - EncodeCall(); - base.Visit(referenceable); - } - } - } + public class InheritanceTests + { + [Fact] + public void ExpectedVirtualsInvolved() + { + OpenApiVisitorBase visitor = null; + + visitor = new TestVisitor(); + + visitor.Enter(default); + visitor.Visit(default(OpenApiDocument)); + visitor.Visit(default(OpenApiInfo)); + visitor.Visit(default(OpenApiContact)); + visitor.Visit(default(OpenApiLicense)); + visitor.Visit(default(IList)); + visitor.Visit(default(OpenApiServer)); + visitor.Visit(default(OpenApiPaths)); + visitor.Visit(default(OpenApiPathItem)); + visitor.Visit(default(OpenApiServerVariable)); + visitor.Visit(default(IDictionary)); + visitor.Visit(default(OpenApiOperation)); + visitor.Visit(default(IList)); + visitor.Visit(default(OpenApiParameter)); + visitor.Visit(default(OpenApiRequestBody)); + visitor.Visit(default(IDictionary)); + visitor.Visit(default(IDictionary)); + visitor.Visit(default(OpenApiResponse)); + visitor.Visit(default(OpenApiResponses)); + visitor.Visit(default(IDictionary)); + visitor.Visit(default(OpenApiMediaType)); + visitor.Visit(default(OpenApiEncoding)); + visitor.Visit(default(IDictionary)); + visitor.Visit(default(OpenApiComponents)); + visitor.Visit(default(OpenApiExternalDocs)); + visitor.Visit(default(OpenApiSchema)); + visitor.Visit(default(IDictionary)); + visitor.Visit(default(OpenApiLink)); + visitor.Visit(default(OpenApiCallback)); + visitor.Visit(default(OpenApiTag)); + visitor.Visit(default(OpenApiHeader)); + visitor.Visit(default(OpenApiOAuthFlow)); + visitor.Visit(default(OpenApiSecurityRequirement)); + visitor.Visit(default(OpenApiSecurityScheme)); + visitor.Visit(default(OpenApiExample)); + visitor.Visit(default(IList)); + visitor.Visit(default(IList)); + visitor.Visit(default(IOpenApiExtensible)); + visitor.Visit(default(IOpenApiExtension)); + visitor.Visit(default(IList)); + visitor.Visit(default(IDictionary)); + visitor.Visit(default(IDictionary)); + visitor.Visit(default(IOpenApiReferenceable)); + visitor.Exit(); + Assert.True(42 < ((TestVisitor)visitor).CallStack.Count()); + } + + internal protected class TestVisitor : OpenApiVisitorBase + { + public Stack CallStack { get; } = new Stack(); + + private string EncodeCall([CallerMemberName] string name = "", [CallerLineNumber] int lineNumber = 0) + { + var encoding = $"{name}:{lineNumber}"; + CallStack.Push(encoding); + return encoding; + } + + public override void Enter(string segment) + { + EncodeCall(); + base.Enter(segment); + } + + public override void Exit() + { + EncodeCall(); + base.Exit(); + } + + public override void Visit(OpenApiDocument doc) + { + EncodeCall(); + base.Visit(doc); + } + + public override void Visit(OpenApiInfo info) + { + EncodeCall(); + base.Visit(info); + } + + public override void Visit(OpenApiContact contact) + { + EncodeCall(); + base.Visit(contact); + } + + public override void Visit(OpenApiLicense license) + { + EncodeCall(); + base.Visit(license); + } + + public override void Visit(IList servers) + { + EncodeCall(); + base.Visit(servers); + } + + public override void Visit(OpenApiServer server) + { + EncodeCall(); + base.Visit(server); + } + + public override void Visit(OpenApiPaths paths) + { + EncodeCall(); + base.Visit(paths); + } + + public override void Visit(OpenApiPathItem pathItem) + { + EncodeCall(); + base.Visit(pathItem); + } + + public override void Visit(OpenApiServerVariable serverVariable) + { + EncodeCall(); + base.Visit(serverVariable); + } + + public override void Visit(IDictionary operations) + { + EncodeCall(); + base.Visit(operations); + } + + public override void Visit(OpenApiOperation operation) + { + EncodeCall(); + base.Visit(operation); + } + + public override void Visit(IList parameters) + { + EncodeCall(); + base.Visit(parameters); + } + + public override void Visit(OpenApiParameter parameter) + { + EncodeCall(); + base.Visit(parameter); + } + + public override void Visit(OpenApiRequestBody requestBody) + { + EncodeCall(); + base.Visit(requestBody); + } + + public override void Visit(IDictionary headers) + { + EncodeCall(); + base.Visit(headers); + } + + public override void Visit(IDictionary callbacks) + { + EncodeCall(); + base.Visit(callbacks); + } + + public override void Visit(OpenApiResponse response) + { + EncodeCall(); + base.Visit(response); + } + + public override void Visit(OpenApiResponses response) + { + EncodeCall(); + base.Visit(response); + } + + public override void Visit(IDictionary content) + { + EncodeCall(); + base.Visit(content); + } + + public override void Visit(OpenApiMediaType mediaType) + { + EncodeCall(); + base.Visit(mediaType); + } + + public override void Visit(OpenApiEncoding encoding) + { + EncodeCall(); + base.Visit(encoding); + } + + public override void Visit(IDictionary examples) + { + EncodeCall(); + base.Visit(examples); + } + + public override void Visit(OpenApiComponents components) + { + EncodeCall(); + base.Visit(components); + } + + public override void Visit(OpenApiExternalDocs externalDocs) + { + EncodeCall(); + base.Visit(externalDocs); + } + + public override void Visit(OpenApiSchema schema) + { + EncodeCall(); + base.Visit(schema); + } + + public override void Visit(IDictionary links) + { + EncodeCall(); + base.Visit(links); + } + + public override void Visit(OpenApiLink link) + { + EncodeCall(); + base.Visit(link); + } + + public override void Visit(OpenApiCallback callback) + { + EncodeCall(); + base.Visit(callback); + } + + public override void Visit(OpenApiTag tag) + { + EncodeCall(); + base.Visit(tag); + } + + public override void Visit(OpenApiHeader tag) + { + EncodeCall(); + base.Visit(tag); + } + + public override void Visit(OpenApiOAuthFlow openApiOAuthFlow) + { + EncodeCall(); + base.Visit(openApiOAuthFlow); + } + + public override void Visit(OpenApiSecurityRequirement securityRequirement) + { + EncodeCall(); + base.Visit(securityRequirement); + } + + public override void Visit(OpenApiSecurityScheme securityScheme) + { + EncodeCall(); + base.Visit(securityScheme); + } + + public override void Visit(OpenApiExample example) + { + EncodeCall(); + base.Visit(example); + } + + public override void Visit(IList openApiTags) + { + EncodeCall(); + base.Visit(openApiTags); + } + + public override void Visit(IList openApiSecurityRequirements) + { + EncodeCall(); + base.Visit(openApiSecurityRequirements); + } + + public override void Visit(IOpenApiExtensible openApiExtensible) + { + EncodeCall(); + base.Visit(openApiExtensible); + } + + public override void Visit(IOpenApiExtension openApiExtension) + { + EncodeCall(); + base.Visit(openApiExtension); + } + + public override void Visit(IList example) + { + EncodeCall(); + base.Visit(example); + } + + public override void Visit(IDictionary serverVariables) + { + EncodeCall(); + base.Visit(serverVariables); + } + + public override void Visit(IDictionary encodings) + { + EncodeCall(); + base.Visit(encodings); + } + + public override void Visit(IOpenApiReferenceable referenceable) + { + EncodeCall(); + base.Visit(referenceable); + } + } + } }