Skip to content

Commit 49a181a

Browse files
MaggieKimani1MaggieKimani1
committed
use async lifetime for test initialization
1 parent 47bfb6f commit 49a181a

10 files changed

+144
-72
lines changed

‎test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using Microsoft.OpenApi.Models.References;
1010
using Microsoft.OpenApi.Reader;
1111
using Microsoft.OpenApi.Readers;
12-
using Microsoft.OpenApi.Services;
1312
using Microsoft.OpenApi.Writers;
1413
using VerifyXunit;
1514
using Xunit;

‎test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
using Microsoft.OpenApi.Reader;
1111
using Microsoft.OpenApi.Readers;
1212
using Microsoft.OpenApi.Writers;
13-
using Microsoft.OpenApi.Services;
1413
using VerifyXunit;
1514
using Xunit;
1615

1716
namespace Microsoft.OpenApi.Tests.Models.References
1817
{
1918
[Collection("DefaultSettings")]
20-
public class OpenApiExampleReferenceTests
19+
public class OpenApiExampleReferenceTests : IAsyncLifetime
2120
{
2221
// OpenApi doc with external $ref
2322
private const string OpenApi = @"
@@ -105,16 +104,20 @@ public class OpenApiExampleReferenceTests
105104
name: John Doe
106105
";
107106

108-
private readonly OpenApiExampleReference _localExampleReference;
109-
private readonly OpenApiExampleReference _externalExampleReference;
110-
private readonly OpenApiDocument _openApiDoc;
111-
private readonly OpenApiDocument _openApiDoc_2;
107+
private OpenApiExampleReference _localExampleReference;
108+
private OpenApiExampleReference _externalExampleReference;
109+
private OpenApiDocument _openApiDoc;
110+
private OpenApiDocument _openApiDoc_2;
112111

113112
public OpenApiExampleReferenceTests()
114113
{
115-
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
116-
_openApiDoc = OpenApiDocument.ParseAsync(OpenApi).GetAwaiter().GetResult().OpenApiDocument;
117-
_openApiDoc_2 = OpenApiDocument.ParseAsync(OpenApi_2).GetAwaiter().GetResult().OpenApiDocument;
114+
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
115+
}
116+
117+
public async Task InitializeAsync()
118+
{
119+
_openApiDoc = (await OpenApiDocument.ParseAsync(OpenApi)).OpenApiDocument;
120+
_openApiDoc_2 = (await OpenApiDocument.ParseAsync(OpenApi_2)).OpenApiDocument;
118121
_openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
119122
_openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
120123

@@ -129,7 +132,7 @@ public OpenApiExampleReferenceTests()
129132
Summary = "Example of an external user",
130133
Description = "This is an example of an external user"
131134
};
132-
}
135+
}
133136

134137
[Fact]
135138
public void ExampleReferenceResolutionWorks()
@@ -183,5 +186,10 @@ public async Task SerializeExampleReferenceAsV31JsonWorks(bool produceTerseOutpu
183186
// Assert
184187
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
185188
}
189+
190+
public Task DisposeAsync()
191+
{
192+
return Task.CompletedTask;
193+
}
186194
}
187195
}

‎test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
using Microsoft.OpenApi.Reader;
1111
using Microsoft.OpenApi.Readers;
1212
using Microsoft.OpenApi.Writers;
13-
using Microsoft.OpenApi.Services;
1413
using VerifyXunit;
1514
using Xunit;
1615

1716
namespace Microsoft.OpenApi.Tests.Models.References
1817
{
1918
[Collection("DefaultSettings")]
20-
public class OpenApiHeaderReferenceTests
19+
public class OpenApiHeaderReferenceTests : IAsyncLifetime
2120
{
2221
// OpenApi doc with external $ref
2322
private const string OpenApi= @"
@@ -74,16 +73,20 @@ public class OpenApiHeaderReferenceTests
7473
type: string
7574
";
7675

77-
private readonly OpenApiHeaderReference _localHeaderReference;
78-
private readonly OpenApiHeaderReference _externalHeaderReference;
79-
private readonly OpenApiDocument _openApiDoc;
80-
private readonly OpenApiDocument _openApiDoc_2;
76+
private OpenApiHeaderReference _localHeaderReference;
77+
private OpenApiHeaderReference _externalHeaderReference;
78+
private OpenApiDocument _openApiDoc;
79+
private OpenApiDocument _openApiDoc_2;
8180

8281
public OpenApiHeaderReferenceTests()
8382
{
84-
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
85-
_openApiDoc = OpenApiDocument.ParseAsync(OpenApi).GetAwaiter().GetResult().OpenApiDocument;
86-
_openApiDoc_2 = OpenApiDocument.ParseAsync(OpenApi_2).GetAwaiter().GetResult().OpenApiDocument;
83+
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
84+
}
85+
86+
public async Task InitializeAsync()
87+
{
88+
_openApiDoc = (await OpenApiDocument.ParseAsync(OpenApi)).OpenApiDocument;
89+
_openApiDoc_2 = (await OpenApiDocument.ParseAsync(OpenApi_2)).OpenApiDocument;
8790
_openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
8891
_openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
8992

@@ -97,6 +100,7 @@ public OpenApiHeaderReferenceTests()
97100
Description = "Location of the externally referenced post"
98101
};
99102
}
103+
100104

101105
[Fact]
102106
public void HeaderReferenceResolutionWorks()
@@ -158,6 +162,11 @@ public async Task SerializeHeaderReferenceAsV2JsonWorksAsync(bool produceTerseOu
158162

159163
// Assert
160164
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
165+
}
166+
167+
public Task DisposeAsync()
168+
{
169+
return Task.CompletedTask;
161170
}
162171
}
163172
}

