Review feedback

maurei · maurei · commit f8e640bd2966 · 2022-12-19T09:13:10.000+01:00
OpenApiTests/SchemaProperties test collection:
* Allow for usage of OpenApiStartup directly
* Remove unneeded adding of JsonConverter
* Replace null checks with .ShouldHaveCount() calls
* Adjust test names
Misc:
* Reverted .editorconfig changes and fixed ApiException constructor instead
* Remove Debug statement
diff --git a/.editorconfig b/.editorconfig
@@ -11,10 +11,6 @@ insert_final_newline = true
 [*.{config,csproj,css,js,json,props,ruleset,xslt}]
 indent_size = 2
 
-[test/OpenApiClientTests/obj/*.{cs}]
-# Ignore compiler warnings triggered by code auto-generated by NSWag
-dotnet_diagnostic.CS8625.severity = suggestion
-
 [*.{cs}]
 #### C#/.NET Coding Conventions ####
 
diff --git a/src/JsonApiDotNetCore.OpenApi.Client/ApiException.cs b/src/JsonApiDotNetCore.OpenApi.Client/ApiException.cs
@@ -15,7 +15,7 @@ public sealed class ApiException : Exception
 
     public IReadOnlyDictionary<string, IEnumerable<string>> Headers { get; }
 
-    public ApiException(string message, int statusCode, string? response, IReadOnlyDictionary<string, IEnumerable<string>> headers, Exception innerException)
+    public ApiException(string message, int statusCode, string? response, IReadOnlyDictionary<string, IEnumerable<string>> headers, Exception? innerException)
         : base($"{message}\n\nStatus: {statusCode}\nResponse: \n{response ?? "(null)"}", innerException)
     {
         StatusCode = statusCode;
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs
@@ -203,8 +203,6 @@ private OpenApiSchema CreateRelationshipSchema(Type relationshipSchemaType)
 
         OpenApiSchema fullSchema = _schemaRepositoryAccessor.Current.Schemas[referenceSchema.Reference.Id];
 
-        Console.WriteLine(relationshipSchemaType.FullName);
-
         if (IsDataPropertyNullableInRelationshipSchemaType(relationshipSchemaType))
         {
             fullSchema.Properties[JsonApiObjectPropertyName.Data] =
diff --git a/test/OpenApiTests/OpenApiStartup.cs b/test/OpenApiTests/OpenApiStartup.cs
@@ -6,7 +6,7 @@
 
 namespace OpenApiTests;
 
-public abstract class OpenApiStartup<TDbContext> : TestableStartup<TDbContext>
+public class OpenApiStartup<TDbContext> : TestableStartup<TDbContext>
     where TDbContext : TestableDbContext
 {
     public override void ConfigureServices(IServiceCollection services)
@@ -26,3 +26,4 @@ public override void Configure(IApplicationBuilder app)
         app.UseEndpoints(endpoints => endpoints.MapControllers());
     }
 }
+
diff --git a/test/OpenApiTests/SchemaProperties/ModelStateValidationDisabledStartup.cs b/test/OpenApiTests/SchemaProperties/ModelStateValidationDisabledStartup.cs
@@ -1,4 +1,3 @@
-using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using TestBuildingBlocks;
@@ -13,7 +12,7 @@ protected override void SetJsonApiOptions(JsonApiOptions options)
     {
         base.SetJsonApiOptions(options);
 
-        options.SerializerOptions.Converters.Add(new JsonStringEnumConverter());
         options.ValidateModelState = false;
     }
 }
+
diff --git a/test/OpenApiTests/SchemaProperties/NullableReferenceTypesDisabled/ModelStateValidationDisabledTests.cs b/test/OpenApiTests/SchemaProperties/NullableReferenceTypesDisabled/ModelStateValidationDisabledTests.cs
@@ -15,11 +15,12 @@ public ModelStateValidationDisabledTests(
         OpenApiTestContext<ModelStateValidationDisabledStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)
     {
         _testContext = testContext;
+
         testContext.UseController<ChickensController>();
     }
 
     [Fact]
-    public async Task Resource_when_ModelStateValidation_is_disabled_produces_expected_required_property_in_schema()
+    public async Task Produces_expected_required_property_in_schema_for_resource()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -28,13 +29,12 @@ public async Task Resource_when_ModelStateValidation_is_disabled_produces_expect
         document.ShouldContainPath("components.schemas.chickenAttributesInPostRequest.required").With(requiredElement =>
         {
             var requiredAttributes = JsonSerializer.Deserialize<List<string>>(requiredElement.GetRawText());
-            requiredAttributes.ShouldNotBeNull();
+            requiredAttributes.ShouldHaveCount(3);
 
             requiredAttributes.Should().Contain("nameOfCurrentFarm");
             requiredAttributes.Should().Contain("weight");
             requiredAttributes.Should().Contain("hasProducedEggs");
-
-            requiredAttributes.ShouldHaveCount(3);
         });
     }
 }
+
diff --git a/test/OpenApiTests/SchemaProperties/NullableReferenceTypesDisabled/ModelStateValidationEnabledTests.cs b/test/OpenApiTests/SchemaProperties/NullableReferenceTypesDisabled/ModelStateValidationEnabledTests.cs
@@ -6,20 +6,20 @@
 namespace OpenApiTests.SchemaProperties.NullableReferenceTypesDisabled;
 
 public sealed class ModelStateValidationEnabledTests
-    : IClassFixture<OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext>>
+    : IClassFixture<OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext>>
 {
-    private readonly OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> _testContext;
+    private readonly OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> _testContext;
 
     public ModelStateValidationEnabledTests(
-        OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)
+        OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)
     {
         _testContext = testContext;
 
         testContext.UseController<ChickensController>();
     }
 
     [Fact]
-    public async Task Resource_when_ModelStateValidation_is_enabled_produces_expected_required_property_in_schema()
+    public async Task Produces_expected_required_property_in_schema_for_resource()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -28,13 +28,12 @@ public async Task Resource_when_ModelStateValidation_is_enabled_produces_expecte
         document.ShouldContainPath("components.schemas.chickenAttributesInPostRequest.required").With(requiredElement =>
         {
             var requiredAttributes = JsonSerializer.Deserialize<List<string>>(requiredElement.GetRawText());
-            requiredAttributes.ShouldNotBeNull();
+            requiredAttributes.ShouldHaveCount(3);
 
             requiredAttributes.Should().Contain("nameOfCurrentFarm");
             requiredAttributes.Should().Contain("weight");
             requiredAttributes.Should().Contain("hasProducedEggs");
-
-            requiredAttributes.ShouldHaveCount(3);
         });
     }
 }
+
diff --git a/test/OpenApiTests/SchemaProperties/NullableReferenceTypesDisabled/NullabilityTests.cs b/test/OpenApiTests/SchemaProperties/NullableReferenceTypesDisabled/NullabilityTests.cs
@@ -6,12 +6,11 @@
 namespace OpenApiTests.SchemaProperties.NullableReferenceTypesDisabled;
 
 public sealed class NullabilityTests
-    : IClassFixture<OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext>>
+    : IClassFixture<OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext>>
 {
-    private readonly OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> _testContext;
+    private readonly OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> _testContext;
 
-    public NullabilityTests(
-        OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)
+    public NullabilityTests(OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)
     {
         _testContext = testContext;
 
@@ -20,7 +19,7 @@ public NullabilityTests(
     }
 
     [Fact]
-    public async Task Resource_produces_expected_nullable_properties_in_schema()
+    public async Task Produces_expected_nullable_properties_in_schema_for_resource()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -30,7 +29,7 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()
         {
             propertiesElement.ShouldContainPath("name").With(propertyElement =>
             {
-                propertyElement.ShouldContainPath("nullable").With(nullableProperty => nullableProperty.ValueKind.Should().Be(JsonValueKind.True));
+                propertyElement.ShouldContainPath("nullable").With(element => element.ValueKind.Should().Be(JsonValueKind.True));
             });
 
             propertiesElement.ShouldContainPath("nameOfCurrentFarm").With(propertyElement =>
@@ -50,7 +49,7 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()
 
             propertiesElement.ShouldContainPath("timeAtCurrentFarmInDays").With(propertyElement =>
             {
-                propertyElement.ShouldContainPath("nullable").With(nullableProperty => nullableProperty.ValueKind.Should().Be(JsonValueKind.True));
+                propertyElement.ShouldContainPath("nullable").With(element => element.ValueKind.Should().Be(JsonValueKind.True));
             });
 
             propertiesElement.ShouldContainPath("hasProducedEggs").With(propertyElement =>
@@ -60,3 +59,4 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()
         });
     }
 }
+
diff --git a/test/OpenApiTests/SchemaProperties/NullableReferenceTypesEnabled/ModelStateValidationDisabledTests.cs b/test/OpenApiTests/SchemaProperties/NullableReferenceTypesEnabled/ModelStateValidationDisabledTests.cs
@@ -20,7 +20,7 @@ public ModelStateValidationDisabledTests(
     }
 
     [Fact]
-    public async Task Resource_when_ModelStateValidation_is_disabled_produces_expected_required_property_in_schema()
+    public async Task Produces_expected_required_property_in_schema_for_resource()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -29,14 +29,13 @@ public async Task Resource_when_ModelStateValidation_is_disabled_produces_expect
         document.ShouldContainPath("components.schemas.cowAttributesInPostRequest.required").With(requiredElement =>
         {
             var requiredAttributes = JsonSerializer.Deserialize<List<string>>(requiredElement.GetRawText());
-            requiredAttributes.ShouldNotBeNull();
+            requiredAttributes.ShouldHaveCount(4);
 
             requiredAttributes.Should().Contain("nameOfCurrentFarm");
             requiredAttributes.Should().Contain("nickname");
             requiredAttributes.Should().Contain("weight");
             requiredAttributes.Should().Contain("hasProducedMilk");
-
-            requiredAttributes.ShouldHaveCount(4);
         });
     }
 }
+
diff --git a/test/OpenApiTests/SchemaProperties/NullableReferenceTypesEnabled/ModelStateValidationEnabledTests.cs b/test/OpenApiTests/SchemaProperties/NullableReferenceTypesEnabled/ModelStateValidationEnabledTests.cs
@@ -6,20 +6,20 @@
 namespace OpenApiTests.SchemaProperties.NullableReferenceTypesEnabled;
 
 public sealed class ModelStateValidationEnabledTests
-    : IClassFixture<OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext>>
+    : IClassFixture<OpenApiTestContext<OpenApiStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext>>
 {
-    private readonly OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext> _testContext;
+    private readonly OpenApiTestContext<OpenApiStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext> _testContext;
 
     public ModelStateValidationEnabledTests(
-        OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext> testContext)
+        OpenApiTestContext<OpenApiStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext> testContext)
     {
         _testContext = testContext;
 
         testContext.UseController<CowsController>();
     }
 
     [Fact]
-    public async Task Resource_when_ModelStateValidation_is_enabled_produces_expected_required_property_in_schema()
+    public async Task Produces_expected_required_property_in_schema_for_resource()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -28,15 +28,14 @@ public async Task Resource_when_ModelStateValidation_is_enabled_produces_expecte
         document.ShouldContainPath("components.schemas.cowAttributesInPostRequest.required").With(requiredElement =>
         {
             var requiredAttributes = JsonSerializer.Deserialize<List<string>>(requiredElement.GetRawText());
-            requiredAttributes.ShouldNotBeNull();
+            requiredAttributes.ShouldHaveCount(5);
 
             requiredAttributes.Should().Contain("name");
             requiredAttributes.Should().Contain("nameOfCurrentFarm");
             requiredAttributes.Should().Contain("nickname");
             requiredAttributes.Should().Contain("weight");
             requiredAttributes.Should().Contain("hasProducedMilk");
-
-            requiredAttributes.ShouldHaveCount(5);
         });
     }
 }
+
diff --git a/test/OpenApiTests/SchemaProperties/NullableReferenceTypesEnabled/NullabilityTests.cs b/test/OpenApiTests/SchemaProperties/NullableReferenceTypesEnabled/NullabilityTests.cs
@@ -6,12 +6,11 @@
 namespace OpenApiTests.SchemaProperties.NullableReferenceTypesEnabled;
 
 public sealed class NullabilityTests
-    : IClassFixture<OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext>>
+    : IClassFixture<OpenApiTestContext<OpenApiStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext>>
 {
-    private readonly OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext> _testContext;
+    private readonly OpenApiTestContext<OpenApiStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext> _testContext;
 
-    public NullabilityTests(
-        OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext> testContext)
+    public NullabilityTests(OpenApiTestContext<OpenApiStartup<NullableReferenceTypesEnabledDbContext>, NullableReferenceTypesEnabledDbContext> testContext)
     {
         _testContext = testContext;
 
@@ -20,7 +19,7 @@ public NullabilityTests(
     }
 
     [Fact]
-    public async Task Resource_produces_expected_nullable_properties_in_schema()
+    public async Task Produces_expected_nullable_properties_in_schema_for_resource()
     {
         // Act
         JsonElement document = await _testContext.GetSwaggerDocumentAsync();
@@ -40,7 +39,7 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()
 
             propertiesElement.ShouldContainPath("nameOfPreviousFarm").With(propertyElement =>
             {
-                propertyElement.ShouldContainPath("nullable").With(nullableProperty => nullableProperty.ValueKind.Should().Be(JsonValueKind.True));
+                propertyElement.ShouldContainPath("nullable").With(element => element.ValueKind.Should().Be(JsonValueKind.True));
             });
 
             propertiesElement.ShouldContainPath("nickname").With(propertyElement =>
@@ -60,7 +59,7 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()
 
             propertiesElement.ShouldContainPath("timeAtCurrentFarmInDays").With(propertyElement =>
             {
-                propertyElement.ShouldContainPath("nullable").With(nullableProperty => nullableProperty.ValueKind.Should().Be(JsonValueKind.True));
+                propertyElement.ShouldContainPath("nullable").With(element => element.ValueKind.Should().Be(JsonValueKind.True));
             });
 
             propertiesElement.ShouldContainPath("hasProducedMilk").With(propertyElement =>
@@ -70,3 +69,4 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()
         });
     }
 }
+
diff --git a/test/OpenApiTests/SchemaProperties/SchemaPropertiesStartup.cs b/test/OpenApiTests/SchemaProperties/SchemaPropertiesStartup.cs

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public sealed class ApiException : Exception`
`15`	`15`
`16`	`16`	`public IReadOnlyDictionary<string, IEnumerable<string>> Headers { get; }`
`17`	`17`
`18`		`- public ApiException(string message, int statusCode, string? response, IReadOnlyDictionary<string, IEnumerable<string>> headers, Exception innerException)`
	`18`	`+ public ApiException(string message, int statusCode, string? response, IReadOnlyDictionary<string, IEnumerable<string>> headers, Exception? innerException)`
`19`	`19`	`: base($"{message}\n\nStatus: {statusCode}\nResponse: \n{response ?? "(null)"}", innerException)`
`20`	`20`	`{`
`21`	`21`	`StatusCode = statusCode;`
Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,6 @@ private OpenApiSchema CreateRelationshipSchema(Type relationshipSchemaType)`
`203`	`203`
`204`	`204`	`OpenApiSchema fullSchema = _schemaRepositoryAccessor.Current.Schemas[referenceSchema.Reference.Id];`
`205`	`205`
`206`		`- Console.WriteLine(relationshipSchemaType.FullName);`
`207`		`-`
`208`	`206`	`if (IsDataPropertyNullableInRelationshipSchemaType(relationshipSchemaType))`
`209`	`207`	`{`
`210`	`208`	`fullSchema.Properties[JsonApiObjectPropertyName.Data] =`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace OpenApiTests;`
`8`	`8`
`9`		`-public abstract class OpenApiStartup<TDbContext> : TestableStartup<TDbContext>`
	`9`	`+public class OpenApiStartup<TDbContext> : TestableStartup<TDbContext>`
`10`	`10`	`where TDbContext : TestableDbContext`
`11`	`11`	`{`
`12`	`12`	`public override void ConfigureServices(IServiceCollection services)`
`@@ -26,3 +26,4 @@ public override void Configure(IApplicationBuilder app)`
`26`	`26`	`app.UseEndpoints(endpoints => endpoints.MapControllers());`
`27`	`27`	`}`
`28`	`28`	`}`
	`29`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Text.Json.Serialization;`
`2`	`1`	`using JetBrains.Annotations;`
`3`	`2`	`using JsonApiDotNetCore.Configuration;`
`4`	`3`	`using TestBuildingBlocks;`
`@@ -13,7 +12,7 @@ protected override void SetJsonApiOptions(JsonApiOptions options)`
`13`	`12`	`{`
`14`	`13`	`base.SetJsonApiOptions(options);`
`15`	`14`
`16`		`- options.SerializerOptions.Converters.Add(new JsonStringEnumConverter());`
`17`	`15`	`options.ValidateModelState = false;`
`18`	`16`	`}`
`19`	`17`	`}`
	`18`	`+`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,12 @@ public ModelStateValidationDisabledTests(`
`15`	`15`	`OpenApiTestContext<ModelStateValidationDisabledStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)`
`16`	`16`	`{`
`17`	`17`	`_testContext = testContext;`
	`18`	`+`
`18`	`19`	`testContext.UseController<ChickensController>();`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`[Fact]`
`22`		`- public async Task Resource_when_ModelStateValidation_is_disabled_produces_expected_required_property_in_schema()`
	`23`	`+ public async Task Produces_expected_required_property_in_schema_for_resource()`
`23`	`24`	`{`
`24`	`25`	`// Act`
`25`	`26`	`JsonElement document = await _testContext.GetSwaggerDocumentAsync();`
`@@ -28,13 +29,12 @@ public async Task Resource_when_ModelStateValidation_is_disabled_produces_expect`
`28`	`29`	`document.ShouldContainPath("components.schemas.chickenAttributesInPostRequest.required").With(requiredElement =>`
`29`	`30`	`{`
`30`	`31`	`var requiredAttributes = JsonSerializer.Deserialize<List<string>>(requiredElement.GetRawText());`
`31`		`- requiredAttributes.ShouldNotBeNull();`
	`32`	`+ requiredAttributes.ShouldHaveCount(3);`
`32`	`33`
`33`	`34`	`requiredAttributes.Should().Contain("nameOfCurrentFarm");`
`34`	`35`	`requiredAttributes.Should().Contain("weight");`
`35`	`36`	`requiredAttributes.Should().Contain("hasProducedEggs");`
`36`		`-`
`37`		`- requiredAttributes.ShouldHaveCount(3);`
`38`	`37`	`});`
`39`	`38`	`}`
`40`	`39`	`}`
	`40`	`+`
Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,20 @@`
`6`	`6`	`namespace OpenApiTests.SchemaProperties.NullableReferenceTypesDisabled;`
`7`	`7`
`8`	`8`	`public sealed class ModelStateValidationEnabledTests`
`9`		`- : IClassFixture<OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext>>`
	`9`	`+ : IClassFixture<OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext>>`
`10`	`10`	`{`
`11`		`- private readonly OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> _testContext;`
	`11`	`+ private readonly OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> _testContext;`
`12`	`12`
`13`	`13`	`public ModelStateValidationEnabledTests(`
`14`		`- OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)`
	`14`	`+ OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)`
`15`	`15`	`{`
`16`	`16`	`_testContext = testContext;`
`17`	`17`
`18`	`18`	`testContext.UseController<ChickensController>();`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`[Fact]`
`22`		`- public async Task Resource_when_ModelStateValidation_is_enabled_produces_expected_required_property_in_schema()`
	`22`	`+ public async Task Produces_expected_required_property_in_schema_for_resource()`
`23`	`23`	`{`
`24`	`24`	`// Act`
`25`	`25`	`JsonElement document = await _testContext.GetSwaggerDocumentAsync();`
`@@ -28,13 +28,12 @@ public async Task Resource_when_ModelStateValidation_is_enabled_produces_expecte`
`28`	`28`	`document.ShouldContainPath("components.schemas.chickenAttributesInPostRequest.required").With(requiredElement =>`
`29`	`29`	`{`
`30`	`30`	`var requiredAttributes = JsonSerializer.Deserialize<List<string>>(requiredElement.GetRawText());`
`31`		`- requiredAttributes.ShouldNotBeNull();`
	`31`	`+ requiredAttributes.ShouldHaveCount(3);`
`32`	`32`
`33`	`33`	`requiredAttributes.Should().Contain("nameOfCurrentFarm");`
`34`	`34`	`requiredAttributes.Should().Contain("weight");`
`35`	`35`	`requiredAttributes.Should().Contain("hasProducedEggs");`
`36`		`-`
`37`		`- requiredAttributes.ShouldHaveCount(3);`
`38`	`36`	`});`
`39`	`37`	`}`
`40`	`38`	`}`
	`39`	`+`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,11 @@`
`6`	`6`	`namespace OpenApiTests.SchemaProperties.NullableReferenceTypesDisabled;`
`7`	`7`
`8`	`8`	`public sealed class NullabilityTests`
`9`		`- : IClassFixture<OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext>>`
	`9`	`+ : IClassFixture<OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext>>`
`10`	`10`	`{`
`11`		`- private readonly OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> _testContext;`
	`11`	`+ private readonly OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> _testContext;`
`12`	`12`
`13`		`- public NullabilityTests(`
`14`		`- OpenApiTestContext<SchemaPropertiesStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)`
	`13`	`+ public NullabilityTests(OpenApiTestContext<OpenApiStartup<NullableReferenceTypesDisabledDbContext>, NullableReferenceTypesDisabledDbContext> testContext)`
`15`	`14`	`{`
`16`	`15`	`_testContext = testContext;`
`17`	`16`
`@@ -20,7 +19,7 @@ public NullabilityTests(`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`[Fact]`
`23`		`- public async Task Resource_produces_expected_nullable_properties_in_schema()`
	`22`	`+ public async Task Produces_expected_nullable_properties_in_schema_for_resource()`
`24`	`23`	`{`
`25`	`24`	`// Act`
`26`	`25`	`JsonElement document = await _testContext.GetSwaggerDocumentAsync();`
`@@ -30,7 +29,7 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()`
`30`	`29`	`{`
`31`	`30`	`propertiesElement.ShouldContainPath("name").With(propertyElement =>`
`32`	`31`	`{`
`33`		`- propertyElement.ShouldContainPath("nullable").With(nullableProperty => nullableProperty.ValueKind.Should().Be(JsonValueKind.True));`
	`32`	`+ propertyElement.ShouldContainPath("nullable").With(element => element.ValueKind.Should().Be(JsonValueKind.True));`
`34`	`33`	`});`
`35`	`34`
`36`	`35`	`propertiesElement.ShouldContainPath("nameOfCurrentFarm").With(propertyElement =>`
`@@ -50,7 +49,7 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()`
`50`	`49`
`51`	`50`	`propertiesElement.ShouldContainPath("timeAtCurrentFarmInDays").With(propertyElement =>`
`52`	`51`	`{`
`53`		`- propertyElement.ShouldContainPath("nullable").With(nullableProperty => nullableProperty.ValueKind.Should().Be(JsonValueKind.True));`
	`52`	`+ propertyElement.ShouldContainPath("nullable").With(element => element.ValueKind.Should().Be(JsonValueKind.True));`
`54`	`53`	`});`
`55`	`54`
`56`	`55`	`propertiesElement.ShouldContainPath("hasProducedEggs").With(propertyElement =>`
`@@ -60,3 +59,4 @@ public async Task Resource_produces_expected_nullable_properties_in_schema()`
`60`	`59`	`});`
`61`	`60`	`}`
`62`	`61`	`}`
	`62`	`+`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public ModelStateValidationDisabledTests(`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[Fact]`
`23`		`- public async Task Resource_when_ModelStateValidation_is_disabled_produces_expected_required_property_in_schema()`
	`23`	`+ public async Task Produces_expected_required_property_in_schema_for_resource()`
`24`	`24`	`{`
`25`	`25`	`// Act`
`26`	`26`	`JsonElement document = await _testContext.GetSwaggerDocumentAsync();`
`@@ -29,14 +29,13 @@ public async Task Resource_when_ModelStateValidation_is_disabled_produces_expect`
`29`	`29`	`document.ShouldContainPath("components.schemas.cowAttributesInPostRequest.required").With(requiredElement =>`
`30`	`30`	`{`
`31`	`31`	`var requiredAttributes = JsonSerializer.Deserialize<List<string>>(requiredElement.GetRawText());`
`32`		`- requiredAttributes.ShouldNotBeNull();`
	`32`	`+ requiredAttributes.ShouldHaveCount(4);`
`33`	`33`
`34`	`34`	`requiredAttributes.Should().Contain("nameOfCurrentFarm");`
`35`	`35`	`requiredAttributes.Should().Contain("nickname");`
`36`	`36`	`requiredAttributes.Should().Contain("weight");`
`37`	`37`	`requiredAttributes.Should().Contain("hasProducedMilk");`
`38`		`-`
`39`		`- requiredAttributes.ShouldHaveCount(4);`
`40`	`38`	`});`
`41`	`39`	`}`
`42`	`40`	`}`
	`41`	`+`