Review feedback: NullabilityTests

Author: maurei

test/OpenApiClientTests/PropertyInfoAssertionsExtension.cs

@@ -7,24 +7,14 @@ namespace OpenApiClientTests;
 internal static class PropertyInfoAssertionsExtensions
 {
     [CustomAssertion]
-    public static void BeNullable(this PropertyInfoAssertions source, string because = "", params object[] becauseArgs)
+    public static void HaveNullabilityState(this PropertyInfoAssertions source, NullabilityState expected, string because = "", params object[] becauseArgs)
     {
         PropertyInfo propertyInfo = source.Subject;
 
         NullabilityInfoContext nullabilityContext = new();
         NullabilityInfo nullabilityInfo = nullabilityContext.Create(propertyInfo);
 
-        nullabilityInfo.ReadState.Should().NotBe(NullabilityState.NotNull, because, becauseArgs);
-    }
-
-    [CustomAssertion]
-    public static void BeNonNullable(this PropertyInfoAssertions source, string because = "", params object[] becauseArgs)
-    {
-        PropertyInfo propertyInfo = source.Subject;
-
-        NullabilityInfoContext nullabilityContext = new();
-        NullabilityInfo nullabilityInfo = nullabilityContext.Create(propertyInfo);
-
-        nullabilityInfo.ReadState.Should().Be(NullabilityState.NotNull, because, becauseArgs);
+        nullabilityInfo.ReadState.Should().Be(expected, because, becauseArgs);
+        nullabilityInfo.WriteState.Should().Be(expected, because, becauseArgs);
     }
 }

test/OpenApiClientTests/SchemaProperties/NullableReferenceTypesDisabled/NullabilityTests.cs

@@ -7,21 +7,17 @@ namespace OpenApiClientTests.SchemaProperties.NullableReferenceTypesDisabled;
 
 public sealed class NullabilityTests
 {
-    [Fact]
-    public void Nullability_of_generated_types_is_as_expected()
+    [Theory]
+    [InlineData(nameof(ChickenAttributesInResponse.Name), NullabilityState.Unknown)]
+    [InlineData(nameof(ChickenAttributesInResponse.NameOfCurrentFarm), NullabilityState.Unknown)]
+    [InlineData(nameof(ChickenAttributesInResponse.Age), NullabilityState.NotNull)]
+    [InlineData(nameof(ChickenAttributesInResponse.Weight), NullabilityState.NotNull)]
+    [InlineData(nameof(ChickenAttributesInResponse.TimeAtCurrentFarmInDays), NullabilityState.Nullable)]
+    [InlineData(nameof(ChickenAttributesInResponse.HasProducedEggs), NullabilityState.NotNull)]
+    public void Nullability_of_generated_property_is_as_expected(string propertyName, NullabilityState expectedState)
     {
-        PropertyInfo[] propertyInfos = typeof(ChickenAttributesInResponse).GetProperties();
-
-        PropertyInfo? propertyInfo = propertyInfos.FirstOrDefault(property => property.Name == nameof(ChickenAttributesInResponse.Name));
-        propertyInfo.Should().BeNullable();
-
-        propertyInfo = propertyInfos.FirstOrDefault(property => property.Name == nameof(ChickenAttributesInResponse.NameOfCurrentFarm));
-        propertyInfo.Should().BeNullable();
-
-        propertyInfo = propertyInfos.FirstOrDefault(property => property.Name == nameof(ChickenAttributesInResponse.Age));
-        propertyInfo.Should().BeNonNullable();
-
-        propertyInfo = propertyInfos.FirstOrDefault(property => property.Name == nameof(ChickenAttributesInResponse.TimeAtCurrentFarmInDays));
-        propertyInfo.Should().BeNullable();
+        PropertyInfo[] properties = typeof(ChickenAttributesInResponse).GetProperties();
+        PropertyInfo property = properties.Single(property => property.Name == propertyName);
+        property.Should().HaveNullabilityState(expectedState);
     }
 }

test/OpenApiClientTests/SchemaProperties/NullableReferenceTypesEnabled/NullabilityTests.cs

@@ -7,21 +7,19 @@ namespace OpenApiClientTests.SchemaProperties.NullableReferenceTypesEnabled;
 
 public sealed class NullabilityTests
 {
-    [Fact]
-    public void Nullability_of_generated_types_is_as_expected()
+    [Theory]
+    [InlineData(nameof(CowAttributesInResponse.Name), NullabilityState.NotNull)]
+    [InlineData(nameof(CowAttributesInResponse.NameOfCurrentFarm), NullabilityState.NotNull)]
+    [InlineData(nameof(CowAttributesInResponse.NameOfPreviousFarm), NullabilityState.Nullable)]
+    [InlineData(nameof(CowAttributesInResponse.Nickname), NullabilityState.NotNull)]
+    [InlineData(nameof(CowAttributesInResponse.Age), NullabilityState.NotNull)]
+    [InlineData(nameof(CowAttributesInResponse.Weight), NullabilityState.NotNull)]
+    [InlineData(nameof(CowAttributesInResponse.TimeAtCurrentFarmInDays), NullabilityState.Nullable)]
+    [InlineData(nameof(CowAttributesInResponse.HasProducedMilk), NullabilityState.NotNull)]
+    public void Nullability_of_generated_property_is_as_expected(string propertyName, NullabilityState expectedState)
     {
-        PropertyInfo[] propertyInfos = typeof(CowAttributesInResponse).GetProperties();
-
-        PropertyInfo? propertyInfo = propertyInfos.FirstOrDefault(property => property.Name == nameof(CowAttributesInResponse.Name));
-        propertyInfo.Should().BeNonNullable();
-
-        propertyInfo = propertyInfos.FirstOrDefault(property => property.Name == nameof(CowAttributesInResponse.NameOfPreviousFarm));
-        propertyInfo.Should().BeNullable();
-
-        propertyInfo = propertyInfos.FirstOrDefault(property => property.Name == nameof(CowAttributesInResponse.Age));
-        propertyInfo.Should().BeNonNullable();
-
-        propertyInfo = propertyInfos.FirstOrDefault(property => property.Name == nameof(CowAttributesInResponse.TimeAtCurrentFarmInDays));
-        propertyInfo.Should().BeNullable();
+        PropertyInfo[] properties = typeof(CowAttributesInResponse).GetProperties();
+        PropertyInfo property = properties.Single(property => property.Name == propertyName);
+        property.Should().HaveNullabilityState(expectedState);
     }
 }