Skip to content

Commit 86395ee

Browse files
martincostellomartincostello
committed
Fix tests .NET 8 and 9
Fix tests for .NET 8 and 9 caused by Microsoft.OpenApi 1.6.23 or behaviour changes compared to .NET 10.
1 parent 27957b2 commit 86395ee

File tree

70 files changed

+134
-161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+134
-161
lines changed

‎test/Swashbuckle.AspNetCore.Annotations.Test/AnnotationsOperationFilterTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ namespace Swashbuckle.AspNetCore.Annotations.Test
1111
{
1212
public class AnnotationsOperationFilterTests
1313
{
14+
#if NET10_0_OR_GREATER
15+
[Fact(Skip = "TODO Need to fix tags not being added.")]
16+
#else
1417
[Fact]
18+
#endif
1519
public void Apply_EnrichesOperationMetadata_IfActionDecoratedWithSwaggerOperationAttribute()
1620
{
1721
var operation = new OpenApiOperation();
@@ -126,7 +130,11 @@ public void Apply_DelegatesToSpecifiedFilter_IfActionDecoratedWithSwaggerOperati
126130
Assert.NotEmpty(operation.Extensions);
127131
}
128132

133+
#if NET10_0_OR_GREATER
134+
[Fact(Skip = "TODO Need to fix tags not being added.")]
135+
#else
129136
[Fact]
137+
#endif
130138
public void Apply_EnrichesOperationMetadata_IfMinimalActionDecoratedWithSwaggerOperationAttribute()
131139
{
132140
var operationAttribute = new SwaggerOperationAttribute("Summary for ActionWithSwaggerOperationAttribute")

‎test/Swashbuckle.AspNetCore.ApiTesting.Test/RequestValidatorTests.cs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,15 @@ public void Validate_ThrowsException_IfPathParameterIsNotOfSpecifiedType(
176176
{
177177
{ "/api/products?param=foo", JsonSchemaTypes.Boolean, null, "Parameter 'param' is not of type 'boolean'" },
178178
{ "/api/products?param=foo", JsonSchemaTypes.Number, null, "Parameter 'param' is not of type 'number'" },
179-
{ "/api/products?param=1&param=foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Parameter 'param' is not of type 'array[Number]'" },
180179
{ "/api/products?param=true", JsonSchemaTypes.Boolean, null, null },
181180
{ "/api/products?param=1", JsonSchemaTypes.Number, null, null },
182181
{ "/api/products?param=foo", JsonSchemaTypes.String, null, null },
183182
{ "/api/products?param=1&param=2", JsonSchemaTypes.Array, JsonSchemaTypes.Number, null },
183+
#if NET10_0_OR_GREATER
184+
{ "/api/products?param=1&param=foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Parameter 'param' is not of type 'array[Number]'" },
185+
#else
186+
{ "/api/products?param=1&param=foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Parameter 'param' is not of type 'array[number]'" },
187+
#endif
184188
};
185189

186190
[Theory]
@@ -225,11 +229,15 @@ public void Validate_ThrowsException_IfQueryParameterIsNotOfSpecifiedType(
225229
{
226230
{ "foo", JsonSchemaTypes.Boolean, null, "Parameter 'test-header' is not of type 'boolean'" },
227231
{ "foo", JsonSchemaTypes.Number, null, "Parameter 'test-header' is not of type 'number'" },
228-
{ "1,foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Parameter 'test-header' is not of type 'array[Number]'" },
229232
{ "true", JsonSchemaTypes.Boolean, null, null },
230233
{ "1", JsonSchemaTypes.Number, null, null },
231234
{ "foo", JsonSchemaTypes.String, null, null },
232-
{ "1,2", JsonSchemaTypes.Array, JsonSchemaTypes.Number, null }
235+
{ "1,2", JsonSchemaTypes.Array, JsonSchemaTypes.Number, null },
236+
#if NET10_0_OR_GREATER
237+
{ "1,foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Parameter 'test-header' is not of type 'array[Number]'" },
238+
#else
239+
{ "1,foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Parameter 'test-header' is not of type 'array[number]'" },
240+
#endif
233241
};
234242

235243
[Theory]

‎test/Swashbuckle.AspNetCore.ApiTesting.Test/ResponseValidatorTests.cs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,15 @@ public void Validate_ThrowsException_IfRequiredHeaderIsNotPresent(
8585
{
8686
{ "foo", JsonSchemaTypes.Boolean, null, "Header 'test-header' is not of type 'boolean'" },
8787
{ "foo", JsonSchemaTypes.Number, null, "Header 'test-header' is not of type 'number'" },
88-
{ "1,foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Header 'test-header' is not of type 'array[Number]'" },
8988
{ "true", JsonSchemaTypes.Boolean, null, null },
9089
{ "1", JsonSchemaTypes.Number, null, null },
9190
{ "foo", JsonSchemaTypes.String, null, null },
92-
{ "1,2", JsonSchemaTypes.Array, JsonSchemaTypes.Number, null }
91+
{ "1,2", JsonSchemaTypes.Array, JsonSchemaTypes.Number, null },
92+
#if NET10_0_OR_GREATER
93+
{ "1,foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Header 'test-header' is not of type 'array[Number]'" },
94+
#else
95+
{ "1,foo", JsonSchemaTypes.Array, JsonSchemaTypes.Number, "Header 'test-header' is not of type 'array[number]'" },
96+
#endif
9397
};
9498

9599
[Theory]

‎test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerVerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_ForAutofaq.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"openapi": "3.0.1",
2+
"openapi": "3.0.4",
33
"info": {
44
"title": "CliExampleWithFactory",
55
"version": "1.0"

‎test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerVerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Without_Startup_entryPointType=MinimalApp.Program_swaggerRequestUri=v1.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"openapi": "3.0.1",
2+
"openapi": "3.0.4",
33
"info": {
44
"title": "MinimalApp",
55
"version": "v1"

‎test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerVerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Without_Startup_entryPointType=MvcWithNullable.Program_swaggerRequestUri=v1.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"openapi": "3.0.1",
2+
"openapi": "3.0.4",
33
"info": {
44
"title": "MvcWithNullable",
55
"version": "1.0"

‎test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerVerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Without_Startup_entryPointType=TopLevelSwaggerDoc.Program_swaggerRequestUri=.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"openapi": "3.0.1",
2+
"openapi": "3.0.4",
33
"info": {
44
"title": "Test API",
55
"version": "1"

‎test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerVerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Without_Startup_entryPointType=WebApi.Aot.Program_swaggerRequestUri=v1.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"openapi": "3.0.1",
2+
"openapi": "3.0.4",
33
"info": {
44
"title": "Native AoT API V1",
55
"description": "A sample API for testing Swashbuckle with native AoT",

‎test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerVerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Without_Startup_entryPointType=WebApi.Program_swaggerRequestUri=v1.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"openapi": "3.0.1",
2+
"openapi": "3.0.4",
33
"info": {
44
"title": "WebApi",
55
"version": "v1"

‎test/Swashbuckle.AspNetCore.IntegrationTests/SwaggerVerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_startupType=CliExample.Startup_swaggerRequestUri=v1.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"openapi": "3.0.1",
2+
"openapi": "3.0.4",
33
"info": {
44
"title": "CliExample",
55
"version": "1.0"

0 commit comments

Comments
 (0)