Skip to content

Commit 8674fe3

Browse files
MaggieKimani1MaggieKimani1
committed
Revert previous changes
1 parent d50f857 commit 8674fe3

File tree

8 files changed

+169
-190
lines changed

8 files changed

+169
-190
lines changed

‎src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,5 @@ public class OpenApiDiagnostic : IDiagnostic
2626
/// Open API specification version of the document parsed.
2727
/// </summary>
2828
public OpenApiSpecVersion SpecificationVersion { get; set; }
29-
30-
/// <summary>
31-
/// The unique hash code of the generated OpenAPI document
32-
/// </summary>
33-
public string HashCode { get; set; }
3429
}
3530
}

‎src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)
4545
var reader = new StreamReader(input);
4646
var result = new OpenApiTextReaderReader(_settings).Read(reader, out diagnostic);
4747

48-
diagnostic.HashCode = OpenApiDocument.GenerateHashValue(input);
49-
5048
if (!_settings.LeaveStreamOpen)
5149
{
5250
reader.Dispose();

‎test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@
137137
<EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\minimalDocument.yaml">
138138
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
139139
</EmbeddedResource>
140-
<EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\minimalDocumentWithWhitespace.yaml">
141-
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
142-
</EmbeddedResource>
143140
<EmbeddedResource Include="V3Tests\Samples\OpenApiDocument\apiWithFullHeaderComponent.yaml">
144141
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
145142
</EmbeddedResource>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
150150
},
151151
Paths = new OpenApiPaths()
152152
});
153-
var context2 = new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi2_0 };
154153

155-
Assert.Equal(context.SpecificationVersion, context2.SpecificationVersion);
154+
context.Should().BeEquivalentTo(
155+
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi2_0 });
156156
}
157157

158158
[Fact]
@@ -208,7 +208,7 @@ public void ShouldParseProducesInAnyOrder()
208208
{
209209
Type = ReferenceType.Schema,
210210
Id = "Error",
211-
HostDocument= doc
211+
HostDocument = doc
212212
},
213213
Properties = new Dictionary<string, OpenApiSchema>()
214214
{
@@ -407,7 +407,7 @@ public void ShouldAssignSchemaToAllResponses()
407407
{
408408
Id = "Error",
409409
Type = ReferenceType.Schema,
410-
HostDocument= document
410+
HostDocument = document
411411
}
412412
};
413413
var responses = document.Paths["/items"].Operations[OperationType.Get].Responses;

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,14 @@ public void InvalidHostShouldYieldError()
280280

281281
var doc = reader.Read(input, out var diagnostic);
282282
doc.Servers.Count.Should().Be(0);
283-
284-
Assert.Equal(OpenApiSpecVersion.OpenApi2_0, diagnostic.SpecificationVersion);
285-
diagnostic.Errors.Should().BeEquivalentTo(
286-
new List<OpenApiError>
283+
diagnostic.Should().BeEquivalentTo(
284+
new OpenApiDiagnostic
287285
{
288-
new OpenApiError("#/", "Invalid host")
286+
Errors =
287+
{
288+
new OpenApiError("#/", "Invalid host")
289+
},
290+
SpecificationVersion = OpenApiSpecVersion.OpenApi2_0
289291
});
290292
}
291293

‎test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs

Lines changed: 80 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,29 @@ public class OpenApiCallbackTests
2121
[Fact]
2222
public void ParseBasicCallbackShouldSucceed()
2323
{
24-
using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicCallback.yaml"));
25-
// Arrange
26-
var yamlStream = new YamlStream();
27-
yamlStream.Load(new StreamReader(stream));
28-
var yamlNode = yamlStream.Documents.First().RootNode;
24+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "basicCallback.yaml")))
25+
{
26+
// Arrange
27+
var yamlStream = new YamlStream();
28+
yamlStream.Load(new StreamReader(stream));
29+
var yamlNode = yamlStream.Documents.First().RootNode;
2930

30-
var diagnostic = new OpenApiDiagnostic();
31-
var context = new ParsingContext(diagnostic);
31+
var diagnostic = new OpenApiDiagnostic();
32+
var context = new ParsingContext(diagnostic);
3233

33-
var node = new MapNode(context, (YamlMappingNode)yamlNode);
34+
var node = new MapNode(context, (YamlMappingNode)yamlNode);
3435

35-
// Act
36-
var callback = OpenApiV3Deserializer.LoadCallback(node);
36+
// Act
37+
var callback = OpenApiV3Deserializer.LoadCallback(node);
3738

38-
// Assert
39-
diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic());
39+
// Assert
40+
diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic());
4041

41-
callback.Should().BeEquivalentTo(
42-
new OpenApiCallback
43-
{
44-
PathItems =
42+
callback.Should().BeEquivalentTo(
43+
new OpenApiCallback
4544
{
45+
PathItems =
46+
{
4647
[RuntimeExpression.Build("$request.body#/url")]
4748
= new OpenApiPathItem
4849
{
@@ -68,31 +69,33 @@ public void ParseBasicCallbackShouldSucceed()
6869
}
6970
}
7071
}
71-
}
72-
});
72+
}
73+
});
74+
}
7375
}
7476

