Skip to content

Commit c1d831f

Browse files
committed
Clean up tests
1 parent 5a51460 commit c1d831f

7 files changed

+42
-39
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ public class OpenApiOperationTests
8989
{
9090
Tags = new List<OpenApiTag>
9191
{
92-
new()
93-
{
94-
Name = "tagName1",
95-
Description = "tagDescription1",
96-
},
9792
new OpenApiTagReference("tagId1", null)
9893
},
9994
Summary = "summary1",
@@ -360,7 +355,6 @@ public void SerializeAdvancedOperationWithTagAndSecurityAsV3JsonWorks()
360355
"""
361356
{
362357
"tags": [
363-
"tagName1",
364358
"tagId1"
365359
],
366360
"summary": "summary1",
@@ -669,7 +663,6 @@ public void SerializeAdvancedOperationWithTagAndSecurityAsV2JsonWorks()
669663
"""
670664
{
671665
"tags": [
672-
"tagName1",
673666
"tagId1"
674667
],
675668
"summary": "summary1",
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
"pet"
1+
{
2+
"name": "pet",
3+
"description": "Pets operations",
4+
"externalDocs": {
5+
"description": "Find more info here",
6+
"url": "https://example.com"
7+
},
8+
"x-tag-extension": null
9+
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"pet"
1+
{"name":"pet","description":"Pets operations","externalDocs":{"description":"Find more info here","url":"https://example.com"},"x-tag-extension":null}
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
"pet"
1+
{
2+
"name": "pet",
3+
"description": "Pets operations",
4+
"externalDocs": {
5+
"description": "Find more info here",
6+
"url": "https://example.com"
7+
},
8+
"x-tag-extension": null
9+
}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"pet"
1+
{"name":"pet","description":"Pets operations","externalDocs":{"description":"Find more info here","url":"https://example.com"},"x-tag-extension":null}

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

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using FluentAssertions;
99
using Microsoft.OpenApi.Interfaces;
1010
using Microsoft.OpenApi.Models;
11+
using Microsoft.OpenApi.Models.References;
1112
using Microsoft.OpenApi.Writers;
1213
using VerifyXunit;
1314
using Xunit;
@@ -30,21 +31,7 @@ public class OpenApiTagTests
3031
}
3132
};
3233

33-
public static OpenApiTag ReferencedTag = new()
34-
{
35-
Name = "pet",
36-
Description = "Pets operations",
37-
ExternalDocs = OpenApiExternalDocsTests.AdvanceExDocs,
38-
Extensions = new Dictionary<string, IOpenApiExtension>
39-
{
40-
{"x-tag-extension", null}
41-
},
42-
Reference = new()
43-
{
44-
Type = ReferenceType.Tag,
45-
Id = "pet"
46-
}
47-
};
34+
public static OpenApiTag ReferencedTag = new OpenApiTagReference("pet", null);
4835

4936
[Theory]
5037
[InlineData(true)]
@@ -56,7 +43,7 @@ public async Task SerializeBasicTagAsV3JsonWithoutReferenceWorksAsync(bool produ
5643
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
5744

5845
// Act
59-
BasicTag.SerializeAsV3WithoutReference(writer);
46+
BasicTag.SerializeAsV3(writer);
6047
writer.Flush();
6148

6249
// Assert
@@ -73,7 +60,7 @@ public async Task SerializeBasicTagAsV2JsonWithoutReferenceWorksAsync(bool produ
7360
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
7461

7562
// Act
76-
BasicTag.SerializeAsV2WithoutReference(writer);
63+
BasicTag.SerializeAsV2(writer);
7764
writer.Flush();
7865

7966
// Assert
@@ -89,7 +76,7 @@ public void SerializeBasicTagAsV3YamlWithoutReferenceWorks()
8976
var expected = "{ }";
9077

9178
// Act
92-
BasicTag.SerializeAsV3WithoutReference(writer);
79+
BasicTag.SerializeAsV3(writer);
9380
var actual = outputStringWriter.GetStringBuilder().ToString();
9481

9582
// Assert
@@ -107,7 +94,7 @@ public void SerializeBasicTagAsV2YamlWithoutReferenceWorks()
10794
var expected = "{ }";
10895

10996
// Act
110-
BasicTag.SerializeAsV2WithoutReference(writer);
97+
BasicTag.SerializeAsV2(writer);
11198
writer.Flush();
11299
var actual = outputStringWriter.GetStringBuilder().ToString();
113100

@@ -127,7 +114,7 @@ public async Task SerializeAdvancedTagAsV3JsonWithoutReferenceWorksAsync(bool pr
127114
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
128115

129116
// Act
130-
AdvancedTag.SerializeAsV3WithoutReference(writer);
117+
AdvancedTag.SerializeAsV3(writer);
131118
writer.Flush();
132119

133120
// Assert
@@ -144,7 +131,7 @@ public async Task SerializeAdvancedTagAsV2JsonWithoutReferenceWorksAsync(bool pr
144131
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
145132

146133
// Act
147-
AdvancedTag.SerializeAsV2WithoutReference(writer);
134+
AdvancedTag.SerializeAsV2(writer);
148135
writer.Flush();
149136

150137
// Assert
@@ -168,7 +155,7 @@ public void SerializeAdvancedTagAsV3YamlWithoutReferenceWorks()
168155
""";
169156

170157
// Act
171-
AdvancedTag.SerializeAsV3WithoutReference(writer);
158+
AdvancedTag.SerializeAsV3(writer);
172159
writer.Flush();
173160
var actual = outputStringWriter.GetStringBuilder().ToString();
174161

@@ -195,7 +182,7 @@ public void SerializeAdvancedTagAsV2YamlWithoutReferenceWorks()
195182
""";
196183

197184
// Act
198-
AdvancedTag.SerializeAsV2WithoutReference(writer);
185+
AdvancedTag.SerializeAsV2(writer);
199186
writer.Flush();
200187
var actual = outputStringWriter.GetStringBuilder().ToString();
201188

@@ -246,7 +233,12 @@ public void SerializeAdvancedTagAsV3YamlWorks()
246233
var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
247234
var writer = new OpenApiYamlWriter(outputStringWriter);
248235

249-
var expected = @" pet";
236+
var expected = @"name: pet
237+
description: Pets operations
238+
externalDocs:
239+
description: Find more info here
240+
url: https://example.com
241+
x-tag-extension:";
250242

251243
// Act
252244
AdvancedTag.SerializeAsV3(writer);
@@ -266,7 +258,12 @@ public void SerializeAdvancedTagAsV2YamlWorks()
266258
var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
267259
var writer = new OpenApiYamlWriter(outputStringWriter);
268260

269-
var expected = @" pet";
261+
var expected = @"name: pet
262+
description: Pets operations
263+
externalDocs:
264+
description: Find more info here
265+
url: https://example.com
266+
x-tag-extension:";
270267

271268
// Act
272269
AdvancedTag.SerializeAsV2(writer);

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -995,11 +995,8 @@ namespace Microsoft.OpenApi.Models
995995
public virtual Microsoft.OpenApi.Models.OpenApiExternalDocs ExternalDocs { get; set; }
996996
public virtual string Name { get; set; }
997997
public virtual void SerializeAsV2(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
998-
public void SerializeAsV2WithoutReference(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
999998
public virtual void SerializeAsV3(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
1000999
public virtual void SerializeAsV31(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
1001-
public virtual void SerializeAsV31WithoutReference(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
1002-
public virtual void SerializeAsV3WithoutReference(Microsoft.OpenApi.Writers.IOpenApiWriter writer) { }
10031000
}
10041001
public class OpenApiXml : Microsoft.OpenApi.Interfaces.IOpenApiElement, Microsoft.OpenApi.Interfaces.IOpenApiExtensible, Microsoft.OpenApi.Interfaces.IOpenApiSerializable
10051002
{

0 commit comments

Comments
 (0)