Skip to content

Commit c60b007

Browse files
darrelmillerdarrelmiller
committed
Changes to tests to reflect refactoring
1 parent 202c684 commit c60b007

File tree

5 files changed

+44
-73
lines changed

5 files changed

+44
-73
lines changed

‎test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV2Tests.cs

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,19 @@ namespace Microsoft.OpenApi.Readers.Tests.ReferenceService
1212
{
1313
public class ConvertToOpenApiReferenceV2Tests
1414
{
15-
private readonly OpenApiV2ReferenceService _referenceService;
16-
17-
public ConvertToOpenApiReferenceV2Tests()
18-
{
19-
var context = new ParsingContext();
20-
var diagnostic = new OpenApiDiagnostic();
21-
22-
var yamlDocument = new YamlDocument("{}");
23-
var rootNode = new RootNode(context, diagnostic, yamlDocument);
24-
25-
_referenceService = new OpenApiV2ReferenceService(rootNode);
26-
}
15+
2716

2817
[Fact]
2918
public void ParseExternalReference()
3019
{
3120
// Arrange
21+
var referenceService = new OpenApiV2VersionService();
3222
var externalResource = "externalSchema.json";
3323
var id = "externalPathSegment1/externalPathSegment2/externalPathSegment3";
3424
var input = $"{externalResource}#/{id}";
3525

3626
// Act
37-
var reference = _referenceService.ConvertToOpenApiReference(input, null);
27+
var reference = referenceService.ConvertToOpenApiReference(input, null);
3828

3929
// Assert
4030
reference.ExternalResource.Should().Be(externalResource);
@@ -46,12 +36,13 @@ public void ParseExternalReference()
4636
public void ParseLocalParameterReference()
4737
{
4838
// Arrange
39+
var referenceService = new OpenApiV2VersionService();
4940
var referenceType = ReferenceType.Parameter;
5041
var id = "parameterId";
5142
var input = $"#/parameters/{id}";
5243

5344
// Act
54-
var reference = _referenceService.ConvertToOpenApiReference(input, referenceType);
45+
var reference = referenceService.ConvertToOpenApiReference(input, referenceType);
5546

5647
// Assert
5748
reference.Type.Should().Be(referenceType);
@@ -63,12 +54,13 @@ public void ParseLocalParameterReference()
6354
public void ParseLocalSchemaReference()
6455
{
6556
// Arrange
57+
var referenceService = new OpenApiV2VersionService();
6658
var referenceType = ReferenceType.Schema;
6759
var id = "parameterId";
6860
var input = $"#/definitions/{id}";
6961

7062
// Act
71-
var reference = _referenceService.ConvertToOpenApiReference(input, referenceType);
63+
var reference = referenceService.ConvertToOpenApiReference(input, referenceType);
7264

7365
// Assert
7466
reference.Type.Should().Be(referenceType);
@@ -80,12 +72,13 @@ public void ParseLocalSchemaReference()
8072
public void ParseTagReference()
8173
{
8274
// Arrange
75+
var referenceService = new OpenApiV2VersionService();
8376
var referenceType = ReferenceType.Tag;
8477
var id = "tagId";
8578
var input = $"{id}";
8679

8780
// Act
88-
var reference = _referenceService.ConvertToOpenApiReference(input, referenceType);
81+
var reference = referenceService.ConvertToOpenApiReference(input, referenceType);
8982

9083
// Assert
9184
reference.Type.Should().Be(referenceType);
@@ -97,12 +90,13 @@ public void ParseTagReference()
9790
public void ParseSecuritySchemeReference()
9891
{
9992
// Arrange
93+
var referenceService = new OpenApiV2VersionService();
10094
var referenceType = ReferenceType.SecurityScheme;
10195
var id = "securitySchemeId";
10296
var input = $"{id}";
10397

10498
// Act
105-
var reference = _referenceService.ConvertToOpenApiReference(input, referenceType);
99+
var reference = referenceService.ConvertToOpenApiReference(input, referenceType);
106100

107101
// Assert
108102
reference.Type.Should().Be(referenceType);

‎test/Microsoft.OpenApi.Readers.Tests/ReferenceService/ConvertToOpenApiReferenceV3Tests.cs

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,19 @@ namespace Microsoft.OpenApi.Readers.Tests.ReferenceService
1212
{
1313
public class ConvertToOpenApiReferenceV3Tests
1414
{
15-
private readonly OpenApiV3ReferenceService _referenceService;
16-
17-
public ConvertToOpenApiReferenceV3Tests()
18-
{
19-
var context = new ParsingContext();
20-
var diagnostic = new OpenApiDiagnostic();
21-
22-
var yamlDocument = new YamlDocument("{}");
23-
var rootNode = new RootNode(context, diagnostic, yamlDocument);
24-
_referenceService = new OpenApiV3ReferenceService(rootNode);
25-
}
15+
2616

2717
[Fact]
2818
public void ParseExternalReference()
2919
{
3020
// Arrange
21+
var referenceService = new OpenApiV3VersionService();
3122
var externalResource = "externalSchema.json";
3223
var id = "externalPathSegment1/externalPathSegment2/externalPathSegment3";
3324
var input = $"{externalResource}#/{id}";
3425

3526
// Act
36-
var reference = _referenceService.ConvertToOpenApiReference(input, null);
27+
var reference = referenceService.ConvertToOpenApiReference(input, null);
3728

3829
// Assert
3930
reference.Type.Should().BeNull();
@@ -45,12 +36,13 @@ public void ParseExternalReference()
4536
public void ParseLocalParameterReference()
4637
{
4738
// Arrange
39+
var referenceService = new OpenApiV3VersionService();
4840
var referenceType = ReferenceType.Parameter;
4941
var id = "parameterId";
5042
var input = $"#/components/parameters/{id}";
5143

5244
// Act
53-
var reference = _referenceService.ConvertToOpenApiReference(input, referenceType);
45+
var reference = referenceService.ConvertToOpenApiReference(input, referenceType);
5446

5547
// Assert
5648
reference.Type.Should().Be(referenceType);
@@ -62,12 +54,13 @@ public void ParseLocalParameterReference()
6254
public void ParseLocalSchemaReference()
6355
{
6456
// Arrange
57+
var referenceService = new OpenApiV3VersionService();
6558
var referenceType = ReferenceType.Schema;
6659
var id = "schemaId";
6760
var input = $"#/components/schemas/{id}";
6861

6962
// Act
70-
var reference = _referenceService.ConvertToOpenApiReference(input, referenceType);
63+
var reference = referenceService.ConvertToOpenApiReference(input, referenceType);
7164

7265
// Assert
7366
reference.Type.Should().Be(referenceType);
@@ -79,12 +72,13 @@ public void ParseLocalSchemaReference()
7972
public void ParseTagReference()
8073
{
8174
// Arrange
75+
var referenceService = new OpenApiV3VersionService();
8276
var referenceType = ReferenceType.Tag;
8377
var id = "tagId";
8478
var input = $"{id}";
8579

8680
// Act
87-
var reference = _referenceService.ConvertToOpenApiReference(input, referenceType);
81+
var reference = referenceService.ConvertToOpenApiReference(input, referenceType);
8882

8983
// Assert
9084
reference.Type.Should().Be(referenceType);
@@ -96,12 +90,13 @@ public void ParseTagReference()
9690
public void ParseSecuritySchemeReference()
9791
{
9892
// Arrange
93+
var referenceService = new OpenApiV3VersionService();
9994
var referenceType = ReferenceType.SecurityScheme;
10095
var id = "securitySchemeId";
10196
var input = $"{id}";
10297

10398
// Act
104-
var reference = _referenceService.ConvertToOpenApiReference(input, referenceType);
99+
var reference = referenceService.ConvertToOpenApiReference(input, referenceType);
105100

106101
// Assert
107102
reference.Type.Should().Be(referenceType);

‎test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void LoadSchemaReference()
3434
rootNode = new RootNode(context, diagnostic, yamlDocument);
3535
}
3636

37-
context.ReferenceService = new OpenApiV2ReferenceService(rootNode);
37+
context.ReferenceService = new OpenApiV2VersionService();
3838

3939
var reference = new OpenApiReference
4040
{
@@ -43,7 +43,7 @@ public void LoadSchemaReference()
4343
};
4444

4545
// Act
46-
context.ReferenceService.TryLoadReference(reference, out var referencedObject);
46+
context.ReferenceService.TryLoadReference(context, reference, out var referencedObject);
4747

4848
// Assert
4949
referencedObject.ShouldBeEquivalentTo(
@@ -91,7 +91,7 @@ public void LoadParameterReference()
9191
rootNode = new RootNode(context, diagnostic, yamlDocument);
9292
}
9393

94-
context.ReferenceService = new OpenApiV2ReferenceService(rootNode);
94+
context.ReferenceService = new OpenApiV2VersionService();
9595

9696
var reference = new OpenApiReference
9797
{
@@ -100,7 +100,7 @@ public void LoadParameterReference()
100100
};
101101

102102
// Act
103-
context.ReferenceService.TryLoadReference(reference, out var referencedObject);
103+
context.ReferenceService.TryLoadReference(context, reference, out var referencedObject);
104104

105105
// Assert
106106
referencedObject.ShouldBeEquivalentTo(
@@ -136,15 +136,15 @@ public void LoadSecuritySchemeReference()
136136
rootNode = new RootNode(context, diagnostic, yamlDocument);
137137
}
138138

139-
context.ReferenceService = new OpenApiV2ReferenceService(rootNode);
139+
context.ReferenceService = new OpenApiV2VersionService();
140140
var reference = new OpenApiReference
141141
{
142142
Type = ReferenceType.SecurityScheme,
143143
Id = "api_key_sample"
144144
};
145145

146146
// Act
147-
context.ReferenceService.TryLoadReference(reference, out var referencedObject);
147+
context.ReferenceService.TryLoadReference(context, reference, out var referencedObject);
148148

149149
// Assert
150150
referencedObject.ShouldBeEquivalentTo(
@@ -174,7 +174,7 @@ public void LoadResponseReference()
174174
rootNode = new RootNode(context, diagnostic, yamlDocument);
175175
}
176176

177-
context.ReferenceService = new OpenApiV2ReferenceService(rootNode);
177+
context.ReferenceService = new OpenApiV2VersionService();
178178

179179
var reference = new OpenApiReference
180180
{
@@ -183,7 +183,7 @@ public void LoadResponseReference()
183183
};
184184

185185
// Act
186-
context.ReferenceService.TryLoadReference(reference, out var referencedObject);
186+
context.ReferenceService.TryLoadReference(context,reference, out var referencedObject);
187187

188188
// Assert
189189
referencedObject.ShouldBeEquivalentTo(
@@ -211,7 +211,7 @@ public void LoadResponseAndSchemaReference()
211211
rootNode = new RootNode(context, diagnostic, yamlDocument);
212212
}
213213

214-
context.ReferenceService = new OpenApiV2ReferenceService(rootNode);
214+
context.ReferenceService = new OpenApiV2VersionService();
215215

216216
var reference = new OpenApiReference
217217
{
@@ -220,7 +220,7 @@ public void LoadResponseAndSchemaReference()
220220
};
221221

222222
// Act
223-
context.ReferenceService.TryLoadReference(reference, out var referencedObject);
223+
context.ReferenceService.TryLoadReference(context, reference, out var referencedObject);
224224

225225
// Assert
226226
referencedObject.ShouldBeEquivalentTo(

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ public void EquivalentV2AndV3DocumentsShouldProductEquivalentObjects(string file
2424
var openApiDocV2 = new OpenApiStreamReader().Read(streamV2, out var contextV2);
2525
var openApiDocV3 = new OpenApiStreamReader().Read(streamV3, out var contextV3);
2626

27-
// Everything in the DOM read from V2 and V3 documents should be equal
28-
// except the SpecVersion property (2.0 and 3.0.0)
2927
openApiDocV3.ShouldBeEquivalentTo(
3028
openApiDocV2);
3129

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@ public void ParseHttpSecuritySchemeShouldSucceed()
2323
{
2424
using (var stream = File.OpenRead(Path.Combine(SampleFolderPath, "basicSecurityScheme.yaml")))
2525
{
26-
var yamlStream = new YamlStream();
27-
yamlStream.Load(new StreamReader(stream));
28-
var yamlNode = yamlStream.Documents.First().RootNode;
26+
var document = OpenApiStreamReader.LoadYamlDocument(stream);
2927

3028
var context = new ParsingContext();
3129
var diagnostic = new OpenApiDiagnostic();
3230

33-
var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
31+
var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
3432

3533
// Act
3634
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
@@ -50,14 +48,11 @@ public void ParseApiKeySecuritySchemeShouldSucceed()
5048
{
5149
using (var stream = File.OpenRead(Path.Combine(SampleFolderPath, "apiKeySecurityScheme.yaml")))
5250
{
53-
var yamlStream = new YamlStream();
54-
yamlStream.Load(new StreamReader(stream));
55-
var yamlNode = yamlStream.Documents.First().RootNode;
56-
51+
var document = OpenApiStreamReader.LoadYamlDocument(stream);
5752
var context = new ParsingContext();
5853
var diagnostic = new OpenApiDiagnostic();
5954

60-
var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
55+
var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
6156

6257
// Act
6358
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
@@ -78,14 +73,11 @@ public void ParseOAuth2ImplicitSecuritySchemeShouldSucceed()
7873
{
7974
using (var stream = File.OpenRead(Path.Combine(SampleFolderPath, "oAuth2ImplicitSecurityScheme.yaml")))
8075
{
81-
var yamlStream = new YamlStream();
82-
yamlStream.Load(new StreamReader(stream));
83-
var yamlNode = yamlStream.Documents.First().RootNode;
84-
76+
var document = OpenApiStreamReader.LoadYamlDocument(stream);
8577
var context = new ParsingContext();
8678
var diagnostic = new OpenApiDiagnostic();
8779

88-
var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
80+
var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
8981

9082
// Act
9183
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
@@ -116,14 +108,11 @@ public void ParseOAuth2PasswordSecuritySchemeShouldSucceed()
116108
{
117109
using (var stream = File.OpenRead(Path.Combine(SampleFolderPath, "oAuth2PasswordSecurityScheme.yaml")))
118110
{
119-
var yamlStream = new YamlStream();
120-
yamlStream.Load(new StreamReader(stream));
121-
var yamlNode = yamlStream.Documents.First().RootNode;
122-
111+
var document = OpenApiStreamReader.LoadYamlDocument(stream);
123112
var context = new ParsingContext();
124113
var diagnostic = new OpenApiDiagnostic();
125114

126-
var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
115+
var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
127116

128117
// Act
129118
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
@@ -154,14 +143,11 @@ public void ParseOAuth2ApplicationSecuritySchemeShouldSucceed()
154143
{
155144
using (var stream = File.OpenRead(Path.Combine(SampleFolderPath, "oAuth2ApplicationSecurityScheme.yaml")))
156145
{
157-
var yamlStream = new YamlStream();
158-
yamlStream.Load(new StreamReader(stream));
159-
var yamlNode = yamlStream.Documents.First().RootNode;
160-
146+
var document = OpenApiStreamReader.LoadYamlDocument(stream);
161147
var context = new ParsingContext();
162148
var diagnostic = new OpenApiDiagnostic();
163149

164-
var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
150+
var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
165151

166152
// Act
167153
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
@@ -192,14 +178,12 @@ public void ParseOAuth2AccessCodeSecuritySchemeShouldSucceed()
192178
{
193179
using (var stream = File.OpenRead(Path.Combine(SampleFolderPath, "oAuth2AccessCodeSecurityScheme.yaml")))
194180
{
195-
var yamlStream = new YamlStream();
196-
yamlStream.Load(new StreamReader(stream));
197-
var yamlNode = yamlStream.Documents.First().RootNode;
181+
var document = OpenApiStreamReader.LoadYamlDocument(stream);
198182

199183
var context = new ParsingContext();
200184
var diagnostic = new OpenApiDiagnostic();
201185

202-
var node = new MapNode(context, diagnostic, (YamlMappingNode)yamlNode);
186+
var node = new MapNode(context, diagnostic, (YamlMappingNode)document.RootNode);
203187

204188
// Act
205189
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);

0 commit comments

Comments
 (0)