‎test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
using Microsoft.OpenApi.Reader;
1111
using Microsoft.OpenApi.Readers;
1212
using Microsoft.OpenApi.Writers;
13-
using Microsoft.OpenApi.Services;
1413
using VerifyXunit;
1514
using Xunit;
1615

1716
namespace Microsoft.OpenApi.Tests.Models.References
1817
{
1918
[Collection("DefaultSettings")]
20-
public class OpenApiLinkReferenceTests
19+
public class OpenApiLinkReferenceTests : IAsyncLifetime
2120
{
2221
// OpenApi doc with external $ref
2322
private const string OpenApi = @"
@@ -117,16 +116,20 @@ public class OpenApiLinkReferenceTests
117116
type: string
118117
";
119118

120-
private readonly OpenApiLinkReference _localLinkReference;
121-
private readonly OpenApiLinkReference _externalLinkReference;
122-
private readonly OpenApiDocument _openApiDoc;
123-
private readonly OpenApiDocument _openApiDoc_2;
119+
private OpenApiLinkReference _localLinkReference;
120+
private OpenApiLinkReference _externalLinkReference;
121+
private OpenApiDocument _openApiDoc;
122+
private OpenApiDocument _openApiDoc_2;
124123

125124
public OpenApiLinkReferenceTests()
126125
{
127-
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
128-
_openApiDoc = OpenApiDocument.ParseAsync(OpenApi).GetAwaiter().GetResult().OpenApiDocument;
129-
_openApiDoc_2 = OpenApiDocument.ParseAsync(OpenApi_2).GetAwaiter().GetResult().OpenApiDocument;
126+
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
127+
}
128+
129+
public async Task InitializeAsync()
130+
{
131+
_openApiDoc = (await OpenApiDocument.ParseAsync(OpenApi)).OpenApiDocument;
132+
_openApiDoc_2 = (await OpenApiDocument.ParseAsync(OpenApi_2)).OpenApiDocument;
130133
_openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
131134
_openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
132135

@@ -191,5 +194,10 @@ public async Task SerializeLinkReferenceAsV31JsonWorks(bool produceTerseOutput)
191194
// Assert
192195
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
193196
}
197+
198+
public Task DisposeAsync()
199+
{
200+
return Task.CompletedTask;
201+
}
194202
}
195203
}

‎test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
using Microsoft.OpenApi.Reader;
1111
using Microsoft.OpenApi.Readers;
1212
using Microsoft.OpenApi.Writers;
13-
using Microsoft.OpenApi.Services;
1413
using VerifyXunit;
1514
using Xunit;
1615