7577
[Fact]
7678
public void ParseCallbackWithReferenceShouldSucceed()
7779
{
78-
using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "callbackWithReference.yaml"));
79-
// Act
80-
var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
80+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "callbackWithReference.yaml")))
81+
{
82+
// Act
83+
var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
8184

82-
// Assert
83-
var path = openApiDoc.Paths.First().Value;
84-
var subscribeOperation = path.Operations[OperationType.Post];
85+
// Assert
86+
var path = openApiDoc.Paths.First().Value;
87+
var subscribeOperation = path.Operations[OperationType.Post];
8588

86-
var callback = subscribeOperation.Callbacks["simpleHook"];
87-
var diagnostic2 = new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 };
89+
var callback = subscribeOperation.Callbacks["simpleHook"];
8890

89-
Assert.Equal(diagnostic.SpecificationVersion, diagnostic2.SpecificationVersion);
91+
diagnostic.Should().BeEquivalentTo(
92+
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
9093

91-
callback.Should().BeEquivalentTo(
92-
new OpenApiCallback
93-
{
94-
PathItems =
94+
callback.Should().BeEquivalentTo(
95+
new OpenApiCallback
9596
{
97+
PathItems =
98+
{
9699
[RuntimeExpression.Build("$request.body#/url")]= new OpenApiPathItem {
97100
Operations = {
98101
[OperationType.Post] = new OpenApiOperation()
@@ -119,38 +122,39 @@ public void ParseCallbackWithReferenceShouldSucceed()
119122
}
120123
}
121124
}
122-
},
123-
Reference = new OpenApiReference
124-
{
125-
Type = ReferenceType.Callback,
126-
Id = "simpleHook",
127-
HostDocument = openApiDoc
128-
}
129-
});
125+
},
126+
Reference = new OpenApiReference
127+
{
128+
Type = ReferenceType.Callback,
129+
Id = "simpleHook",
130+
HostDocument = openApiDoc
131+
}
132+
});
133+
}
130134
}
131135

132136
[Fact]
133137
public void ParseMultipleCallbacksWithReferenceShouldSucceed()
134138
{
135-
using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleCallbacksWithReference.yaml"));
136-
// Act
137-
var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
138-
139-
// Assert
140-
var path = openApiDoc.Paths.First().Value;
141-
var subscribeOperation = path.Operations[OperationType.Post];
139+
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "multipleCallbacksWithReference.yaml")))
140+
{
141+
// Act
142+
var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic);
142143

143-
var diagnostic2 = new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 };
144+
// Assert
145+
var path = openApiDoc.Paths.First().Value;
146+
var subscribeOperation = path.Operations[OperationType.Post];
144147

145-
Assert.Equal(diagnostic.SpecificationVersion, diagnostic2.SpecificationVersion);
148+
diagnostic.Should().BeEquivalentTo(
149+
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
146150

147-
var callback1 = subscribeOperation.Callbacks["simpleHook"];
151+
var callback1 = subscribeOperation.Callbacks["simpleHook"];
148152

149-
callback1.Should().BeEquivalentTo(
150-
new OpenApiCallback
151-
{
152-
PathItems =
153+
callback1.Should().BeEquivalentTo(
154+
new OpenApiCallback
153155
{
156+
PathItems =
157+
{
154158
[RuntimeExpression.Build("$request.body#/url")]= new OpenApiPathItem {
155159
Operations = {
156160
[OperationType.Post] = new OpenApiOperation()
@@ -177,21 +181,21 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed()
177181
}
178182
}
179183
}
180-
},
181-
Reference = new OpenApiReference
182-
{
183-
Type = ReferenceType.Callback,
184-
Id = "simpleHook",
185-
HostDocument = openApiDoc
186-
}
187-
});
184+
},
185+
Reference = new OpenApiReference
186+
{
187+
Type = ReferenceType.Callback,
188+
Id = "simpleHook",
189+
HostDocument = openApiDoc
190+
}
191+
});
188192

189-
var callback2 = subscribeOperation.Callbacks["callback2"];
190-
callback2.Should().BeEquivalentTo(
191-
new OpenApiCallback
192-
{
193-
PathItems =
193+
var callback2 = subscribeOperation.Callbacks["callback2"];
194+
callback2.Should().BeEquivalentTo(
195+
new OpenApiCallback
194196
{
197+
PathItems =
198+
{
195199
[RuntimeExpression.Build("/simplePath")]= new OpenApiPathItem {
196200
Operations = {
197201
[OperationType.Post] = new OpenApiOperation()
@@ -219,15 +223,15 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed()
219223
}
220224
},
221225
}
222-
}
223-
});
226+
}
227+
});
224228

225-
var callback3 = subscribeOperation.Callbacks["callback3"];
226-
callback3.Should().BeEquivalentTo(
227-
new OpenApiCallback
228-
{
229-
PathItems =
229+
var callback3 = subscribeOperation.Callbacks["callback3"];
230+
callback3.Should().BeEquivalentTo(
231+
new OpenApiCallback
230232
{
233+
PathItems =
234+
{
231235
[RuntimeExpression.Build(@"http://example.com?transactionId={$request.body#/id}&email={$request.body#/email}")] = new OpenApiPathItem {
232236
Operations = {
233237
[OperationType.Post] = new OpenApiOperation()
@@ -262,8 +266,9 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed()
262266
}
263267
}
264268
}
265-
}
266-
});
269+
}
270+
});
271+
}
267272
}
268273
}
269274
}

0 commit comments

Comments
 (0)