squash

Author: maurei

src/JsonApiDotNetCore.OpenApi.Client/ApiException.cs

@@ -3,7 +3,7 @@
 using JetBrains.Annotations;
 
 // ReSharper disable once CheckNamespace
-namespace OpenApiClientTests.Exceptions
+namespace JsonApiDotNetCore.OpenApi.Client.Exceptions
 {
     // We cannot rely on a generated ApiException as soon as we are generating multiple clients, see https://github.com/RicoSuter/NSwag/issues/2839#issuecomment-776647377.
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]

test/OpenApiClientTests/LegacyClient/ApiResponse.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.OpenApi.Client;
-using OpenApiClientTests.Exceptions;
+using JsonApiDotNetCore.OpenApi.Client.Exceptions;
 
 #pragma warning disable AV1008 // Class should not be static
 

test/OpenApiClientTests/LegacyClient/ResponseTests.cs

@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Specialized;
-using OpenApiClientTests.Exceptions;
+using JsonApiDotNetCore.OpenApi.Client.Exceptions;
 using OpenApiClientTests.LegacyClient.GeneratedCode;
 using Xunit;
 

test/OpenApiClientTests/NamingConvention/KebabCase/KebabCaseRoundTripTests.cs

@@ -0,0 +1,28 @@
+using System;
+using Bogus;
+using OpenApiTests.NamingConventions;
+using TestBuildingBlocks;
+
+// @formatter:wrap_chained_method_calls chop_always
+// @formatter:keep_existing_linebreaks true
+
+namespace OpenApiClientTests.NamingConventions.KebabCase
+{
+    internal sealed class NamingConventionFakers : FakerContainer
+    {
+        private readonly Lazy<Faker<Supermarket>> _lazySupermarketFaker =
+            new(() => new Faker<Supermarket>()
+                .UseSeed(GetFakerSeed())
+                .RuleFor(supermarket => supermarket.NameOfCity, faker => faker.Address.City())
+                .RuleFor(supermarket => supermarket.Kind, faker => faker.PickRandom<SupermarketType>()));
+
+        private readonly Lazy<Faker<StaffMember>> _lazyStaffMemberFaker =
+            new(() => new Faker<StaffMember>()
+                .UseSeed(GetFakerSeed())
+                .RuleFor(staffMember => staffMember.Name, faker => faker.Address.City())
+                .RuleFor(staffMember => staffMember.Age, faker => faker.PickRandom<int>()));
+
+        public Faker<Supermarket> Supermarket => _lazySupermarketFaker.Value;
+        public Faker<StaffMember> StaffMember => _lazyStaffMemberFaker.Value;
+    }
+}

test/OpenApiClientTests/NamingConvention/KebabCase/NamingConventionFakers.cs

@@ -38,8 +38,8 @@
   </ItemGroup>
 
     <ItemGroup>
-        <OpenApiReference Include="..\OpenApiTests\NamingConvention\KebabCase\swagger.json">
-            <Namespace>OpenApiClientTests.NamingConvention.KebabCase.GeneratedCode</Namespace>
+        <OpenApiReference Include="..\OpenApiTests\NamingConventions\KebabCase\swagger.json">
+            <Namespace>OpenApiClientTests.NamingConventions.KebabCase.GeneratedCode</Namespace>
             <ClassName>KebabCaseClient</ClassName>
             <OutputPath>KebabCaseClient.cs</OutputPath>
             <CodeGenerator>NSwagCSharp</CodeGenerator>

test/OpenApiClientTests/NamingConventions/KebabCase/NamingConventionFakers.cs

@@ -19,7 +19,6 @@ public LegacyOpenApiIntegrationTests()
             UseController<FlightAttendantsController>();
         }
 
-        // TODO: This test fails when all tests are openapi tests run in parallel; something isn't going right with the fixtures.
         [Fact]
         public async Task Retrieved_document_matches_expected_document()
         {