Skip to content

Commit a9803f7

Browse files
committed
clean up tests
1 parent 8fd03c9 commit a9803f7

File tree

11 files changed

+19
-33
lines changed

11 files changed

+19
-33
lines changed

test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,6 @@ public OpenApiDocumentTests()
2222
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
2323
}
2424

25-
public static T Clone<T>(T element) where T : IOpenApiSerializable
26-
{
27-
using var stream = new MemoryStream();
28-
IOpenApiWriter writer;
29-
var streamWriter = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture);
30-
writer = new OpenApiJsonWriter(streamWriter, new OpenApiJsonWriterSettings()
31-
{
32-
InlineLocalReferences = true
33-
});
34-
element.SerializeAsV31(writer);
35-
writer.Flush();
36-
stream.Position = 0;
37-
38-
using var streamReader = new StreamReader(stream);
39-
var result = streamReader.ReadToEnd();
40-
return OpenApiModelFactory.Parse<T>(result, OpenApiSpecVersion.OpenApi3_1, out OpenApiDiagnostic diagnostic4);
41-
}
42-
4325
[Fact]
4426
public void ParseDocumentWithWebhooksShouldSucceed()
4527
{
@@ -408,6 +390,11 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
408390
.Excluding(y => y.BaseUri));
409391
actual.OpenApiDiagnostic.Should().BeEquivalentTo(
410392
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 });
393+
394+
var outputWriter = new StringWriter(CultureInfo.InvariantCulture);
395+
var writer = new OpenApiJsonWriter(outputWriter, new() { InlineLocalReferences = true } );
396+
actual.OpenApiDocument.SerializeAsV31(writer);
397+
var serialized = outputWriter.ToString();
411398
}
412399

413400
[Fact]

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public OpenApiSecurityScheme CloneSecurityScheme(OpenApiSecurityScheme element)
6363
{
6464
InlineLocalReferences = true
6565
});
66-
element.SerializeAsV3WithoutReference(writer);
66+
element.SerializeAsV3(writer);
6767
writer.Flush();
6868
stream.Position = 0;
6969

test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public async Task SerializeReferencedCallbackAsV3JsonWithoutReferenceWorks(bool
138138
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
139139

140140
// Act
141-
ReferencedCallback.SerializeAsV3WithoutReference(writer);
141+
ReferencedCallback.SerializeAsV3(writer);
142142
writer.Flush();
143143

144144
// Assert

test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public async Task SerializeReferencedExampleAsV3JsonWithoutReferenceWorks(bool p
141141
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
142142

143143
// Act
144-
ReferencedExample.SerializeAsV3WithoutReference(writer);
144+
ReferencedExample.SerializeAsV3(writer);
145145
writer.Flush();
146146

147147
// Assert

test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public async Task SerializeReferencedHeaderAsV3JsonWithoutReferenceWorks(bool pr
8181
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
8282

8383
// Act
84-
ReferencedHeader.SerializeAsV3WithoutReference(writer);
84+
ReferencedHeader.SerializeAsV3(writer);
8585
writer.Flush();
8686

8787
// Assert
@@ -132,7 +132,7 @@ public async Task SerializeReferencedHeaderAsV2JsonWithoutReferenceWorks(bool pr
132132
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
133133

134134
// Act
135-
ReferencedHeader.SerializeAsV2WithoutReference(writer);
135+
ReferencedHeader.SerializeAsV2(writer);
136136
writer.Flush();
137137

138138
// Assert

test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public async Task SerializeReferencedLinkAsV3JsonWithoutReferenceWorksAsync(bool
116116
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
117117

118118
// Act
119-
ReferencedLink.SerializeAsV3WithoutReference(writer);
119+
ReferencedLink.SerializeAsV3(writer);
120120
writer.Flush();
121121

122122
// Assert

test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public async Task SerializeReferencedParameterAsV3JsonWithoutReferenceWorksAsync
352352
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
353353

354354
// Act
355-
ReferencedParameter.SerializeAsV3WithoutReference(writer);
355+
ReferencedParameter.SerializeAsV3(writer);
356356
writer.Flush();
357357

358358
// Assert
@@ -386,7 +386,7 @@ public async Task SerializeReferencedParameterAsV2JsonWithoutReferenceWorksAsync
386386
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
387387

388388
// Act
389-
ReferencedParameter.SerializeAsV2WithoutReference(writer);
389+
ReferencedParameter.SerializeAsV2(writer);
390390
writer.Flush();
391391

392392
// Assert
@@ -420,7 +420,7 @@ public async Task SerializeParameterWithFormStyleAndExplodeFalseWorksAsync(bool
420420
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
421421

422422
// Act
423-
ParameterWithFormStyleAndExplodeFalse.SerializeAsV3WithoutReference(writer);
423+
ParameterWithFormStyleAndExplodeFalse.SerializeAsV3(writer);
424424
writer.Flush();
425425

426426
// Assert
@@ -437,7 +437,7 @@ public async Task SerializeParameterWithFormStyleAndExplodeTrueWorksAsync(bool p
437437
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
438438

439439
// Act
440-
ParameterWithFormStyleAndExplodeTrue.SerializeAsV3WithoutReference(writer);
440+
ParameterWithFormStyleAndExplodeTrue.SerializeAsV3(writer);
441441
writer.Flush();
442442

443443
// Assert

test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public async Task SerializeReferencedRequestBodyAsV3JsonWithoutReferenceWorksAsy
9292
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
9393

9494
// Act
95-
ReferencedRequestBody.SerializeAsV3WithoutReference(writer);
95+
ReferencedRequestBody.SerializeAsV3(writer);
9696
writer.Flush();
9797

9898
// Assert

test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ public async Task SerializeReferencedResponseAsV3JsonWithoutReferenceWorksAsync(
374374
var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
375375

376376
// Act
377-
ReferencedV3Response.SerializeAsV3WithoutReference(writer);
377+
ReferencedV3Response.SerializeAsV3(writer);
378378
writer.Flush();
379379

380380
// Assert
@@ -408,7 +408,7 @@ public async Task SerializeReferencedResponseAsV2JsonWithoutReferenceWorksAsync(
408408
var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
409409

410410
// Act
411-
ReferencedV2Response.SerializeAsV2WithoutReference(writer);
411+
ReferencedV2Response.SerializeAsV2(writer);
412412
writer.Flush();
413413

414414
// Assert

test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ public async Task SerializeReferencedSecuritySchemeAsV3JsonWithoutReferenceWorks
333333
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
334334

335335
// Act
336-
ReferencedSecurityScheme.SerializeAsV3WithoutReference(writer);
336+
ReferencedSecurityScheme.SerializeAsV3(writer);
337337
writer.Flush();
338338

339339
// Assert

0 commit comments

Comments
 (0)