1716
namespace Microsoft.OpenApi.Tests.Models.References
1817
{
1918
[Collection("DefaultSettings")]
20-
public class OpenApiParameterReferenceTests
19+
public class OpenApiParameterReferenceTests : IAsyncLifetime
2120
{
2221
// OpenApi doc with external $ref
2322
private const string OpenApi = @"
@@ -75,16 +74,20 @@ public class OpenApiParameterReferenceTests
7574
minimum: 1
7675
maximum: 100
7776
";
78-
private readonly OpenApiParameterReference _localParameterReference;
79-
private readonly OpenApiParameterReference _externalParameterReference;
80-
private readonly OpenApiDocument _openApiDoc;
81-
private readonly OpenApiDocument _openApiDoc_2;
77+
private OpenApiParameterReference _localParameterReference;
78+
private OpenApiParameterReference _externalParameterReference;
79+
private OpenApiDocument _openApiDoc;
80+
private OpenApiDocument _openApiDoc_2;
8281

8382
public OpenApiParameterReferenceTests()
8483
{
85-
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
86-
_openApiDoc = OpenApiDocument.ParseAsync(OpenApi).GetAwaiter().GetResult().OpenApiDocument;
87-
_openApiDoc_2 = OpenApiDocument.ParseAsync(OpenApi_2).GetAwaiter().GetResult().OpenApiDocument;
84+
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
85+
}
86+
87+
public async Task InitializeAsync()
88+
{
89+
_openApiDoc = (await OpenApiDocument.ParseAsync(OpenApi)).OpenApiDocument;
90+
_openApiDoc_2 = (await OpenApiDocument.ParseAsync(OpenApi_2)).OpenApiDocument;
8891
_openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
8992
_openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
9093

@@ -161,5 +164,10 @@ public async Task SerializeParameterReferenceAsV2JsonWorksAsync(bool produceTers
161164
// Assert
162165
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
163166
}
167+
168+
public Task DisposeAsync()
169+
{
170+
return Task.CompletedTask;
171+
}
164172
}
165173
}

‎test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
using Microsoft.OpenApi.Reader;
1111
using Microsoft.OpenApi.Readers;
1212
using Microsoft.OpenApi.Writers;
13-
using Microsoft.OpenApi.Services;
1413
using VerifyXunit;
1514
using Xunit;
1615

1716
namespace Microsoft.OpenApi.Tests.Models.References
1817
{
1918
[Collection("DefaultSettings")]
20-
public class OpenApiPathItemReferenceTests
19+
public class OpenApiPathItemReferenceTests : IAsyncLifetime
2120
{
2221
private const string OpenApi = @"
2322
openapi: 3.1.1
@@ -72,16 +71,20 @@ public class OpenApiPathItemReferenceTests
7271
description: User deleted successfully
7372
";
7473

75-
private readonly OpenApiPathItemReference _localPathItemReference;
76-
private readonly OpenApiPathItemReference _externalPathItemReference;
77-
private readonly OpenApiDocument _openApiDoc;
78-
private readonly OpenApiDocument _openApiDoc_2;
74+
private OpenApiPathItemReference _localPathItemReference;
75+
private OpenApiPathItemReference _externalPathItemReference;
76+
private OpenApiDocument _openApiDoc;
77+
private OpenApiDocument _openApiDoc_2;
7978

8079
public OpenApiPathItemReferenceTests()
8180
{
82-
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
83-
_openApiDoc = OpenApiDocument.ParseAsync(OpenApi).GetAwaiter().GetResult().OpenApiDocument;
84-
_openApiDoc_2 = OpenApiDocument.ParseAsync(OpenApi_2).GetAwaiter().GetResult().OpenApiDocument;
81+
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
82+
}
83+
84+
public async Task InitializeAsync()
85+
{
86+
_openApiDoc = (await OpenApiDocument.ParseAsync(OpenApi)).OpenApiDocument;
87+
_openApiDoc_2 = (await OpenApiDocument.ParseAsync(OpenApi_2)).OpenApiDocument;
8588
_openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
8689
_openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
8790
_openApiDoc_2.Workspace.RegisterComponents(_openApiDoc_2);
@@ -135,5 +138,10 @@ public async Task SerializePathItemReferenceAsV31JsonWorks(bool produceTerseOutp
135138
// Assert
136139
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
137140
}
141+
142+
public Task DisposeAsync()
143+
{
144+
return Task.CompletedTask;
145+
}
138146
}
139147
}

‎test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
using Microsoft.OpenApi.Reader;
1111
using Microsoft.OpenApi.Readers;
1212
using Microsoft.OpenApi.Writers;
13-
using Microsoft.OpenApi.Services;
1413
using VerifyXunit;
1514
using Xunit;
1615

1716
namespace Microsoft.OpenApi.Tests.Models.References
1817
{
1918
[Collection("DefaultSettings")]
20-
public class OpenApiRequestBodyReferenceTests
19+
public class OpenApiRequestBodyReferenceTests : IAsyncLifetime
2120
{
2221
private readonly string OpenApi = @"
2322
openapi: 3.0.0
@@ -80,16 +79,20 @@ public class OpenApiRequestBodyReferenceTests
8079
type: string
8180
";
8281

83-
private readonly OpenApiRequestBodyReference _localRequestBodyReference;
84-
private readonly OpenApiRequestBodyReference _externalRequestBodyReference;
85-
private readonly OpenApiDocument _openApiDoc;
86-
private readonly OpenApiDocument _openApiDoc_2;
82+
private OpenApiRequestBodyReference _localRequestBodyReference;
83+
private OpenApiRequestBodyReference _externalRequestBodyReference;
84+
private OpenApiDocument _openApiDoc;
85+
private OpenApiDocument _openApiDoc_2;
8786

8887
public OpenApiRequestBodyReferenceTests()
8988
{
90-
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
91-
_openApiDoc = OpenApiDocument.ParseAsync(OpenApi).GetAwaiter().GetResult().OpenApiDocument;
92-
_openApiDoc_2 = OpenApiDocument.ParseAsync(OpenApi_2).GetAwaiter().GetResult().OpenApiDocument;
89+
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
90+
}
91+
92+
public async Task InitializeAsync()
93+
{
94+
_openApiDoc = (await OpenApiDocument.ParseAsync(OpenApi)).OpenApiDocument;
95+
_openApiDoc_2 = (await OpenApiDocument.ParseAsync(OpenApi_2)).OpenApiDocument;
9396
_openApiDoc.Workspace.AddDocumentId("https://myserver.com/beta", _openApiDoc_2.BaseUri);
9497
_openApiDoc.Workspace.RegisterComponents(_openApiDoc_2);
9598

@@ -155,5 +158,10 @@ public async Task SerializeRequestBodyReferenceAsV31JsonWorks(bool produceTerseO
155158
// Assert
156159
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
157160
}
161+
162+
public Task DisposeAsync()
163+
{
164+
return Task.CompletedTask;
165+
}
158166
}
159167
}

0 commit comments

Comments
 (0)