From a0d863f36241316f30dac6fb96fdddcbb8ac3129 Mon Sep 17 00:00:00 2001
From: Maurits Moeys <maurits.moeys@gmail.com>
Date: Thu, 15 Dec 2022 10:17:15 +0100
Subject: [PATCH] Remove xunit config file and call base OnModelCreating in
 OpenApiTests DbContext.

---
 test/OpenApiClientTests/OpenApiClientTests.csproj           | 6 ------
 test/OpenApiClientTests/xunit.runner.json                   | 5 -----
 .../LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs  | 2 ++
 test/OpenApiTests/OpenApiTests.csproj                       | 6 ------
 test/OpenApiTests/xunit.runner.json                         | 5 -----
 5 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 test/OpenApiClientTests/xunit.runner.json
 delete mode 100644 test/OpenApiTests/xunit.runner.json

diff --git a/test/OpenApiClientTests/OpenApiClientTests.csproj b/test/OpenApiClientTests/OpenApiClientTests.csproj
index 41e6fe07e1..4d7bf979ec 100644
--- a/test/OpenApiClientTests/OpenApiClientTests.csproj
+++ b/test/OpenApiClientTests/OpenApiClientTests.csproj
@@ -3,12 +3,6 @@
     <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj" />
     <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
diff --git a/test/OpenApiClientTests/xunit.runner.json b/test/OpenApiClientTests/xunit.runner.json
deleted file mode 100644
index 8f5f10571b..0000000000
--- a/test/OpenApiClientTests/xunit.runner.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "parallelizeAssembly": false,
-  "parallelizeTestCollections": false,
-  "maxParallelThreads": 1
-}
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs
index 16ee8bcdaf..d3f9672416 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs
@@ -32,5 +32,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         builder.Entity<Flight>()
             .HasOne(flight => flight.BackupPurser)
             .WithMany();
+
+        base.OnModelCreating(builder);
     }
 }
diff --git a/test/OpenApiTests/OpenApiTests.csproj b/test/OpenApiTests/OpenApiTests.csproj
index 50b96c1d36..d6cb1d3002 100644
--- a/test/OpenApiTests/OpenApiTests.csproj
+++ b/test/OpenApiTests/OpenApiTests.csproj
@@ -3,12 +3,6 @@
     <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Update="xunit.runner.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="LegacyOpenApiIntegration\swagger.json" />
   </ItemGroup>
diff --git a/test/OpenApiTests/xunit.runner.json b/test/OpenApiTests/xunit.runner.json
deleted file mode 100644
index 8f5f10571b..0000000000
--- a/test/OpenApiTests/xunit.runner.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "parallelizeAssembly": false,
-  "parallelizeTestCollections": false,
-  "maxParallelThreads": 1
-}