From f1ec8130b84d756230d33866abe9b0455d162450 Mon Sep 17 00:00:00 2001 From: Maggiekimani1 Date: Mon, 9 Dec 2024 10:34:05 +0300 Subject: [PATCH] Rename Read Result properties --- src/Microsoft.OpenApi.Hidi/OpenApiService.cs | 10 +-- .../OpenApiYamlReader.cs | 4 +- src/Microsoft.OpenApi.Workbench/MainModel.cs | 4 +- .../Reader/OpenApiJsonReader.cs | 8 +-- src/Microsoft.OpenApi/Reader/ReadResult.cs | 4 +- .../Reader/Services/OpenApiWorkspaceLoader.cs | 8 +-- .../Services/OpenApiFilterServiceTests.cs | 2 +- .../OpenApiDiagnosticTests.cs | 12 ++-- .../OpenApiStreamReaderTests.cs | 2 +- .../OpenApiWorkspaceStreamTests.cs | 10 +-- .../ParseNodeTests.cs | 4 +- .../TryLoadReferenceV2Tests.cs | 10 +-- .../TestCustomExtension.cs | 2 +- .../V2Tests/ComparisonTests.cs | 6 +- .../V2Tests/OpenApiDocumentTests.cs | 21 +++--- .../V2Tests/OpenApiServerTests.cs | 50 +++++++------- .../V31Tests/OpenApiDocumentTests.cs | 49 ++++++------- .../V3Tests/OpenApiCallbackTests.cs | 12 ++-- .../V3Tests/OpenApiDocumentTests.cs | 69 +++++++++---------- .../V3Tests/OpenApiExampleTests.cs | 2 +- .../V3Tests/OpenApiOperationTests.cs | 4 +- .../V3Tests/OpenApiResponseTests.cs | 4 +- .../V3Tests/OpenApiSchemaTests.cs | 12 ++-- .../Models/OpenApiDocumentTests.cs | 6 +- .../OpenApiCallbackReferenceTests.cs | 4 +- .../OpenApiExampleReferenceTests.cs | 4 +- .../References/OpenApiHeaderReferenceTests.cs | 4 +- .../References/OpenApiLinkReferenceTests.cs | 4 +- .../OpenApiParameterReferenceTests.cs | 4 +- .../OpenApiPathItemReferenceTests.cs | 4 +- .../OpenApiRequestBodyReferenceTests.cs | 4 +- .../OpenApiResponseReferenceTest.cs | 4 +- .../OpenApiSecuritySchemeReferenceTests.cs | 2 +- .../References/OpenApiTagReferenceTest.cs | 2 +- .../PublicApi/PublicApi.approved.txt | 4 +- 35 files changed, 174 insertions(+), 181 deletions(-) diff --git a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs index 7dfb5d797..8a121f7ad 100644 --- a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs +++ b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs @@ -255,7 +255,7 @@ private static async Task GetOpenApiAsync(HidiOptions options, { stream = await GetStreamAsync(options.OpenApi, logger, cancellationToken).ConfigureAwait(false); var result = await ParseOpenApiAsync(options.OpenApi, options.InlineExternal, logger, stream, cancellationToken).ConfigureAwait(false); - document = result.OpenApiDocument; + document = result.Document; } else throw new InvalidOperationException("No input file path or URL provided"); @@ -358,7 +358,7 @@ private static MemoryStream ApplyFilterToCsdl(Stream csdlStream, string entitySe { var statsVisitor = new StatsVisitor(); var walker = new OpenApiWalker(statsVisitor); - walker.Walk(result.OpenApiDocument); + walker.Walk(result.Document); logger.LogTrace("Finished walking through the OpenApi document. Generating a statistics report.."); #pragma warning disable CA2254 @@ -377,7 +377,7 @@ private static MemoryStream ApplyFilterToCsdl(Stream csdlStream, string entitySe if (result is null) return null; - return result.OpenApiDiagnostic.Errors.Count == 0; + return result.Diagnostic.Errors.Count == 0; } private static async Task ParseOpenApiAsync(string openApiFile, bool inlineExternal, ILogger logger, Stream stream, CancellationToken cancellationToken = default) @@ -439,7 +439,7 @@ public static OpenApiDocument FixReferences(OpenApiDocument document, string for var sb = new StringBuilder(); document.SerializeAsV3(new OpenApiYamlWriter(new StringWriter(sb))); - var doc = OpenApiDocument.Parse(sb.ToString(), format).OpenApiDocument; + var doc = OpenApiDocument.Parse(sb.ToString(), format).Document; return doc; } @@ -649,7 +649,7 @@ private static string GetInputPathExtension(string? openapi = null, string? csdl private static void LogErrors(ILogger logger, ReadResult result) { - var context = result.OpenApiDiagnostic; + var context = result.Diagnostic; if (context.Errors.Count != 0) { using (logger.BeginScope("Detected errors")) diff --git a/src/Microsoft.OpenApi.Readers/OpenApiYamlReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiYamlReader.cs index cff6dd1da..947495b96 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiYamlReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiYamlReader.cs @@ -37,8 +37,8 @@ public async Task ReadAsync(TextReader input, diagnostic.Errors.Add(new($"#line={ex.LineNumber}", ex.Message)); return new() { - OpenApiDocument = null, - OpenApiDiagnostic = diagnostic + Document = null, + Diagnostic = diagnostic }; } diff --git a/src/Microsoft.OpenApi.Workbench/MainModel.cs b/src/Microsoft.OpenApi.Workbench/MainModel.cs index 2fdaf0e1c..1cd4f24ac 100644 --- a/src/Microsoft.OpenApi.Workbench/MainModel.cs +++ b/src/Microsoft.OpenApi.Workbench/MainModel.cs @@ -246,8 +246,8 @@ internal async Task ParseDocumentAsync() } var readResult = await OpenApiDocument.LoadAsync(stream, Format.GetDisplayName()); - var document = readResult.OpenApiDocument; - var context = readResult.OpenApiDiagnostic; + var document = readResult.Document; + var context = readResult.Diagnostic; stopwatch.Stop(); ParseTime = $"{stopwatch.ElapsedMilliseconds} ms"; diff --git a/src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs b/src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs index 27aad722e..35f4fa6f6 100644 --- a/src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs +++ b/src/Microsoft.OpenApi/Reader/OpenApiJsonReader.cs @@ -49,8 +49,8 @@ public async Task ReadAsync(TextReader input, diagnostic.Errors.Add(new OpenApiError($"#line={ex.LineNumber}", $"Please provide the correct format, {ex.Message}")); return new ReadResult { - OpenApiDocument = null, - OpenApiDiagnostic = diagnostic + Document = null, + Diagnostic = diagnostic }; } @@ -118,8 +118,8 @@ public async Task ReadAsync(JsonNode jsonNode, return new() { - OpenApiDocument = document, - OpenApiDiagnostic = diagnostic + Document = document, + Diagnostic = diagnostic }; } diff --git a/src/Microsoft.OpenApi/Reader/ReadResult.cs b/src/Microsoft.OpenApi/Reader/ReadResult.cs index 77a18ff78..a0013b249 100644 --- a/src/Microsoft.OpenApi/Reader/ReadResult.cs +++ b/src/Microsoft.OpenApi/Reader/ReadResult.cs @@ -13,10 +13,10 @@ public class ReadResult /// /// The parsed OpenApiDocument. Null will be returned if the document could not be parsed. /// - public OpenApiDocument OpenApiDocument { set; get; } + public OpenApiDocument Document { get; set; } /// /// OpenApiDiagnostic contains the Errors reported while parsing /// - public OpenApiDiagnostic OpenApiDiagnostic { set; get; } + public OpenApiDiagnostic Diagnostic { get; set; } } } diff --git a/src/Microsoft.OpenApi/Reader/Services/OpenApiWorkspaceLoader.cs b/src/Microsoft.OpenApi/Reader/Services/OpenApiWorkspaceLoader.cs index a3462da70..06231e75c 100644 --- a/src/Microsoft.OpenApi/Reader/Services/OpenApiWorkspaceLoader.cs +++ b/src/Microsoft.OpenApi/Reader/Services/OpenApiWorkspaceLoader.cs @@ -48,13 +48,13 @@ internal async Task LoadAsync(OpenApiReference reference, var input = await _loader.LoadAsync(new(item.ExternalResource, UriKind.RelativeOrAbsolute)); var result = await OpenApiDocument.LoadAsync(input, format, _readerSettings, cancellationToken); // Merge diagnostics - if (result.OpenApiDiagnostic != null) + if (result.Diagnostic != null) { - diagnostic.AppendDiagnostic(result.OpenApiDiagnostic, item.ExternalResource); + diagnostic.AppendDiagnostic(result.Diagnostic, item.ExternalResource); } - if (result.OpenApiDocument != null) + if (result.Document != null) { - var loadDiagnostic = await LoadAsync(item, result.OpenApiDocument, format, diagnostic, cancellationToken); + var loadDiagnostic = await LoadAsync(item, result.Document, format, diagnostic, cancellationToken); diagnostic = loadDiagnostic; } } diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs index 3bd9efd2a..01c4c59fa 100644 --- a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs +++ b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiFilterServiceTests.cs @@ -232,7 +232,7 @@ public void CopiesOverAllReferencedComponentsToTheSubsetDocumentCorrectly() // Act using var stream = File.OpenRead(filePath); - var doc = OpenApiDocument.Load(stream, "yaml").OpenApiDocument; + var doc = OpenApiDocument.Load(stream, "yaml").Document; var predicate = OpenApiFilterService.CreatePredicate(operationIds: operationIds); var subsetOpenApiDocument = OpenApiFilterService.CreateFilteredDocument(doc, predicate); diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs index c99cc6fa9..988b42a7c 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs @@ -27,8 +27,8 @@ public void DetectedSpecificationVersionShouldBeV2_0() { var actual = OpenApiDocument.Load("V2Tests/Samples/basic.v2.yaml"); - actual.OpenApiDiagnostic.Should().NotBeNull(); - actual.OpenApiDiagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi2_0); + actual.Diagnostic.Should().NotBeNull(); + actual.Diagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi2_0); } [Fact] @@ -36,8 +36,8 @@ public void DetectedSpecificationVersionShouldBeV3_0() { var actual = OpenApiDocument.Load("V3Tests/Samples/OpenApiDocument/minimalDocument.yaml"); - actual.OpenApiDiagnostic.Should().NotBeNull(); - actual.OpenApiDiagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi3_0); + actual.Diagnostic.Should().NotBeNull(); + actual.Diagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi3_0); } [Fact] @@ -55,8 +55,8 @@ public async Task DiagnosticReportMergedForExternalReferenceAsync() result = await OpenApiDocument.LoadAsync("OpenApiReaderTests/Samples/OpenApiDiagnosticReportMerged/TodoMain.yaml", settings); Assert.NotNull(result); - Assert.NotNull(result.OpenApiDocument.Workspace); - result.OpenApiDiagnostic.Errors.Should().BeEmpty(); + Assert.NotNull(result.Document.Workspace); + result.Diagnostic.Errors.Should().BeEmpty(); } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs index 82a410946..da5ed0226 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs @@ -65,7 +65,7 @@ public async Task StreamShouldReadWhenInitializedAsync() // Read V3 as YAML var result = OpenApiDocument.Load(stream, "yaml"); - Assert.NotNull(result.OpenApiDocument); + Assert.NotNull(result.Document); } } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs index 4aca9b54e..2b079ffb8 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs @@ -46,7 +46,7 @@ public async Task LoadingDocumentWithResolveAllReferencesShouldLoadDocumentIntoW var result = await OpenApiDocument.LoadAsync(stream, OpenApiConstants.Yaml, settings: settings); - Assert.NotNull(result.OpenApiDocument.Workspace); + Assert.NotNull(result.Document.Workspace); } [Fact] @@ -63,14 +63,14 @@ public async Task LoadDocumentWithExternalReferenceShouldLoadBothDocumentsIntoWo ReadResult result; result = await OpenApiDocument.LoadAsync("V3Tests/Samples/OpenApiWorkspace/TodoMain.yaml", settings); - var externalDocBaseUri = result.OpenApiDocument.Workspace.GetDocumentId("./TodoComponents.yaml"); + var externalDocBaseUri = result.Document.Workspace.GetDocumentId("./TodoComponents.yaml"); var schemasPath = "/components/schemas/"; var parametersPath = "/components/parameters/"; Assert.NotNull(externalDocBaseUri); - Assert.True(result.OpenApiDocument.Workspace.Contains(externalDocBaseUri + schemasPath + "todo")); - Assert.True(result.OpenApiDocument.Workspace.Contains(externalDocBaseUri + schemasPath + "entity")); - Assert.True(result.OpenApiDocument.Workspace.Contains(externalDocBaseUri + parametersPath + "filter")); + Assert.True(result.Document.Workspace.Contains(externalDocBaseUri + schemasPath + "todo")); + Assert.True(result.Document.Workspace.Contains(externalDocBaseUri + schemasPath + "entity")); + Assert.True(result.Document.Workspace.Contains(externalDocBaseUri + parametersPath + "filter")); } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs index 7c43ed124..0e5eae1c8 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs @@ -33,7 +33,7 @@ public void BrokenSimpleList() var result = OpenApiDocument.Parse(input, "yaml"); - result.OpenApiDiagnostic.Errors.Should().BeEquivalentTo(new List() { + result.Diagnostic.Errors.Should().BeEquivalentTo(new List() { new OpenApiError(new OpenApiReaderException("Expected a value.")) }); } @@ -59,7 +59,7 @@ public void BadSchema() var res= OpenApiDocument.Parse(input, "yaml"); - res.OpenApiDiagnostic.Errors.Should().BeEquivalentTo(new List + res.Diagnostic.Errors.Should().BeEquivalentTo(new List { new(new OpenApiReaderException("schema must be a map/object") { Pointer = "#/paths/~1foo/get/responses/200/content/application~1json/schema" diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs index d6fb3b8ba..815f2cfbe 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs @@ -26,7 +26,7 @@ public void LoadParameterReference() { // Arrange var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")); - var reference = new OpenApiParameterReference("skipParam", result.OpenApiDocument); + var reference = new OpenApiParameterReference("skipParam", result.Document); // Assert reference.Should().BeEquivalentTo( @@ -51,7 +51,7 @@ public void LoadSecuritySchemeReference() { var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")); - var reference = new OpenApiSecuritySchemeReference("api_key_sample", result.OpenApiDocument); + var reference = new OpenApiSecuritySchemeReference("api_key_sample", result.Document); // Assert reference.Should().BeEquivalentTo( @@ -69,7 +69,7 @@ public void LoadResponseReference() { var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")); - var reference = new OpenApiResponseReference("NotFound", result.OpenApiDocument); + var reference = new OpenApiResponseReference("NotFound", result.Document); // Assert reference.Should().BeEquivalentTo( @@ -88,7 +88,7 @@ public void LoadResponseReference() public void LoadResponseAndSchemaReference() { var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "multipleReferences.v2.yaml")); - var reference = new OpenApiResponseReference("GeneralError", result.OpenApiDocument); + var reference = new OpenApiResponseReference("GeneralError", result.Document); // Assert reference.Should().BeEquivalentTo( @@ -118,7 +118,7 @@ public void LoadResponseAndSchemaReference() { Type = ReferenceType.Schema, Id = "SampleObject2", - HostDocument = result.OpenApiDocument + HostDocument = result.Document } } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs b/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs index 9d7727aae..9e7d19c7f 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs @@ -42,7 +42,7 @@ public void ParseCustomExtension() var diag = new OpenApiDiagnostic(); var actual = OpenApiDocument.Parse(description, "yaml", settings: settings); - var fooExtension = actual.OpenApiDocument.Info.Extensions["x-foo"] as FooExtension; + var fooExtension = actual.Document.Info.Extensions["x-foo"] as FooExtension; fooExtension.Should().NotBeNull(); fooExtension.Bar.Should().Be("hey"); diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs index b3e30c672..83e14118c 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.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,10 +26,10 @@ public void EquivalentV2AndV3DocumentsShouldProduceEquivalentObjects(string file var result1 = OpenApiDocument.Load(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml")); var result2 = OpenApiDocument.Load(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml")); - result2.OpenApiDocument.Should().BeEquivalentTo(result1.OpenApiDocument, + result2.Document.Should().BeEquivalentTo(result1.Document, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri)); - result1.OpenApiDiagnostic.Errors.Should().BeEquivalentTo(result2.OpenApiDiagnostic.Errors); + result1.Diagnostic.Errors.Should().BeEquivalentTo(result2.Diagnostic.Errors); } } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs index c97fd1aee..7cf03661c 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs @@ -57,7 +57,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture) """, "yaml"); - result.OpenApiDocument.Should().BeEquivalentTo( + result.Document.Should().BeEquivalentTo( new OpenApiDocument { Info = new() @@ -145,16 +145,16 @@ public void ShouldParseProducesInAnyOrder() Schema = new() { Type = JsonSchemaType.Array, - Items = new OpenApiSchemaReference("Item", result.OpenApiDocument) + Items = new OpenApiSchemaReference("Item", result.Document) } }; var errorMediaType = new OpenApiMediaType { - Schema = new OpenApiSchemaReference("Error", result.OpenApiDocument) + Schema = new OpenApiSchemaReference("Error", result.Document) }; - result.OpenApiDocument.Should().BeEquivalentTo(new OpenApiDocument + result.Document.Should().BeEquivalentTo(new OpenApiDocument { Info = new() { @@ -264,16 +264,16 @@ public void ShouldAssignSchemaToAllResponses() using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleProduces.json")); var result = OpenApiDocument.Load(stream, OpenApiConstants.Json); - Assert.Equal(OpenApiSpecVersion.OpenApi2_0, result.OpenApiDiagnostic.SpecificationVersion); + Assert.Equal(OpenApiSpecVersion.OpenApi2_0, result.Diagnostic.SpecificationVersion); var successSchema = new OpenApiSchema { Type = JsonSchemaType.Array, - Items = new OpenApiSchemaReference("Item", result.OpenApiDocument) + Items = new OpenApiSchemaReference("Item", result.Document) }; - var errorSchema = new OpenApiSchemaReference("Error", result.OpenApiDocument); + var errorSchema = new OpenApiSchemaReference("Error", result.Document); - var responses = result.OpenApiDocument.Paths["/items"].Operations[OperationType.Get].Responses; + var responses = result.Document.Paths["/items"].Operations[OperationType.Get].Responses; foreach (var response in responses) { var targetSchema = response.Key == "200" ? successSchema : errorSchema; @@ -292,7 +292,7 @@ public void ShouldAssignSchemaToAllResponses() public void ShouldAllowComponentsThatJustContainAReference() { // Act - var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "ComponentRootReference.json")).OpenApiDocument; + var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "ComponentRootReference.json")).Document; var schema1 = actual.Components.Schemas["AllPets"]; Assert.False(schema1.UnresolvedReference); var schema2 = actual.ResolveReferenceTo(schema1.Reference); @@ -312,7 +312,7 @@ public void ParseDocumentWithDefaultContentTypeSettingShouldSucceed() }; var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "docWithEmptyProduces.yaml"), settings); - var mediaType = actual.OpenApiDocument.Paths["/example"].Operations[OperationType.Get].Responses["200"].Content; + var mediaType = actual.Document.Paths["/example"].Operations[OperationType.Get].Responses["200"].Content; Assert.Contains("application/json", mediaType); } @@ -321,7 +321,6 @@ public void testContentType() { var contentType = "application/json; charset = utf-8"; var res = contentType.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).First(); - var expected = res.Split('/').LastOrDefault(); Assert.Equal("application/json", res); } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs index 775145794..e0c076ee3 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs @@ -27,7 +27,7 @@ public void NoServer() var result = OpenApiDocument.Parse(input, "yaml"); - Assert.Empty(result.OpenApiDocument.Servers); + Assert.Empty(result.Document.Servers); } [Fact] @@ -45,7 +45,7 @@ public void JustSchemeNoDefault() """; var result = OpenApiDocument.Parse(input, "yaml"); - Assert.Empty(result.OpenApiDocument.Servers); + Assert.Empty(result.Document.Servers); } [Fact] @@ -62,8 +62,8 @@ public void JustHostNoDefault() """; var result = OpenApiDocument.Parse(input, "yaml"); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("//www.foo.com", server.Url); } @@ -87,8 +87,8 @@ public void NoBasePath() }; var result = OpenApiDocument.Parse(input, "yaml", settings); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("http://www.foo.com", server.Url); } @@ -106,8 +106,8 @@ public void JustBasePathNoDefault() """; var result = OpenApiDocument.Parse(input, "yaml"); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("/baz", server.Url); } @@ -131,8 +131,8 @@ public void JustSchemeWithCustomHost() var result = OpenApiDocument.Parse(input, "yaml", settings); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("http://bing.com/foo", server.Url); } @@ -156,8 +156,8 @@ public void JustSchemeWithCustomHostWithEmptyPath() var result = OpenApiDocument.Parse(input, "yaml", settings); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("http://bing.com", server.Url); } @@ -180,8 +180,8 @@ public void JustBasePathWithCustomHost() var result = OpenApiDocument.Parse(input, "yaml", settings); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("https://bing.com/api", server.Url); } @@ -204,8 +204,8 @@ public void JustHostWithCustomHost() var result = OpenApiDocument.Parse(input, "yaml", settings); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("https://www.example.com", server.Url); } @@ -228,8 +228,8 @@ public void JustHostWithCustomHostWithApi() }; var result = OpenApiDocument.Parse(input, "yaml", settings); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("https://prod.bing.com", server.Url); } @@ -254,10 +254,10 @@ public void MultipleServers() }; var result = OpenApiDocument.Parse(input, "yaml", settings); - var server = result.OpenApiDocument.Servers.First(); - Assert.Equal(2, result.OpenApiDocument.Servers.Count); + var server = result.Document.Servers.First(); + Assert.Equal(2, result.Document.Servers.Count); Assert.Equal("http://dev.bing.com/api", server.Url); - Assert.Equal("https://dev.bing.com/api", result.OpenApiDocument.Servers.Last().Url); + Assert.Equal("https://dev.bing.com/api", result.Document.Servers.Last().Url); } [Fact] @@ -280,8 +280,8 @@ public void LocalHostWithCustomHost() var result = OpenApiDocument.Parse(input, "yaml", settings); - var server = result.OpenApiDocument.Servers.First(); - Assert.Single(result.OpenApiDocument.Servers); + var server = result.Document.Servers.First(); + Assert.Single(result.Document.Servers); Assert.Equal("https://localhost:23232", server.Url); } @@ -304,8 +304,8 @@ public void InvalidHostShouldYieldError() }; var result = OpenApiDocument.Parse(input, "yaml", settings); - result.OpenApiDocument.Servers.Count.Should().Be(0); - result.OpenApiDiagnostic.Should().BeEquivalentTo( + result.Document.Servers.Count.Should().Be(0); + result.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic { Errors = diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs index 638d69667..de5471a44 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs @@ -30,9 +30,9 @@ public void ParseDocumentWithWebhooksShouldSucceed() { // Arrange and Act var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "documentWithWebhooks.yaml")); - var petSchema = new OpenApiSchemaReference("petSchema", actual.OpenApiDocument); + var petSchema = new OpenApiSchemaReference("petSchema", actual.Document); - var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.OpenApiDocument); + var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.Document); var components = new OpenApiComponents { @@ -200,8 +200,8 @@ public void ParseDocumentWithWebhooksShouldSucceed() }; // Assert - actual.OpenApiDiagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 }); - actual.OpenApiDocument.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri)); + actual.Diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 }); + actual.Document.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri)); } [Fact] @@ -267,9 +267,9 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds() }; // Create a clone of the schema to avoid modifying things in components. - var petSchema = new OpenApiSchemaReference("petSchema", actual.OpenApiDocument); + var petSchema = new OpenApiSchemaReference("petSchema", actual.Document); - var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.OpenApiDocument); + var newPetSchema = new OpenApiSchemaReference("newPetSchema", actual.Document); components.PathItems = new Dictionary { @@ -387,17 +387,12 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds() }; // Assert - actual.OpenApiDocument.Should().BeEquivalentTo(expected, options => options + actual.Document.Should().BeEquivalentTo(expected, options => options .Excluding(x => x.Webhooks["pets"].Reference) .Excluding(x => x.Workspace) .Excluding(y => y.BaseUri)); - actual.OpenApiDiagnostic.Should().BeEquivalentTo( - new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 }); - - var outputWriter = new StringWriter(CultureInfo.InvariantCulture); - var writer = new OpenApiJsonWriter(outputWriter, new() { InlineLocalReferences = true }); - actual.OpenApiDocument.SerializeAsV31(writer); - var serialized = outputWriter.ToString(); + actual.Diagnostic.Should().BeEquivalentTo( + new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 }); } [Fact] @@ -409,7 +404,7 @@ public void ParseDocumentWithExampleInSchemaShouldSucceed() // Act var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "docWithExample.yaml")); - actual.OpenApiDocument.SerializeAsV31(writer); + actual.Document.SerializeAsV31(writer); // Assert Assert.NotNull(actual); @@ -420,7 +415,7 @@ public void ParseDocumentWithPatternPropertiesInSchemaWorks() { // Arrange and Act var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "docWithPatternPropertiesInSchema.yaml")); - var actualSchema = result.OpenApiDocument.Paths["/example"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema; + var actualSchema = result.Document.Paths["/example"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema; var expectedSchema = new OpenApiSchema { @@ -450,7 +445,7 @@ public void ParseDocumentWithPatternPropertiesInSchemaWorks() }; // Serialization - var mediaType = result.OpenApiDocument.Paths["/example"].Operations[OperationType.Get].Responses["200"].Content["application/json"]; + var mediaType = result.Document.Paths["/example"].Operations[OperationType.Get].Responses["200"].Content["application/json"]; var expectedMediaType = @"schema: patternProperties: @@ -478,9 +473,9 @@ public void ParseDocumentWithReferenceByIdGetsResolved() // Arrange and Act var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "docWithReferenceById.yaml")); - var responseSchema = result.OpenApiDocument.Paths["/resource"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema; - var requestBodySchema = result.OpenApiDocument.Paths["/resource"].Operations[OperationType.Post].RequestBody.Content["application/json"].Schema; - var parameterSchema = result.OpenApiDocument.Paths["/resource"].Operations[OperationType.Get].Parameters[0].Schema; + var responseSchema = result.Document.Paths["/resource"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema; + var requestBodySchema = result.Document.Paths["/resource"].Operations[OperationType.Post].RequestBody.Content["application/json"].Schema; + var parameterSchema = result.Document.Paths["/resource"].Operations[OperationType.Get].Parameters[0].Schema; // Assert Assert.Equal(JsonSchemaType.Object, responseSchema.Type); @@ -502,10 +497,10 @@ public async Task ExternalDocumentDereferenceToOpenApiDocumentUsingJsonPointerWo // Act var result = await OpenApiDocument.LoadAsync(Path.Combine(SampleFolderPath, "externalRefByJsonPointer.yaml"), settings); - var responseSchema = result.OpenApiDocument.Paths["/resource"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema; + var responseSchema = result.Document.Paths["/resource"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema; // Assert - result.OpenApiDocument.Workspace.Contains("./externalResource.yaml"); + result.Document.Workspace.Contains("./externalResource.yaml"); responseSchema.Properties.Count.Should().Be(2); // reference has been resolved } @@ -523,10 +518,10 @@ public async Task ParseExternalDocumentDereferenceToOpenApiDocumentByIdWorks() // Act var result = await OpenApiDocument.LoadAsync(Path.Combine(SampleFolderPath, "externalRefById.yaml"), settings); - var doc2 = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "externalResource.yaml")).OpenApiDocument; + var doc2 = (await OpenApiDocument.LoadAsync(Path.Combine(SampleFolderPath, "externalResource.yaml"))).Document; - var requestBodySchema = result.OpenApiDocument.Paths["/resource"].Operations[OperationType.Get].Parameters.First().Schema; - result.OpenApiDocument.Workspace.RegisterComponents(doc2); + var requestBodySchema = result.Document.Paths["/resource"].Operations[OperationType.Get].Parameters[0].Schema; + result.Document.Workspace.RegisterComponents(doc2); // Assert requestBodySchema.Properties.Count.Should().Be(2); // reference has been resolved @@ -536,10 +531,10 @@ public async Task ParseExternalDocumentDereferenceToOpenApiDocumentByIdWorks() public async Task ParseDocumentWith31PropertiesWorks() { var path = Path.Combine(SampleFolderPath, "documentWith31Properties.yaml"); - var doc = OpenApiDocument.Load(path).OpenApiDocument; + var doc = (await OpenApiDocument.LoadAsync(path)).Document; var outputStringWriter = new StringWriter(); doc.SerializeAsV31(new OpenApiYamlWriter(outputStringWriter)); - outputStringWriter.Flush(); + await outputStringWriter.FlushAsync(); var actual = outputStringWriter.GetStringBuilder().ToString(); // Assert diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs index cab621c14..0cf804f80 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs @@ -72,12 +72,12 @@ public void ParseCallbackWithReferenceShouldSucceed() var result = OpenApiModelFactory.Load(stream, OpenApiConstants.Yaml); // Assert - var path = result.OpenApiDocument.Paths.First().Value; + var path = result.Document.Paths.First().Value; var subscribeOperation = path.Operations[OperationType.Post]; var callback = subscribeOperation.Callbacks["simpleHook"]; - result.OpenApiDiagnostic.Should().BeEquivalentTo( + result.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); callback.Should().BeEquivalentTo( @@ -116,7 +116,7 @@ public void ParseCallbackWithReferenceShouldSucceed() { Type = ReferenceType.Callback, Id = "simpleHook", - HostDocument = result.OpenApiDocument + HostDocument = result.Document } }); } @@ -128,10 +128,10 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed() var result = OpenApiModelFactory.Load(Path.Combine(SampleFolderPath, "multipleCallbacksWithReference.yaml")); // Assert - var path = result.OpenApiDocument.Paths.First().Value; + var path = result.Document.Paths.First().Value; var subscribeOperation = path.Operations[OperationType.Post]; - result.OpenApiDiagnostic.Should().BeEquivalentTo( + result.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); var callback1 = subscribeOperation.Callbacks["simpleHook"]; @@ -172,7 +172,7 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed() { Type = ReferenceType.Callback, Id = "simpleHook", - HostDocument = result.OpenApiDocument + HostDocument = result.Document } }); diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs index 2d3b02820..461df1642 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs @@ -87,7 +87,7 @@ public void ParseDocumentFromInlineStringShouldSucceed() paths: {}", OpenApiConstants.Yaml); - result.OpenApiDocument.Should().BeEquivalentTo( + result.Document.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -98,7 +98,7 @@ public void ParseDocumentFromInlineStringShouldSucceed() Paths = new OpenApiPaths() }, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri)); - result.OpenApiDiagnostic.Should().BeEquivalentTo( + result.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 @@ -111,8 +111,8 @@ public void ParseBasicDocumentWithMultipleServersShouldSucceed() var path = System.IO.Path.Combine(SampleFolderPath, "basicDocumentWithMultipleServers.yaml"); var result = OpenApiDocument.Load(path); - result.OpenApiDiagnostic.Errors.Should().BeEmpty(); - result.OpenApiDocument.Should().BeEquivalentTo( + result.Diagnostic.Errors.Should().BeEmpty(); + result.Document.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -142,7 +142,7 @@ public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic() using var stream = Resources.GetStream(System.IO.Path.Combine(SampleFolderPath, "brokenMinimalDocument.yaml")); var result = OpenApiDocument.Load(stream, OpenApiConstants.Yaml); - result.OpenApiDocument.Should().BeEquivalentTo( + result.Document.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -152,7 +152,7 @@ public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic() Paths = new OpenApiPaths() }, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri)); - result.OpenApiDiagnostic.Should().BeEquivalentTo( + result.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic { Errors = @@ -168,7 +168,7 @@ public void ParseMinimalDocumentShouldSucceed() { var result = OpenApiDocument.Load(System.IO.Path.Combine(SampleFolderPath, "minimalDocument.yaml")); - result.OpenApiDocument.Should().BeEquivalentTo( + result.Document.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -179,7 +179,7 @@ public void ParseMinimalDocumentShouldSucceed() Paths = new OpenApiPaths() }, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri)); - result.OpenApiDiagnostic.Should().BeEquivalentTo( + result.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 @@ -269,10 +269,10 @@ public void ParseStandardPetStoreDocumentShouldSucceed() } }; - var petSchema = new OpenApiSchemaReference("pet1", actual.OpenApiDocument); - var newPetSchema = new OpenApiSchemaReference("newPet", actual.OpenApiDocument); + var petSchema = new OpenApiSchemaReference("pet1", actual.Document); + var newPetSchema = new OpenApiSchemaReference("newPet", actual.Document); - var errorModelSchema = new OpenApiSchemaReference("errorModel", actual.OpenApiDocument); + var errorModelSchema = new OpenApiSchemaReference("errorModel", actual.Document); var expectedDoc = new OpenApiDocument { @@ -566,9 +566,9 @@ public void ParseStandardPetStoreDocumentShouldSucceed() Components = components }; - actual.OpenApiDocument.Should().BeEquivalentTo(expectedDoc, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri)); + actual.Document.Should().BeEquivalentTo(expectedDoc, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri)); - actual.OpenApiDiagnostic.Should().BeEquivalentTo( + actual.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } @@ -675,7 +675,7 @@ public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed() { Id = "pet1", Type = ReferenceType.Schema, - HostDocument = actual.OpenApiDocument + HostDocument = actual.Document }; var newPetSchema = Clone(components.Schemas["newPet"]); @@ -684,7 +684,7 @@ public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed() { Id = "newPet", Type = ReferenceType.Schema, - HostDocument = actual.OpenApiDocument + HostDocument = actual.Document }; var errorModelSchema = Clone(components.Schemas["errorModel"]); @@ -693,7 +693,7 @@ public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed() { Id = "errorModel", Type = ReferenceType.Schema, - HostDocument = actual.OpenApiDocument + HostDocument = actual.Document }; var tag1 = new OpenApiTag @@ -1069,7 +1069,7 @@ public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed() } }; - actual.OpenApiDocument.Should().BeEquivalentTo(expected, options => options + actual.Document.Should().BeEquivalentTo(expected, options => options .Excluding(x => x.HashCode) .Excluding(m => m.Tags[0].Reference) .Excluding(x => x.Paths["/pets"].Operations[OperationType.Get].Tags[0].Reference) @@ -1080,7 +1080,7 @@ public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed() .Excluding(x => x.Workspace) .Excluding(y => y.BaseUri)); - actual.OpenApiDiagnostic.Should().BeEquivalentTo( + actual.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } @@ -1091,7 +1091,7 @@ public void ParsePetStoreExpandedShouldSucceed() // TODO: Create the object in memory and compare with the one read from YAML file. - actual.OpenApiDiagnostic.Should().BeEquivalentTo( + actual.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } @@ -1100,9 +1100,9 @@ public void GlobalSecurityRequirementShouldReferenceSecurityScheme() { var result = OpenApiDocument.Load(System.IO.Path.Combine(SampleFolderPath, "securedApi.yaml")); - var securityRequirement = result.OpenApiDocument.SecurityRequirements.First(); + var securityRequirement = result.Document.SecurityRequirements[0]; - securityRequirement.Keys.First().Should().BeEquivalentTo(result.OpenApiDocument.Components.SecuritySchemes.First().Value, + securityRequirement.Keys.First().Should().BeEquivalentTo(result.Document.Components.SecuritySchemes.First().Value, options => options.Excluding(x => x.Reference)); } @@ -1111,7 +1111,7 @@ public void HeaderParameterShouldAllowExample() { var result = OpenApiDocument.Load(System.IO.Path.Combine(SampleFolderPath, "apiWithFullHeaderComponent.yaml")); - var exampleHeader = result.OpenApiDocument.Components?.Headers?["example-header"]; + var exampleHeader = result.Document.Components?.Headers?["example-header"]; Assert.NotNull(exampleHeader); exampleHeader.Should().BeEquivalentTo( new OpenApiHeader() @@ -1133,7 +1133,7 @@ public void HeaderParameterShouldAllowExample() .Excluding(e => e.Example.Parent) .Excluding(x => x.Reference)); - var examplesHeader = result.OpenApiDocument.Components?.Headers?["examples-header"]; + var examplesHeader = result.Document.Components?.Headers?["examples-header"]; Assert.NotNull(examplesHeader); examplesHeader.Should().BeEquivalentTo( new OpenApiHeader() @@ -1178,7 +1178,7 @@ public void ParseDocumentWithReferencedSecuritySchemeWorks() }; var result = OpenApiDocument.Load(System.IO.Path.Combine(SampleFolderPath, "docWithSecuritySchemeReference.yaml"), settings); - var securityScheme = result.OpenApiDocument.Components.SecuritySchemes["OAuth2"]; + var securityScheme = result.Document.Components.SecuritySchemes["OAuth2"]; // Assert Assert.False(securityScheme.UnresolvedReference); @@ -1198,9 +1198,9 @@ public void ParseDocumentWithJsonSchemaReferencesWorks() }; var result = OpenApiDocument.Load(stream, OpenApiConstants.Yaml, settings); - var actualSchema = result.OpenApiDocument.Paths["/users/{userId}"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema; + var actualSchema = result.Document.Paths["/users/{userId}"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema; - var expectedSchema = new OpenApiSchemaReference("User", result.OpenApiDocument); + var expectedSchema = new OpenApiSchemaReference("User", result.Document); // Assert actualSchema.Should().BeEquivalentTo(expectedSchema); } @@ -1216,7 +1216,7 @@ public void ValidateExampleShouldNotHaveDataTypeMismatch() }); // Assert - var warnings = result.OpenApiDiagnostic.Warnings; + var warnings = result.Diagnostic.Warnings; Assert.False(warnings.Any()); } @@ -1312,11 +1312,10 @@ public void ParseDocWithRefsUsingProxyReferencesSucceeds() using var stream = Resources.GetStream(System.IO.Path.Combine(SampleFolderPath, "minifiedPetStore.yaml")); // Act - var doc = OpenApiDocument.Load(stream, "yaml").OpenApiDocument; - var actualParam = doc.Paths["/pets"].Operations[OperationType.Get].Parameters.First(); + var doc = OpenApiDocument.Load(stream, "yaml").Document; + 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 @@ -1367,13 +1366,13 @@ public void ParseBasicDocumentWithServerVariableShouldSucceed() Paths = new() }; - result.OpenApiDiagnostic.Should().BeEquivalentTo( + result.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); - result.OpenApiDocument.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.BaseUri)); + result.Document.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.BaseUri)); } [Fact] @@ -1393,14 +1392,14 @@ public void ParseBasicDocumentWithServerVariableAndNoDefaultShouldFail() paths: {} """, "yaml"); - result.OpenApiDiagnostic.Errors.Should().NotBeEmpty(); + result.Diagnostic.Errors.Should().NotBeEmpty(); } [Fact] public void ParseDocumentWithEmptyPathsSucceeds() { var result = OpenApiDocument.Load(System.IO.Path.Combine(SampleFolderPath, "docWithEmptyPaths.yaml")); - result.OpenApiDiagnostic.Errors.Should().BeEmpty(); + result.Diagnostic.Errors.Should().BeEmpty(); } } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs index 84f028f6b..18007d112 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs @@ -82,7 +82,7 @@ public void ParseAdvancedExampleShouldSucceed() public void ParseExampleForcedStringSucceed() { var result= OpenApiDocument.Load(Path.Combine(SampleFolderPath, "explicitString.yaml")); - result.OpenApiDiagnostic.Errors.Should().BeEmpty(); + result.Diagnostic.Errors.Should().BeEmpty(); } } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs index 9ba96bbda..4c8af2aeb 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs @@ -25,9 +25,9 @@ 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.Document.Paths["/"].Operations[OperationType.Get].Security.First().Keys.First(); - securityScheme.Should().BeEquivalentTo(result.OpenApiDocument.Components.SecuritySchemes.First().Value, + securityScheme.Should().BeEquivalentTo(result.Document.Components.SecuritySchemes.First().Value, options => options.Excluding(x => x.Reference)); } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs index 09a1d00a1..f14b89514 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiResponseTests.cs @@ -25,9 +25,9 @@ public void ResponseWithReferencedHeaderShouldReferenceComponent() { var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "responseWithHeaderReference.yaml")); - var response = result.OpenApiDocument.Components.Responses["Test"]; + var response = result.Document.Components.Responses["Test"]; var expected = response.Headers.First().Value; - var actual = result.OpenApiDocument.Components.Headers.First().Value; + var actual = result.Document.Components.Headers.First().Value; actual.Description.Should().BeEquivalentTo(expected.Description); } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs index 6c1370626..d751c89d0 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs @@ -236,9 +236,9 @@ public void ParseBasicSchemaWithReferenceShouldSucceed() var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "basicSchemaWithReference.yaml")); // Assert - var components = result.OpenApiDocument.Components; + var components = result.Document.Components; - result.OpenApiDiagnostic.Should().BeEquivalentTo( + result.Diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 @@ -274,7 +274,7 @@ public void ParseBasicSchemaWithReferenceShouldSucceed() { AllOf = { - new OpenApiSchemaReference("ErrorModel", result.OpenApiDocument), + new OpenApiSchemaReference("ErrorModel", result.Document), new OpenApiSchema { Type = JsonSchemaType.Object, @@ -334,7 +334,7 @@ public void ParseAdvancedSchemaWithReferenceShouldSucceed() Description = "A representation of a cat", AllOf = { - new OpenApiSchemaReference("Pet", result.OpenApiDocument), + new OpenApiSchemaReference("Pet", result.Document), new OpenApiSchema { Type = JsonSchemaType.Object, @@ -362,7 +362,7 @@ public void ParseAdvancedSchemaWithReferenceShouldSucceed() Description = "A representation of a dog", AllOf = { - new OpenApiSchemaReference("Pet", result.OpenApiDocument), + new OpenApiSchemaReference("Pet", result.Document), new OpenApiSchema { Type = JsonSchemaType.Object, @@ -385,7 +385,7 @@ public void ParseAdvancedSchemaWithReferenceShouldSucceed() }; // We serialize so that we can get rid of the schema BaseUri properties which show up as diffs - var actual = result.OpenApiDocument.Components.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0); + var actual = result.Document.Components.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0); var expected = expectedComponents.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0); // Assert diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs index 884ffa68c..e87e5148c 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs @@ -1707,7 +1707,7 @@ private static OpenApiDocument ParseInputFile(string filePath) // Read in the input yaml file using FileStream stream = File.OpenRead(filePath); var format = OpenApiModelFactory.GetFormat(filePath); - var openApiDoc = OpenApiDocument.Load(stream, format).OpenApiDocument; + var openApiDoc = OpenApiDocument.Load(stream, format).Document; return openApiDoc; } @@ -2013,7 +2013,7 @@ public void SerializeV31DocumentWithRefsInWebhooksWorks() items: type: object"; - var doc = OpenApiDocument.Load("Models/Samples/docWithReusableWebhooks.yaml").OpenApiDocument; + var doc = OpenApiDocument.Load("Models/Samples/docWithReusableWebhooks.yaml").Document; var stringWriter = new StringWriter(); var writer = new OpenApiYamlWriter(stringWriter, new OpenApiWriterSettings { InlineLocalReferences = true }); @@ -2067,7 +2067,7 @@ public void SerializeDocWithDollarIdInDollarRefSucceeds() radius: type: number "; - var doc = OpenApiDocument.Load("Models/Samples/docWithDollarId.yaml").OpenApiDocument; + var doc = OpenApiDocument.Load("Models/Samples/docWithDollarId.yaml").Document; var actual = doc.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_1); actual.MakeLineBreaksEnvironmentNeutral().Should().BeEquivalentTo(expected.MakeLineBreaksEnvironmentNeutral()); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs index 3a16f4d2a..8942e692c 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs @@ -134,8 +134,8 @@ public class OpenApiCallbackReferenceTests public OpenApiCallbackReferenceTests() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); - OpenApiDocument openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument; - OpenApiDocument openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument; + OpenApiDocument openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).Document; + OpenApiDocument openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).Document; openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", openApiDoc_2.BaseUri); openApiDoc.Workspace.RegisterComponents(openApiDoc_2); _externalCallbackReference = new("callbackEvent", openApiDoc, "https://myserver.com/beta"); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs index 4ea8cdef9..a3342ade6 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs @@ -113,8 +113,8 @@ public class OpenApiExampleReferenceTests public OpenApiExampleReferenceTests() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); - _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument; - _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument; + _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).Document; + _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).Document; _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri); _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs index cfdf4ab1c..c979e1eb0 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs @@ -82,8 +82,8 @@ public class OpenApiHeaderReferenceTests public OpenApiHeaderReferenceTests() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); - _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument; - _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument; + _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).Document; + _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).Document; _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri); _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs index 87d2db06e..3587a83d9 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs @@ -125,8 +125,8 @@ public class OpenApiLinkReferenceTests public OpenApiLinkReferenceTests() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); - _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument; - _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument; + _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).Document; + _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).Document; _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri); _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs index c00db94f5..8745da455 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs @@ -83,8 +83,8 @@ public class OpenApiParameterReferenceTests public OpenApiParameterReferenceTests() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); - _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument; - _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument; + _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).Document; + _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).Document; _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri); _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs index a2d9b525d..c23d564d5 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs @@ -80,8 +80,8 @@ public class OpenApiPathItemReferenceTests public OpenApiPathItemReferenceTests() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); - _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument; - _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument; + _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).Document; + _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).Document; _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri); _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2); _openApiDoc_2.Workspace.RegisterComponents(_openApiDoc_2); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs index 54521e83c..7bd9ab35b 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs @@ -88,8 +88,8 @@ public class OpenApiRequestBodyReferenceTests public OpenApiRequestBodyReferenceTests() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); - _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument; - _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument; + _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).Document; + _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).Document; _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri); _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs index 4b6b25564..361006b64 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs @@ -71,8 +71,8 @@ public class OpenApiResponseReferenceTest public OpenApiResponseReferenceTest() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); - _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument; - _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument; + _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).Document; + _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).Document; _openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri); _openApiDoc.Workspace.RegisterComponents(_openApiDoc_2); diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs index 7fcd7dfd8..af9ab3c23 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiSecuritySchemeReferenceTests.cs @@ -45,7 +45,7 @@ public OpenApiSecuritySchemeReferenceTests() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); var result = OpenApiDocument.Parse(OpenApi, "yaml"); - _openApiSecuritySchemeReference = new("mySecurityScheme", result.OpenApiDocument); + _openApiSecuritySchemeReference = new("mySecurityScheme", result.Document); } [Fact] diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs index 82f1b27a2..8ec0e1373 100644 --- a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs +++ b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiTagReferenceTest.cs @@ -64,7 +64,7 @@ public OpenApiTagReferenceTest() { OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader()); var result = OpenApiDocument.Parse(OpenApi, "yaml"); - _openApiTagReference = new("user", result.OpenApiDocument) + _openApiTagReference = new("user", result.Document) { Description = "Users operations" }; diff --git a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt index 8f9f8ed41..af1ed8948 100644 --- a/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt +++ b/test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt @@ -1388,8 +1388,8 @@ namespace Microsoft.OpenApi.Reader public class ReadResult { public ReadResult() { } - public Microsoft.OpenApi.Reader.OpenApiDiagnostic OpenApiDiagnostic { get; set; } - public Microsoft.OpenApi.Models.OpenApiDocument OpenApiDocument { get; set; } + public Microsoft.OpenApi.Reader.OpenApiDiagnostic Diagnostic { get; set; } + public Microsoft.OpenApi.Models.OpenApiDocument Document { get; set; } } public enum ReferenceResolutionSetting {