Organise tests such that they map directly to the tables in #1231 and #…

…1111

Organise tests such that they map directly to the tables in #1231 and #1111

appveyor.yml

@@ -14,7 +14,6 @@ environment:
 
 branches:
   only:
-  - openapi-required-and-nullable-properties # TODO: remove
   - master
   - openapi
   - develop

test/OpenApiClientTests/FakeHttpClientWrapper.cs

@@ -1,6 +1,7 @@
 using System.Net;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Text.Json;
 using JsonApiDotNetCore.OpenApi.Client;
 
 namespace OpenApiClientTests;
@@ -22,6 +23,17 @@ private FakeHttpClientWrapper(HttpClient httpClient, FakeHttpMessageHandler hand
         _handler = handler;
     }
 
+    public JsonElement ParseRequestBody()
+    {
+        if (RequestBody == null)
+        {
+            throw new InvalidOperationException();
+        }
+
+        using JsonDocument jsonDocument = JsonDocument.Parse(RequestBody);
+        return jsonDocument.RootElement.Clone();
+    }
+
     public static FakeHttpClientWrapper Create(HttpStatusCode statusCode, string? responseBody)
     {
         HttpResponseMessage response = CreateResponse(statusCode, responseBody);

test/OpenApiClientTests/OpenApiClientTests.csproj

@@ -52,15 +52,15 @@
       <CodeGenerator>NSwagCSharp</CodeGenerator>
       <Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions</Options>
     </OpenApiReference>
-    <OpenApiReference Include="SchemaProperties\NullableReferenceTypesEnabled\swagger.g.json">
-      <Namespace>OpenApiClientTests.SchemaProperties.NullableReferenceTypesEnabled.GeneratedCode</Namespace>
+    <OpenApiReference Include="ResourceFieldsValidation\NullableReferenceTypesEnabled\swagger.g.json">
+      <Namespace>OpenApiClientTests.ResourceFieldsValidation.NullableReferenceTypesEnabled.GeneratedCode</Namespace>
       <ClassName>NullableReferenceTypesEnabledClient</ClassName>
       <OutputPath>NullableReferenceTypesEnabledClient.cs</OutputPath>
       <CodeGenerator>NSwagCSharp</CodeGenerator>
       <Options>/UseBaseUrl:false /ClientClassAccessModifier:internal /GenerateExceptionClasses:false /AdditionalNamespaceUsages:JsonApiDotNetCore.OpenApi.Client.Exceptions /GenerateNullableReferenceTypes:true</Options>
     </OpenApiReference>
-    <OpenApiReference Include="SchemaProperties\NullableReferenceTypesDisabled\swagger.g.json">
-      <Namespace>OpenApiClientTests.SchemaProperties.NullableReferenceTypesDisabled.GeneratedCode</Namespace>
+    <OpenApiReference Include="ResourceFieldsValidation\NullableReferenceTypesDisabled\swagger.g.json">
+      <Namespace>OpenApiClientTests.ResourceFieldsValidation.NullableReferenceTypesDisabled.GeneratedCode</Namespace>
       <ClassName>NullableReferenceTypesDisabledClient</ClassName>
       <OutputPath>NullableReferenceTypesDisabledClient.cs</OutputPath>
       <CodeGenerator>NSwagCSharp</CodeGenerator>

test/OpenApiClientTests/SchemaProperties/NullableReferenceTypesDisabled/GeneratedCode/NullableReferenceTypesDisabledClient.cs → test/OpenApiClientTests/ResourceFieldsValidation/NullableReferenceTypesDisabled/GeneratedCode/NullableReferenceTypesDisabledClient.cs

@@ -1,7 +1,7 @@
 using JsonApiDotNetCore.OpenApi.Client;
 using Newtonsoft.Json;
 
-namespace OpenApiClientTests.SchemaProperties.NullableReferenceTypesDisabled.GeneratedCode;
+namespace OpenApiClientTests.ResourceFieldsValidation.NullableReferenceTypesDisabled.GeneratedCode;
 
 internal partial class NullableReferenceTypesDisabledClient : JsonApiClient
 {

test/OpenApiClientTests/SchemaProperties/NullableReferenceTypesDisabled/NullabilityTests.cs → test/OpenApiClientTests/ResourceFieldsValidation/NullableReferenceTypesDisabled/NullabilityTests.cs

@@ -1,9 +1,9 @@
 using System.Reflection;
 using FluentAssertions;
-using OpenApiClientTests.SchemaProperties.NullableReferenceTypesDisabled.GeneratedCode;
+using OpenApiClientTests.ResourceFieldsValidation.NullableReferenceTypesDisabled.GeneratedCode;
 using Xunit;
 
-namespace OpenApiClientTests.SchemaProperties.NullableReferenceTypesDisabled;
+namespace OpenApiClientTests.ResourceFieldsValidation.NullableReferenceTypesDisabled;
 
 public sealed class NullabilityTests
 {

test/OpenApiClientTests/ResourceFieldsValidation/NullableReferenceTypesDisabled/NullableReferenceTypesDisabledFaker.cs

@@ -0,0 +1,124 @@
+using Bogus;
+using OpenApiClientTests.ResourceFieldsValidation.NullableReferenceTypesDisabled.GeneratedCode;
+
+namespace OpenApiClientTests.ResourceFieldsValidation.NullableReferenceTypesDisabled;
+
+// @formatter:wrap_chained_method_calls chop_always
+// @formatter:keep_existing_linebreaks true
+
+internal sealed class NullableReferenceTypesDisabledFaker
+{
+    private readonly Lazy<Faker<HenHousePostRequestDocument>> _lazyHenHousePostRequestDocumentFaker;
+    private readonly Lazy<Faker<HenHousePatchRequestDocument>> _lazyHenHousePatchRequestDocumentFaker;
+
+    private readonly Lazy<Faker<ChickenPostRequestDocument>> _lazyChickenPostRequestDocumentFaker = new(() =>
+    {
+        Faker<ChickenAttributesInPostRequest> attributesInPostRequestFaker = new Faker<ChickenAttributesInPostRequest>()
+            .RuleFor(attributes => attributes.Name, faker => faker.Name.FirstName())
+            .RuleFor(attributes => attributes.NameOfCurrentFarm, faker => faker.Company.CompanyName())
+            .RuleFor(attributes => attributes.Age, faker => faker.Random.Int(1, 20))
+            .RuleFor(attributes => attributes.Weight, faker => faker.Random.Int(20, 50))
+            .RuleFor(attributes => attributes.TimeAtCurrentFarmInDays, faker => faker.Random.Int(1, 356))
+            .RuleFor(attributes => attributes.HasProducedEggs, _ => true);
+
+        Faker<ChickenDataInPostRequest> dataInPostRequestFaker = new Faker<ChickenDataInPostRequest>()
+            .RuleFor(data => data.Attributes, _ => attributesInPostRequestFaker.Generate());
+
+        return new Faker<ChickenPostRequestDocument>()
+            .RuleFor(document => document.Data, _ => dataInPostRequestFaker.Generate());
+    });
+
+    private readonly Lazy<Faker<ChickenPatchRequestDocument>> _lazyChickenPatchRequestDocumentFaker = new(() =>
+    {
+        Faker<ChickenAttributesInPatchRequest> attributesInPatchRequestFaker = new Faker<ChickenAttributesInPatchRequest>()
+            .RuleFor(attributes => attributes.Name, faker => faker.Name.FirstName())
+            .RuleFor(attributes => attributes.NameOfCurrentFarm, faker => faker.Company.CompanyName())
+            .RuleFor(attributes => attributes.Age, faker => faker.Random.Int(1, 20))
+            .RuleFor(attributes => attributes.Weight, faker => faker.Random.Int(20, 50))
+            .RuleFor(attributes => attributes.TimeAtCurrentFarmInDays, faker => faker.Random.Int(1, 356))
+            .RuleFor(attributes => attributes.HasProducedEggs, _ => true);
+
+        Faker<ChickenDataInPatchRequest> dataInPatchRequestFaker = new Faker<ChickenDataInPatchRequest>()
+            // @formatter:wrap_chained_method_calls chop_if_long
+            .RuleFor(data => data.Id, faker => faker.Random.Int(1, 100).ToString())
+            // @formatter:wrap_chained_method_calls restore
+            .RuleFor(data => data.Attributes, _ => attributesInPatchRequestFaker.Generate());
+
+        return new Faker<ChickenPatchRequestDocument>()
+            .RuleFor(document => document.Data, _ => dataInPatchRequestFaker.Generate());
+    });
+
+    private readonly Lazy<Faker<ToOneChickenInRequest>> _lazyToOneChickenInRequestFaker = new(() =>
+        new Faker<ToOneChickenInRequest>()
+            .RuleFor(relationship => relationship.Data, faker => new ChickenIdentifier
+            {
+                // @formatter:wrap_chained_method_calls chop_if_long
+                Id = faker.Random.Int(1, 100).ToString()
+                // @formatter:wrap_chained_method_calls restore
+            }));
+
+    private readonly Lazy<Faker<NullableToOneChickenInRequest>> _lazyNullableToOneChickenInRequestFaker = new(() =>
+        new Faker<NullableToOneChickenInRequest>()
+            .RuleFor(relationship => relationship.Data, faker => new ChickenIdentifier
+            {
+                // @formatter:wrap_chained_method_calls chop_if_long
+                Id = faker.Random.Int(1, 100).ToString()
+                // @formatter:wrap_chained_method_calls restore
+            }));
+
+    private readonly Lazy<Faker<ToManyChickenInRequest>> _lazyToManyChickenInRequestFaker = new(() =>
+        new Faker<ToManyChickenInRequest>()
+            .RuleFor(relationship => relationship.Data, faker => new List<ChickenIdentifier>
+            {
+                new()
+                {
+                    // @formatter:wrap_chained_method_calls chop_if_long
+                    Id = faker.Random.Int(1, 100).ToString()
+                    // @formatter:wrap_chained_method_calls restore
+                }
+            }));
+
+    public Faker<ChickenPostRequestDocument> ChickenPostRequestDocument => _lazyChickenPostRequestDocumentFaker.Value;
+    public Faker<ChickenPatchRequestDocument> ChickenPatchRequestDocument => _lazyChickenPatchRequestDocumentFaker.Value;
+    public Faker<HenHousePostRequestDocument> HenHousePostRequestDocument => _lazyHenHousePostRequestDocumentFaker.Value;
+    public Faker<HenHousePatchRequestDocument> HenHousePatchRequestDocument => _lazyHenHousePatchRequestDocumentFaker.Value;
+
+    public NullableReferenceTypesDisabledFaker()
+    {
+        _lazyHenHousePostRequestDocumentFaker = new Lazy<Faker<HenHousePostRequestDocument>>(HenHousePostRequestDocumentFakerFactory);
+        _lazyHenHousePatchRequestDocumentFaker = new Lazy<Faker<HenHousePatchRequestDocument>>(HenHousePatchRequestDocumentFakerFactory);
+    }
+
+    private Faker<HenHousePostRequestDocument> HenHousePostRequestDocumentFakerFactory()
+    {
+        Faker<HenHouseRelationshipsInPostRequest> relationshipsInPostRequestFaker = new Faker<HenHouseRelationshipsInPostRequest>()
+            .RuleFor(relationships => relationships.OldestChicken, _ => _lazyNullableToOneChickenInRequestFaker.Value.Generate())
+            .RuleFor(relationships => relationships.FirstChicken, _ => _lazyToOneChickenInRequestFaker.Value.Generate())
+            .RuleFor(relationships => relationships.ChickensReadyForLaying, _ => _lazyToManyChickenInRequestFaker.Value.Generate())
+            .RuleFor(relationships => relationships.AllChickens, _ => _lazyToManyChickenInRequestFaker.Value.Generate());
+
+        Faker<HenHouseDataInPostRequest> dataInPostRequestFaker = new Faker<HenHouseDataInPostRequest>()
+            .RuleFor(data => data.Relationships, _ => relationshipsInPostRequestFaker.Generate());
+
+        return new Faker<HenHousePostRequestDocument>()
+            .RuleFor(document => document.Data, _ => dataInPostRequestFaker.Generate());
+    }
+
+    private Faker<HenHousePatchRequestDocument> HenHousePatchRequestDocumentFakerFactory()
+    {
+        Faker<HenHouseRelationshipsInPatchRequest> relationshipsInPatchRequestFaker = new Faker<HenHouseRelationshipsInPatchRequest>()
+            .RuleFor(relationships => relationships.OldestChicken, _ => _lazyNullableToOneChickenInRequestFaker.Value.Generate())
+            .RuleFor(relationships => relationships.FirstChicken, _ => _lazyToOneChickenInRequestFaker.Value.Generate())
+            .RuleFor(relationships => relationships.ChickensReadyForLaying, _ => _lazyToManyChickenInRequestFaker.Value.Generate())
+            .RuleFor(relationships => relationships.AllChickens, _ => _lazyToManyChickenInRequestFaker.Value.Generate());
+
+        Faker<HenHouseDataInPatchRequest> dataInPatchRequestFaker = new Faker<HenHouseDataInPatchRequest>()
+            // @formatter:wrap_chained_method_calls chop_if_long
+            .RuleFor(data => data.Id, faker => faker.Random.Int(1, 100).ToString())
+            // @formatter:wrap_chained_method_calls restore
+            .RuleFor(data => data.Relationships, _ => relationshipsInPatchRequestFaker.Generate());
+
+        return new Faker<HenHousePatchRequestDocument>()
+            .RuleFor(document => document.Data, _ => dataInPatchRequestFaker.Generate());
+    }
+}