diff --git a/JsonApiDotNetCore.sln b/JsonApiDotNetCore.sln index 286d2bc8f0..e5e97193c2 100644 --- a/JsonApiDotNetCore.sln +++ b/JsonApiDotNetCore.sln @@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GettingStarted", "src\Examples\GettingStarted\GettingStarted.csproj", "{067FFD7A-C66B-473D-8471-37F5C95DF61C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCoreExampleTests", "test\JsonApiDotNetCoreTests\JsonApiDotNetCoreExampleTests.csproj", "{CAF331F8-9255-4D72-A1A8-A54141E99F1E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCoreTests", "test\JsonApiDotNetCoreTests\JsonApiDotNetCoreTests.csproj", "{CAF331F8-9255-4D72-A1A8-A54141E99F1E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoEntityFrameworkTests", "test\NoEntityFrameworkTests\NoEntityFrameworkTests.csproj", "{4F15A8F8-5BC6-45A1-BC51-03F921B726A4}" EndProject diff --git a/docs/usage/writing/bulk-batch-operations.md b/docs/usage/writing/bulk-batch-operations.md index bbf2db2ec2..549ff68025 100644 --- a/docs/usage/writing/bulk-batch-operations.md +++ b/docs/usage/writing/bulk-batch-operations.md @@ -81,7 +81,7 @@ Content-Type: application/vnd.api+json;ext="https://jsonapi.org/ext/atomic" } ``` -For example requests, see our suite of tests in JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations. +For example requests, see our suite of tests in JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations. ## Configuration diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/EmptyStartup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/EmptyStartup.cs deleted file mode 100644 index 04c3a3d551..0000000000 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/EmptyStartup.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace JsonApiDotNetCoreExample.Startups -{ - /// - /// Empty startup class, required for integration tests. Changes in ASP.NET Core 3 no longer allow Startup class to be defined in test projects. See - /// https://github.com/aspnet/AspNetCore/issues/15373. - /// - public abstract class EmptyStartup - { - public virtual void ConfigureServices(IServiceCollection services) - { - } - - // ReSharper disable once UnusedMemberInSuper.Global - // ReSharper disable once UnusedParameter.Global - public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory) - { - } - } -} diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs index 9a149ca9a3..d7c6a19e42 100644 --- a/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs +++ b/src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs @@ -14,7 +14,7 @@ namespace JsonApiDotNetCoreExample.Startups { - public sealed class Startup : EmptyStartup + public sealed class Startup { private readonly ICodeTimerSession _codeTimingSession; private readonly string _connectionString; @@ -29,7 +29,7 @@ public Startup(IConfiguration configuration) } // This method gets called by the runtime. Use this method to add services to the container. - public override void ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { using (CodeTimingSessionManager.Current.Measure("Configure other (startup)")) { @@ -63,7 +63,7 @@ public override void ConfigureServices(IServiceCollection services) } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory) { ILogger logger = loggerFactory.CreateLogger(); diff --git a/src/JsonApiDotNetCore/Properties/AssemblyInfo.cs b/src/JsonApiDotNetCore/Properties/AssemblyInfo.cs index 2c359f920d..e4f127b725 100644 --- a/src/JsonApiDotNetCore/Properties/AssemblyInfo.cs +++ b/src/JsonApiDotNetCore/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Benchmarks")] -[assembly: InternalsVisibleTo("JsonApiDotNetCoreExampleTests")] +[assembly: InternalsVisibleTo("JsonApiDotNetCoreTests")] [assembly: InternalsVisibleTo("UnitTests")] [assembly: InternalsVisibleTo("DiscoveryTests")] [assembly: InternalsVisibleTo("TestBuildingBlocks")] diff --git a/test/JsonApiDotNetCoreTests/ExampleIntegrationTestContext.cs b/test/JsonApiDotNetCoreTests/ExampleIntegrationTestContext.cs deleted file mode 100644 index 96c92656db..0000000000 --- a/test/JsonApiDotNetCoreTests/ExampleIntegrationTestContext.cs +++ /dev/null @@ -1,23 +0,0 @@ -using JetBrains.Annotations; -using JsonApiDotNetCoreExample.Startups; -using Microsoft.EntityFrameworkCore; -using TestBuildingBlocks; - -namespace JsonApiDotNetCoreExampleTests -{ - /// - /// A test context for tests that reference the JsonApiDotNetCoreExample project. - /// - /// - /// The server Startup class, which can be defined in the test project. - /// - /// - /// The EF Core database context, which can be defined in the test project. - /// - [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] - public sealed class ExampleIntegrationTestContext : BaseIntegrationTestContext - where TStartup : class - where TDbContext : DbContext - { - } -} diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs index cb1fe6f8b2..d1a77728ac 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs @@ -7,18 +7,17 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { - public sealed class ArchiveTests : IClassFixture, TelevisionDbContext>> + public sealed class ArchiveTests : IClassFixture, TelevisionDbContext>> { - private readonly ExampleIntegrationTestContext, TelevisionDbContext> _testContext; + private readonly IntegrationTestContext, TelevisionDbContext> _testContext; private readonly TelevisionFakers _fakers = new(); - public ArchiveTests(ExampleIntegrationTestContext, TelevisionDbContext> testContext) + public ArchiveTests(IntegrationTestContext, TelevisionDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs index d0d244681e..623a603b6b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class BroadcastComment : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs index e6d5e3d1b6..01780a1b50 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { public sealed class BroadcastCommentsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs index 97e3c3f4be..4713b956fa 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class TelevisionBroadcast : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs index 4e1b02cb3f..10eed91f1b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs @@ -15,7 +15,7 @@ using JsonApiDotNetCore.Serialization.Objects; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class TelevisionBroadcastDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs index cc6575523c..abcb32f36c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { public sealed class TelevisionBroadcastsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionDbContext.cs index 8bc71dea0d..9566f3b424 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class TelevisionDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs index 962abff6ab..84f7be5288 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { internal sealed class TelevisionFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs index 3d5c213d31..55ab73ffe3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class TelevisionNetwork : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs index f89eef1f92..0c4432b63d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { public sealed class TelevisionNetworksController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs index 8087ceff75..b0c8a711f4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class TelevisionStation : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs index 490778b789..7b98448441 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Archiving +namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving { public sealed class TelevisionStationsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs index 4fa22a0900..3651c80368 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs @@ -3,19 +3,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Controllers +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Controllers { public sealed class AtomicConstrainedOperationsControllerTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicConstrainedOperationsControllerTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicConstrainedOperationsControllerTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs index 55268c88c5..b4b45a4acb 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Controllers +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Controllers { [DisableRoutingConvention] [Route("/operations/musicTracks/create")] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs index 71fb5bce14..40aa6aef1b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs @@ -7,20 +7,18 @@ using FluentAssertions; using FluentAssertions.Extensions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Creating +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating { - public sealed class AtomicCreateResourceTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicCreateResourceTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicCreateResourceTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicCreateResourceTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs index 7a956a1b48..6a688dc325 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs @@ -5,22 +5,19 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Creating +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating { public sealed class AtomicCreateResourceWithClientGeneratedIdTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicCreateResourceWithClientGeneratedIdTests( - ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicCreateResourceWithClientGeneratedIdTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs index 28de3cd6f2..01168cf1c8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs @@ -5,22 +5,19 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Creating +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating { public sealed class AtomicCreateResourceWithToManyRelationshipTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicCreateResourceWithToManyRelationshipTests( - ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicCreateResourceWithToManyRelationshipTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs index 0af833382f..f00959d331 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs @@ -6,23 +6,20 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Creating +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating { public sealed class AtomicCreateResourceWithToOneRelationshipTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicCreateResourceWithToOneRelationshipTests( - ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicCreateResourceWithToOneRelationshipTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs index a8c6442063..53dd5ee603 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs @@ -6,20 +6,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Deleting +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Deleting { - public sealed class AtomicDeleteResourceTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicDeleteResourceTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicDeleteResourceTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicDeleteResourceTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs index e2f7a50840..7e1eefbad6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs @@ -7,7 +7,7 @@ using JsonApiDotNetCore.Resources; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { /// /// Used to simulate side effects that occur in the database while saving, typically caused by database triggers. diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs index 97af626686..c33b0b4301 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs @@ -4,22 +4,20 @@ using FluentAssertions; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Links { - public sealed class AtomicAbsoluteLinksTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicAbsoluteLinksTests : IClassFixture, OperationsDbContext>> { private const string HostPrefix = "http://localhost"; - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicAbsoluteLinksTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicAbsoluteLinksTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs index 6cd3b802c4..0a685efa7e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs @@ -5,21 +5,20 @@ using FluentAssertions; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Links { public sealed class AtomicRelativeLinksWithNamespaceTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; public AtomicRelativeLinksWithNamespaceTests( - ExampleIntegrationTestContext, OperationsDbContext> testContext) + IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LocalIds/AtomicLocalIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LocalIds/AtomicLocalIdTests.cs index 415fa2d36c..219d21a808 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LocalIds/AtomicLocalIdTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LocalIds/AtomicLocalIdTests.cs @@ -5,20 +5,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.LocalIds +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.LocalIds { - public sealed class AtomicLocalIdTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicLocalIdTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicLocalIdTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicLocalIdTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs index 380001f373..84b9a2c108 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Lyric : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LyricsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LyricsController.cs index c34c3de26c..12d83708d9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LyricsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LyricsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { public sealed class LyricsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs index d18a713ba7..8c6dc402ec 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs @@ -5,20 +5,18 @@ using FluentAssertions.Extensions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta { - public sealed class AtomicResourceMetaTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicResourceMetaTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicResourceMetaTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicResourceMetaTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMeta.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMeta.cs index 09a59d5507..c6fede0077 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMeta.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMeta.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using JsonApiDotNetCore.Serialization; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta { public sealed class AtomicResponseMeta : IResponseMeta { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMetaTests.cs index b533e730e5..41b1f43567 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMetaTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMetaTests.cs @@ -7,21 +7,19 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json.Linq; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta { - public sealed class AtomicResponseMetaTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicResponseMetaTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicResponseMetaTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicResponseMetaTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/MusicTrackMetaDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/MusicTrackMetaDefinition.cs index 822e614a95..b2b9ae37fc 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/MusicTrackMetaDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/MusicTrackMetaDefinition.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class MusicTrackMetaDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs index 23a48fb89a..28a0322e91 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class TextLanguageMetaDefinition : ImplicitlyChangingTextLanguageDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicRequestBodyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicRequestBodyTests.cs index 2ec7a73e9f..42e18e0ba4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicRequestBodyTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicRequestBodyTests.cs @@ -5,19 +5,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Mixed +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed { - public sealed class AtomicRequestBodyTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicRequestBodyTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; - public AtomicRequestBodyTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicRequestBodyTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicSerializationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicSerializationTests.cs index 39806aee32..a47557ab7d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicSerializationTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicSerializationTests.cs @@ -4,20 +4,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Mixed +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed { - public sealed class AtomicSerializationTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicSerializationTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicSerializationTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicSerializationTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs index fcc49f7c2e..a48c2424cd 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs @@ -5,20 +5,17 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Mixed +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed { - public sealed class MaximumOperationsPerRequestTests - : IClassFixture, OperationsDbContext>> + public sealed class MaximumOperationsPerRequestTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; - public MaximumOperationsPerRequestTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public MaximumOperationsPerRequestTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs index 64c964a432..706c990642 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs @@ -3,21 +3,20 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.ModelStateValidation +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ModelStateValidation { public sealed class AtomicModelStateValidationTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicModelStateValidationTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicModelStateValidationTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs index 8c8dcd498f..5cca1995b5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class MusicTrack : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTracksController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTracksController.cs index ed2ffd6044..c7c17f0c43 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTracksController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTracksController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { public sealed class MusicTracksController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsController.cs new file mode 100644 index 0000000000..851a0eceb2 --- /dev/null +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsController.cs @@ -0,0 +1,18 @@ +using JsonApiDotNetCore.AtomicOperations; +using JsonApiDotNetCore.Configuration; +using JsonApiDotNetCore.Controllers; +using JsonApiDotNetCore.Middleware; +using JsonApiDotNetCore.Resources; +using Microsoft.Extensions.Logging; + +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations +{ + public sealed class OperationsController : JsonApiOperationsController + { + public OperationsController(IJsonApiOptions options, ILoggerFactory loggerFactory, IOperationsProcessor processor, IJsonApiRequest request, + ITargetedFields targetedFields) + : base(options, loggerFactory, processor, request, targetedFields) + { + } + } +} diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs index d09892953b..6c62dfaa0f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class OperationsDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs index c85486ca78..1632eb6af8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs @@ -8,7 +8,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { internal sealed class OperationsFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs index 37a0f0c16b..f910e6706c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Performer : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PerformersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PerformersController.cs index 76eb4c9fe8..eb9b756655 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PerformersController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PerformersController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { public sealed class PerformersController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs index 51e5bc07d0..c63467b3ec 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Playlist : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PlaylistsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PlaylistsController.cs index 6ec97e341a..e5da241908 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PlaylistsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PlaylistsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { public sealed class PlaylistsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs index 9cdfccf3b6..3c19514876 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs @@ -7,23 +7,21 @@ using FluentAssertions.Extensions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.QueryStrings { - public sealed class AtomicQueryStringTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicQueryStringTests : IClassFixture, OperationsDbContext>> { private static readonly DateTime FrozenTime = 30.July(2018).At(13, 46, 12); - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicQueryStringTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicQueryStringTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs index ac3c4b12a3..7544515cbc 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Primitives; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.QueryStrings { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class MusicTrackReleaseDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompaniesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompaniesController.cs index a0c55aeb24..a2fff83748 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompaniesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompaniesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { public sealed class RecordCompaniesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs index d735fe4d7b..3a4611cbeb 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class RecordCompany : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs index a2cc6a5347..33a9055cf1 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs @@ -6,22 +6,20 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.Serialization { public sealed class AtomicSerializationResourceDefinitionTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicSerializationResourceDefinitionTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicSerializationResourceDefinitionTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/RecordCompanyDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/RecordCompanyDefinition.cs index df221f521a..fed5e96b21 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/RecordCompanyDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/RecordCompanyDefinition.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.Serialization { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class RecordCompanyDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/AtomicSparseFieldSetResourceDefinitionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/AtomicSparseFieldSetResourceDefinitionTests.cs index 0888a25726..620a0b638e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/AtomicSparseFieldSetResourceDefinitionTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/AtomicSparseFieldSetResourceDefinitionTests.cs @@ -6,21 +6,19 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets { public sealed class AtomicSparseFieldSetResourceDefinitionTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicSparseFieldSetResourceDefinitionTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicSparseFieldSetResourceDefinitionTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricPermissionProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricPermissionProvider.cs index 5593e187d3..070ced4646 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricPermissionProvider.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricPermissionProvider.cs @@ -1,4 +1,4 @@ -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets { public sealed class LyricPermissionProvider { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricTextDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricTextDefinition.cs index a1943625ea..094338a329 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricTextDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricTextDefinition.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Queries.Expressions; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class LyricTextDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs index 8256b4e1b2..d78ddd55a0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class TextLanguage : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguagesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguagesController.cs index eb01382927..6da4f35d38 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguagesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguagesController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations { public sealed class TextLanguagesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs index e02fc62fc4..b6ff66af7a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs @@ -5,20 +5,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Transactions +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions { - public sealed class AtomicRollbackTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicRollbackTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicRollbackTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicRollbackTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs index 4f6508fe4c..8029a7481f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs @@ -5,21 +5,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Transactions +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions { - public sealed class AtomicTransactionConsistencyTests - : IClassFixture, OperationsDbContext>> + public sealed class AtomicTransactionConsistencyTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; - public AtomicTransactionConsistencyTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicTransactionConsistencyTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/ExtraDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/ExtraDbContext.cs index fee681e5e3..2808f95c28 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/ExtraDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/ExtraDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Transactions +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ExtraDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs index 69bba3f622..60dfb891b0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs @@ -6,7 +6,7 @@ using JsonApiDotNetCore.Resources; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Transactions +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class LyricRepository : EntityFrameworkCoreRepository diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs index aabf45bb25..b379f6614b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs @@ -7,7 +7,7 @@ using JsonApiDotNetCore.Resources; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Transactions +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class MusicTrackRepository : EntityFrameworkCoreRepository diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs index 6a5f092e28..75f68434f8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs @@ -8,7 +8,7 @@ using JsonApiDotNetCore.Repositories; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Transactions +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class PerformerRepository : IResourceRepository diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs index 5a318858e0..c095e6ec7e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs @@ -6,21 +6,18 @@ using FluentAssertions; using JsonApiDotNetCore; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Updating.Relationships +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships { - public sealed class AtomicAddToToManyRelationshipTests - : IClassFixture, OperationsDbContext>> + public sealed class AtomicAddToToManyRelationshipTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicAddToToManyRelationshipTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicAddToToManyRelationshipTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs index 3599300581..627dfe404e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs @@ -6,21 +6,19 @@ using FluentAssertions; using JsonApiDotNetCore; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Updating.Relationships +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships { public sealed class AtomicRemoveFromToManyRelationshipTests - : IClassFixture, OperationsDbContext>> + : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicRemoveFromToManyRelationshipTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicRemoveFromToManyRelationshipTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs index eee3c1815b..69c02d0fa6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs @@ -6,21 +6,18 @@ using FluentAssertions; using JsonApiDotNetCore; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Updating.Relationships +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships { - public sealed class AtomicReplaceToManyRelationshipTests - : IClassFixture, OperationsDbContext>> + public sealed class AtomicReplaceToManyRelationshipTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicReplaceToManyRelationshipTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicReplaceToManyRelationshipTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs index 953602b425..5471ab1add 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs @@ -5,21 +5,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Updating.Relationships +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships { - public sealed class AtomicUpdateToOneRelationshipTests - : IClassFixture, OperationsDbContext>> + public sealed class AtomicUpdateToOneRelationshipTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicUpdateToOneRelationshipTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicUpdateToOneRelationshipTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs index 5e88e74c5f..736ffd8646 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs @@ -6,21 +6,18 @@ using FluentAssertions; using JsonApiDotNetCore; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Updating.Resources +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources { - public sealed class AtomicReplaceToManyRelationshipTests - : IClassFixture, OperationsDbContext>> + public sealed class AtomicReplaceToManyRelationshipTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicReplaceToManyRelationshipTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicReplaceToManyRelationshipTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs index ee3f22e54d..391d2bafd6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs @@ -8,20 +8,18 @@ using FluentAssertions.Extensions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Updating.Resources +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources { - public sealed class AtomicUpdateResourceTests : IClassFixture, OperationsDbContext>> + public sealed class AtomicUpdateResourceTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicUpdateResourceTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicUpdateResourceTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs index b40dd4a25f..f65a58f9c3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs @@ -5,21 +5,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.Updating.Resources +namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources { - public sealed class AtomicUpdateToOneRelationshipTests - : IClassFixture, OperationsDbContext>> + public sealed class AtomicUpdateToOneRelationshipTests : IClassFixture, OperationsDbContext>> { - private readonly ExampleIntegrationTestContext, OperationsDbContext> _testContext; + private readonly IntegrationTestContext, OperationsDbContext> _testContext; private readonly OperationsFakers _fakers = new(); - public AtomicUpdateToOneRelationshipTests(ExampleIntegrationTestContext, OperationsDbContext> testContext) + public AtomicUpdateToOneRelationshipTests(IntegrationTestContext, OperationsDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs index 5263e4e362..e50286f5a0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Car : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs index 191cab3bd4..f76e0baa66 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs @@ -8,7 +8,7 @@ using JsonApiDotNetCore.Resources; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public class CarCompositeKeyAwareRepository : EntityFrameworkCoreRepository diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs index 68fcb52cb7..2703102568 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs @@ -9,7 +9,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { /// /// Rewrites an expression tree, updating all references to with the combination of and diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarsController.cs index 982f72d625..ad0dbb18ce 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { public sealed class CarsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs index 13609a17ec..62418ba2c2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class CompositeDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs index 5ae72052bf..979bab3c02 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs @@ -6,19 +6,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { - public sealed class CompositeKeyTests : IClassFixture, CompositeDbContext>> + public sealed class CompositeKeyTests : IClassFixture, CompositeDbContext>> { - private readonly ExampleIntegrationTestContext, CompositeDbContext> _testContext; + private readonly IntegrationTestContext, CompositeDbContext> _testContext; - public CompositeKeyTests(ExampleIntegrationTestContext, CompositeDbContext> testContext) + public CompositeKeyTests(IntegrationTestContext, CompositeDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs index aaa1449254..cb41add695 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Dealership : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/DealershipsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/DealershipsController.cs index 7301033afd..f3e21f47ac 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/DealershipsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/DealershipsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { public sealed class DealershipsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs index 8ccbada031..7f764e5277 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Engine : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/EnginesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/EnginesController.cs index b4371cd63d..971246d219 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/EnginesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/EnginesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CompositeKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys { public sealed class EnginesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs index 8d316708e7..02ec68055d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs @@ -6,18 +6,16 @@ using FluentAssertions; using JsonApiDotNetCore.Middleware; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ContentNegotiation +namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation { - public sealed class AcceptHeaderTests : IClassFixture, PolicyDbContext>> + public sealed class AcceptHeaderTests : IClassFixture, PolicyDbContext>> { - private readonly ExampleIntegrationTestContext, PolicyDbContext> _testContext; + private readonly IntegrationTestContext, PolicyDbContext> _testContext; - public AcceptHeaderTests(ExampleIntegrationTestContext, PolicyDbContext> testContext) + public AcceptHeaderTests(IntegrationTestContext, PolicyDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs index 3f899dc5a5..3ba8975183 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs @@ -4,18 +4,16 @@ using FluentAssertions; using JsonApiDotNetCore.Middleware; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExample.Controllers; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ContentNegotiation +namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation { - public sealed class ContentTypeHeaderTests : IClassFixture, PolicyDbContext>> + public sealed class ContentTypeHeaderTests : IClassFixture, PolicyDbContext>> { - private readonly ExampleIntegrationTestContext, PolicyDbContext> _testContext; + private readonly IntegrationTestContext, PolicyDbContext> _testContext; - public ContentTypeHeaderTests(ExampleIntegrationTestContext, PolicyDbContext> testContext) + public ContentTypeHeaderTests(IntegrationTestContext, PolicyDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/OperationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/OperationsController.cs new file mode 100644 index 0000000000..9d2a3df6f3 --- /dev/null +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/OperationsController.cs @@ -0,0 +1,18 @@ +using JsonApiDotNetCore.AtomicOperations; +using JsonApiDotNetCore.Configuration; +using JsonApiDotNetCore.Controllers; +using JsonApiDotNetCore.Middleware; +using JsonApiDotNetCore.Resources; +using Microsoft.Extensions.Logging; + +namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation +{ + public sealed class OperationsController : JsonApiOperationsController + { + public OperationsController(IJsonApiOptions options, ILoggerFactory loggerFactory, IOperationsProcessor processor, IJsonApiRequest request, + ITargetedFields targetedFields) + : base(options, loggerFactory, processor, request, targetedFields) + { + } + } +} diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PoliciesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PoliciesController.cs index 5cf5119f08..0174e16985 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PoliciesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PoliciesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ContentNegotiation +namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation { public sealed class PoliciesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs index 155bcea4a4..5d89daa33e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ContentNegotiation +namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Policy : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PolicyDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PolicyDbContext.cs index f5481e1865..8fafc120b7 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PolicyDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PolicyDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ContentNegotiation +namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class PolicyDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultDbContext.cs index 9407c8f255..b678e21fde 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ControllerActionResults +namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ActionResultDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs index 2e23a8746c..a467b0ed25 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs @@ -3,17 +3,16 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ControllerActionResults +namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults { - public sealed class ActionResultTests : IClassFixture, ActionResultDbContext>> + public sealed class ActionResultTests : IClassFixture, ActionResultDbContext>> { - private readonly ExampleIntegrationTestContext, ActionResultDbContext> _testContext; + private readonly IntegrationTestContext, ActionResultDbContext> _testContext; - public ActionResultTests(ExampleIntegrationTestContext, ActionResultDbContext> testContext) + public ActionResultTests(IntegrationTestContext, ActionResultDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/BaseToothbrushesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/BaseToothbrushesController.cs index 00fb4ac4dc..001ada5fb0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/BaseToothbrushesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/BaseToothbrushesController.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ControllerActionResults +namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults { public abstract class BaseToothbrushesController : BaseJsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs index 3a9f69ec1f..84299ab5d2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ControllerActionResults +namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Toothbrush : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs index a16b083db4..b3d85b070d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ControllerActionResults +namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults { public sealed class ToothbrushesController : BaseToothbrushesController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs index ecba79c327..ee3d9e2882 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs @@ -3,17 +3,16 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CustomRoutes +namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes { - public sealed class ApiControllerAttributeTests : IClassFixture, CustomRouteDbContext>> + public sealed class ApiControllerAttributeTests : IClassFixture, CustomRouteDbContext>> { - private readonly ExampleIntegrationTestContext, CustomRouteDbContext> _testContext; + private readonly IntegrationTestContext, CustomRouteDbContext> _testContext; - public ApiControllerAttributeTests(ExampleIntegrationTestContext, CustomRouteDbContext> testContext) + public ApiControllerAttributeTests(IntegrationTestContext, CustomRouteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Civilian.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Civilian.cs index 65b3acedc7..ec7ddcf5d9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Civilian.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Civilian.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CustomRoutes +namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Civilian : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs index 7a0ef9bf3b..afcac61376 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CustomRoutes +namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes { [ApiController] [DisableRoutingConvention] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteDbContext.cs index d368ca14b4..c3e3b9063d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CustomRoutes +namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class CustomRouteDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs index 1788cab630..6d32e44da8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CustomRoutes +namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes { internal sealed class CustomRouteFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs index a2e5fa3e0c..6565f2074a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs @@ -5,20 +5,19 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CustomRoutes +namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes { - public sealed class CustomRouteTests : IClassFixture, CustomRouteDbContext>> + public sealed class CustomRouteTests : IClassFixture, CustomRouteDbContext>> { private const string HostPrefix = "http://localhost"; - private readonly ExampleIntegrationTestContext, CustomRouteDbContext> _testContext; + private readonly IntegrationTestContext, CustomRouteDbContext> _testContext; private readonly CustomRouteFakers _fakers = new(); - public CustomRouteTests(ExampleIntegrationTestContext, CustomRouteDbContext> testContext) + public CustomRouteTests(IntegrationTestContext, CustomRouteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Town.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Town.cs index 1242def3a3..4ddb1898e9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Town.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Town.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CustomRoutes +namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Town : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs index 4f65adaaf2..c1c5cf8e24 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.CustomRoutes +namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes { [DisableRoutingConvention] [Route("world-api/civilization/popular/towns")] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs index 48334083aa..8d423e3d4a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Building : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs index 839fe71fab..4c49bdc209 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs @@ -8,7 +8,7 @@ using JsonApiDotNetCore.Resources; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class BuildingRepository : EntityFrameworkCoreRepository diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingsController.cs index be28a84035..f88f3d9db5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { public sealed class BuildingsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs index ec8c85b56a..679d002d22 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class City : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Door.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Door.cs index 068c06414c..73b50af911 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Door.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Door.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Door diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingDbContext.cs index 62dd263f79..bc9e95c9e9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class EagerLoadingDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs index 3ef189ddce..608ae1c034 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { internal sealed class EagerLoadingFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingTests.cs index 3b3ebe81b8..994ce5dbb0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingTests.cs @@ -4,19 +4,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { - public sealed class EagerLoadingTests : IClassFixture, EagerLoadingDbContext>> + public sealed class EagerLoadingTests : IClassFixture, EagerLoadingDbContext>> { - private readonly ExampleIntegrationTestContext, EagerLoadingDbContext> _testContext; + private readonly IntegrationTestContext, EagerLoadingDbContext> _testContext; private readonly EagerLoadingFakers _fakers = new(); - public EagerLoadingTests(ExampleIntegrationTestContext, EagerLoadingDbContext> testContext) + public EagerLoadingTests(IntegrationTestContext, EagerLoadingDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/State.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/State.cs index 99e46ff0a3..cc1c323fbe 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/State.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/State.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class State : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StatesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StatesController.cs index bbaf58cfb2..11533c16b9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StatesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StatesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { public sealed class StatesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Street.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Street.cs index 6ea7264c67..6566295238 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Street.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Street.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Street : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StreetsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StreetsController.cs index 04b4275495..dae11e41b4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StreetsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StreetsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { public sealed class StreetsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Window.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Window.cs index 88dd4a6896..2e447e5d59 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Window.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Window.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.EagerLoading +namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Window diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/AlternateExceptionHandler.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/AlternateExceptionHandler.cs index 385d2d6493..e728b74230 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/AlternateExceptionHandler.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/AlternateExceptionHandler.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Serialization.Objects; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { public sealed class AlternateExceptionHandler : ExceptionHandler { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticle.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticle.cs index a7c2b686e8..b70b079bb3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticle.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticle.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ConsumerArticle : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleIsNoLongerAvailableException.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleIsNoLongerAvailableException.cs index bae3760b76..bbf635822d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleIsNoLongerAvailableException.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleIsNoLongerAvailableException.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Errors; using JsonApiDotNetCore.Serialization.Objects; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { internal sealed class ConsumerArticleIsNoLongerAvailableException : JsonApiException { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleService.cs index d0b52daed3..1e684ba79b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleService.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleService.cs @@ -10,7 +10,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class ConsumerArticleService : JsonApiResourceService diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticlesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticlesController.cs index 7b36586706..0a8e99fb31 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticlesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticlesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { public sealed class ConsumerArticlesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ErrorDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ErrorDbContext.cs index ff9abd6509..ed118f4862 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ErrorDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ErrorDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ErrorDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs index b261702075..adbb207632 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs @@ -7,20 +7,19 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { - public sealed class ExceptionHandlerTests : IClassFixture, ErrorDbContext>> + public sealed class ExceptionHandlerTests : IClassFixture, ErrorDbContext>> { - private readonly ExampleIntegrationTestContext, ErrorDbContext> _testContext; + private readonly IntegrationTestContext, ErrorDbContext> _testContext; - public ExceptionHandlerTests(ExampleIntegrationTestContext, ErrorDbContext> testContext) + public ExceptionHandlerTests(IntegrationTestContext, ErrorDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticle.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticle.cs index fe2d61c6d6..870f168c04 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticle.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticle.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ThrowingArticle : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticlesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticlesController.cs index f2e6def6ed..aac19cda31 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticlesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticlesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ExceptionHandling +namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling { public sealed class ThrowingArticlesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGalleriesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGalleriesController.cs index 4ed2ccb73e..b87e6daeb7 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGalleriesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGalleriesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.HostingInIIS +namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS { public sealed class ArtGalleriesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGallery.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGallery.cs index b3fd2d7317..93cbe7665e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGallery.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGallery.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.HostingInIIS +namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ArtGallery : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingDbContext.cs index 82d77b2b16..19077c24a2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.HostingInIIS +namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class HostingDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs index 0ba493b035..027ba2d61e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.HostingInIIS +namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS { internal sealed class HostingFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs index 4ea765767a..07ff57f515 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs @@ -1,12 +1,12 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; +using TestBuildingBlocks; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.HostingInIIS +namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class HostingStartup : TestableStartup diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingTests.cs index 49419bd748..517f9b2f1b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingTests.cs @@ -7,16 +7,16 @@ using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.HostingInIIS +namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS { - public sealed class HostingTests : IClassFixture, HostingDbContext>> + public sealed class HostingTests : IClassFixture, HostingDbContext>> { private const string HostPrefix = "http://localhost"; - private readonly ExampleIntegrationTestContext, HostingDbContext> _testContext; + private readonly IntegrationTestContext, HostingDbContext> _testContext; private readonly HostingFakers _fakers = new(); - public HostingTests(ExampleIntegrationTestContext, HostingDbContext> testContext) + public HostingTests(IntegrationTestContext, HostingDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/Painting.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/Painting.cs index 2b4c3d5d4f..c00c2826e8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/Painting.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/Painting.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.HostingInIIS +namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Painting : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs index f79d36fe92..513e369126 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.HostingInIIS +namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS { [DisableRoutingConvention] [Route("custom/path/to/paintings-of-the-world")] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs index da98000a04..2b1b713ecf 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class BankAccount : ObfuscatedIdentifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccountsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccountsController.cs index c7751fde1a..304c46b34c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccountsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccountsController.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { public sealed class BankAccountsController : ObfuscatedIdentifiableController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs index 2c0a12fd30..bd6f12ca27 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class DebitCard : ObfuscatedIdentifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCardsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCardsController.cs index d17fb2b016..bed7113897 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCardsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCardsController.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { public sealed class DebitCardsController : ObfuscatedIdentifiableController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/HexadecimalCodec.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/HexadecimalCodec.cs index a84be616b1..7d4f85b222 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/HexadecimalCodec.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/HexadecimalCodec.cs @@ -6,7 +6,7 @@ using JsonApiDotNetCore.Errors; using JsonApiDotNetCore.Serialization.Objects; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { internal sealed class HexadecimalCodec { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/IdObfuscationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/IdObfuscationTests.cs index 6789af5ffe..73f8da6a5f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/IdObfuscationTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/IdObfuscationTests.cs @@ -4,19 +4,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { - public sealed class IdObfuscationTests : IClassFixture, ObfuscationDbContext>> + public sealed class IdObfuscationTests : IClassFixture, ObfuscationDbContext>> { - private readonly ExampleIntegrationTestContext, ObfuscationDbContext> _testContext; + private readonly IntegrationTestContext, ObfuscationDbContext> _testContext; private readonly ObfuscationFakers _fakers = new(); - public IdObfuscationTests(ExampleIntegrationTestContext, ObfuscationDbContext> testContext) + public IdObfuscationTests(IntegrationTestContext, ObfuscationDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiable.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiable.cs index 95214b2a14..99a89e6b8c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiable.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiable.cs @@ -1,6 +1,6 @@ using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { public abstract class ObfuscatedIdentifiable : Identifiable { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiableController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiableController.cs index b2d89011cf..22c934ccbf 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiableController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiableController.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { public abstract class ObfuscatedIdentifiableController : BaseJsonApiController where TResource : class, IIdentifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationDbContext.cs index 939bae05bf..a4af915fc5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ObfuscationDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs index 7d4033aca8..3b82da0e5d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.IdObfuscation +namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation { internal sealed class ObfuscationFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs index 0805cc34f9..627d044ba2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.ModelState +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ModelStateDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs index e9abbb60fb..f3441bf5af 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs @@ -5,18 +5,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.ModelState +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState { - public sealed class ModelStateValidationTests - : IClassFixture, ModelStateDbContext>> + public sealed class ModelStateValidationTests : IClassFixture, ModelStateDbContext>> { - private readonly ExampleIntegrationTestContext, ModelStateDbContext> _testContext; + private readonly IntegrationTestContext, ModelStateDbContext> _testContext; - public ModelStateValidationTests(ExampleIntegrationTestContext, ModelStateDbContext> testContext) + public ModelStateValidationTests(IntegrationTestContext, ModelStateDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs index 7157e70491..2be7e452db 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs @@ -3,17 +3,16 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.ModelState +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState { - public sealed class NoModelStateValidationTests : IClassFixture, ModelStateDbContext>> + public sealed class NoModelStateValidationTests : IClassFixture, ModelStateDbContext>> { - private readonly ExampleIntegrationTestContext, ModelStateDbContext> _testContext; + private readonly IntegrationTestContext, ModelStateDbContext> _testContext; - public NoModelStateValidationTests(ExampleIntegrationTestContext, ModelStateDbContext> testContext) + public NoModelStateValidationTests(IntegrationTestContext, ModelStateDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectoriesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectoriesController.cs index 639c319d7c..17d0703a28 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectoriesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectoriesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.ModelState +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState { public sealed class SystemDirectoriesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs index 4504dd6e13..9a72870cb2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.ModelState +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SystemDirectory : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFile.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFile.cs index 1a66473c8d..de73e1f01e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFile.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFile.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.ModelState +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SystemFile : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFilesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFilesController.cs index 425445b6ad..94a9da2574 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFilesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFilesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.ModelState +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState { public sealed class SystemFilesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/Workflow.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/Workflow.cs index 1cd1e3b783..127d66355a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/Workflow.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/Workflow.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.RequestBody +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Workflow : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDbContext.cs index a54ac87406..2eb55a784d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.RequestBody +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WorkflowDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDefinition.cs index 5c768fb4d2..cbe777c945 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDefinition.cs @@ -10,7 +10,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.RequestBody +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class WorkflowDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowStage.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowStage.cs index 67602b4483..feea8f6748 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowStage.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowStage.cs @@ -1,4 +1,4 @@ -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.RequestBody +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody { public enum WorkflowStage { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs index ec6bfbdeff..2631aa1d9c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs @@ -4,17 +4,17 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.RequestBody +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody { - public sealed class WorkflowTests : IClassFixture, WorkflowDbContext>> + public sealed class WorkflowTests : IClassFixture, WorkflowDbContext>> { - private readonly ExampleIntegrationTestContext, WorkflowDbContext> _testContext; + private readonly IntegrationTestContext, WorkflowDbContext> _testContext; - public WorkflowTests(ExampleIntegrationTestContext, WorkflowDbContext> testContext) + public WorkflowTests(IntegrationTestContext, WorkflowDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowsController.cs index 8edd74c51c..737cfc2a08 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowsController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.InputValidation.RequestBody +namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody { public sealed class WorkflowsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs index 08c03bc049..299a2a8f8d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs @@ -6,22 +6,22 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { public sealed class AbsoluteLinksWithNamespaceTests - : IClassFixture, LinksDbContext>> + : IClassFixture, LinksDbContext>> { private const string HostPrefix = "http://localhost"; - private readonly ExampleIntegrationTestContext, LinksDbContext> _testContext; + private readonly IntegrationTestContext, LinksDbContext> _testContext; private readonly LinksFakers _fakers = new(); - public AbsoluteLinksWithNamespaceTests(ExampleIntegrationTestContext, LinksDbContext> testContext) + public AbsoluteLinksWithNamespaceTests(IntegrationTestContext, LinksDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs index 9882777b17..7d0e239c1a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs @@ -6,22 +6,22 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { public sealed class AbsoluteLinksWithoutNamespaceTests - : IClassFixture, LinksDbContext>> + : IClassFixture, LinksDbContext>> { private const string HostPrefix = "http://localhost"; - private readonly ExampleIntegrationTestContext, LinksDbContext> _testContext; + private readonly IntegrationTestContext, LinksDbContext> _testContext; private readonly LinksFakers _fakers = new(); - public AbsoluteLinksWithoutNamespaceTests(ExampleIntegrationTestContext, LinksDbContext> testContext) + public AbsoluteLinksWithoutNamespaceTests(IntegrationTestContext, LinksDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinkInclusionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinkInclusionTests.cs index 9ab7903b38..d000d18499 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinkInclusionTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinkInclusionTests.cs @@ -3,18 +3,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { - public sealed class LinkInclusionTests : IClassFixture, LinksDbContext>> + public sealed class LinkInclusionTests : IClassFixture, LinksDbContext>> { - private readonly ExampleIntegrationTestContext, LinksDbContext> _testContext; + private readonly IntegrationTestContext, LinksDbContext> _testContext; private readonly LinksFakers _fakers = new(); - public LinkInclusionTests(ExampleIntegrationTestContext, LinksDbContext> testContext) + public LinkInclusionTests(IntegrationTestContext, LinksDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksDbContext.cs index bad61d1e3a..e672034fce 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class LinksDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs index 9673037189..dfe263c43b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { internal sealed class LinksFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/Photo.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/Photo.cs index e13d93fd92..b3ef35a541 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/Photo.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/Photo.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Photo : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbum.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbum.cs index 19ff317933..89d79a3353 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbum.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbum.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class PhotoAlbum : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbumsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbumsController.cs index bc40b8e1c0..065d14432c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbumsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbumsController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { public sealed class PhotoAlbumsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocation.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocation.cs index feb6582694..5112ba3cd4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocation.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocation.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { [ResourceLinks(TopLevelLinks = LinkTypes.None, ResourceLinks = LinkTypes.None, RelationshipLinks = LinkTypes.Related)] [UsedImplicitly(ImplicitUseTargetFlags.Members)] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocationsController.cs index 0da524de7f..ea6d605e56 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocationsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocationsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { public sealed class PhotoLocationsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotosController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotosController.cs index b7b2660b6d..5029d96932 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotosController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotosController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { public sealed class PhotosController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs index 020b66bba4..4bc2e3f465 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs @@ -6,20 +6,20 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { public sealed class RelativeLinksWithNamespaceTests - : IClassFixture, LinksDbContext>> + : IClassFixture, LinksDbContext>> { - private readonly ExampleIntegrationTestContext, LinksDbContext> _testContext; + private readonly IntegrationTestContext, LinksDbContext> _testContext; private readonly LinksFakers _fakers = new(); - public RelativeLinksWithNamespaceTests(ExampleIntegrationTestContext, LinksDbContext> testContext) + public RelativeLinksWithNamespaceTests(IntegrationTestContext, LinksDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs index c128aa3de9..5221df597b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs @@ -6,20 +6,20 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Links +namespace JsonApiDotNetCoreTests.IntegrationTests.Links { public sealed class RelativeLinksWithoutNamespaceTests - : IClassFixture, LinksDbContext>> + : IClassFixture, LinksDbContext>> { - private readonly ExampleIntegrationTestContext, LinksDbContext> _testContext; + private readonly IntegrationTestContext, LinksDbContext> _testContext; private readonly LinksFakers _fakers = new(); - public RelativeLinksWithoutNamespaceTests(ExampleIntegrationTestContext, LinksDbContext> testContext) + public RelativeLinksWithoutNamespaceTests(IntegrationTestContext, LinksDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditDbContext.cs index 416b381728..670b97dcbc 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Logging +namespace JsonApiDotNetCoreTests.IntegrationTests.Logging { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class AuditDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntriesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntriesController.cs index b825a3fb0b..2432334e6b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntriesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntriesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Logging +namespace JsonApiDotNetCoreTests.IntegrationTests.Logging { public sealed class AuditEntriesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntry.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntry.cs index d7001f400f..f7dc6dac53 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntry.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntry.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Logging +namespace JsonApiDotNetCoreTests.IntegrationTests.Logging { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class AuditEntry : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditFakers.cs index 988456a211..ff8fc1b2a8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Logging +namespace JsonApiDotNetCoreTests.IntegrationTests.Logging { internal sealed class AuditFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs index ead491a2a3..d9858db4f3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs @@ -3,20 +3,19 @@ using System.Net.Http; using System.Threading.Tasks; using FluentAssertions; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Logging +namespace JsonApiDotNetCoreTests.IntegrationTests.Logging { - public sealed class LoggingTests : IClassFixture, AuditDbContext>> + public sealed class LoggingTests : IClassFixture, AuditDbContext>> { - private readonly ExampleIntegrationTestContext, AuditDbContext> _testContext; + private readonly IntegrationTestContext, AuditDbContext> _testContext; private readonly AuditFakers _fakers = new(); - public LoggingTests(ExampleIntegrationTestContext, AuditDbContext> testContext) + public LoggingTests(IntegrationTestContext, AuditDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamiliesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamiliesController.cs index a276769c63..d5ddc0327c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamiliesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamiliesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { public sealed class ProductFamiliesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamily.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamily.cs index ea40d2c09f..23d6656282 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamily.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamily.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ProductFamily : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResourceMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResourceMetaTests.cs index d16ce19692..3c6f386ed7 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResourceMetaTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResourceMetaTests.cs @@ -5,19 +5,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { - public sealed class ResourceMetaTests : IClassFixture, SupportDbContext>> + public sealed class ResourceMetaTests : IClassFixture, SupportDbContext>> { - private readonly ExampleIntegrationTestContext, SupportDbContext> _testContext; + private readonly IntegrationTestContext, SupportDbContext> _testContext; private readonly SupportFakers _fakers = new(); - public ResourceMetaTests(ExampleIntegrationTestContext, SupportDbContext> testContext) + public ResourceMetaTests(IntegrationTestContext, SupportDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs index e10b383a33..15297d7b37 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs @@ -4,18 +4,17 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { - public sealed class ResponseMetaTests : IClassFixture, SupportDbContext>> + public sealed class ResponseMetaTests : IClassFixture, SupportDbContext>> { - private readonly ExampleIntegrationTestContext, SupportDbContext> _testContext; + private readonly IntegrationTestContext, SupportDbContext> _testContext; - public ResponseMetaTests(ExampleIntegrationTestContext, SupportDbContext> testContext) + public ResponseMetaTests(IntegrationTestContext, SupportDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportDbContext.cs index 0e0376264c..0db9f2cc95 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SupportDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportFakers.cs index f5db588f99..d20016a8d6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { internal sealed class SupportFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportResponseMeta.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportResponseMeta.cs index 1b62252195..dccf338f22 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportResponseMeta.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportResponseMeta.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using JsonApiDotNetCore.Serialization; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { public sealed class SupportResponseMeta : IResponseMeta { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicket.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicket.cs index b93fcb6b8c..fe8c6dfd1e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicket.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicket.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SupportTicket : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketDefinition.cs index cb68f863ec..99d7b0af77 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketDefinition.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class SupportTicketDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketsController.cs index a08e11371c..7f787b8b77 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { public sealed class SupportTicketsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs index cb073b498d..7041d5b6e5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs @@ -5,19 +5,18 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Meta +namespace JsonApiDotNetCoreTests.IntegrationTests.Meta { - public sealed class TopLevelCountTests : IClassFixture, SupportDbContext>> + public sealed class TopLevelCountTests : IClassFixture, SupportDbContext>> { - private readonly ExampleIntegrationTestContext, SupportDbContext> _testContext; + private readonly IntegrationTestContext, SupportDbContext> _testContext; private readonly SupportFakers _fakers = new(); - public TopLevelCountTests(ExampleIntegrationTestContext, SupportDbContext> testContext) + public TopLevelCountTests(IntegrationTestContext, SupportDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs index 33519f267d..8f8a9168db 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices { internal sealed class DomainFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroup.cs index 306aa2c907..1d7b797884 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroup.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroup.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class DomainGroup : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroupsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroupsController.cs index efd737881b..a175e8773e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroupsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroupsController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices { public sealed class DomainGroupsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUser.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUser.cs index 538b2a31bd..a9bfd19c15 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUser.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUser.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class DomainUser : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUsersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUsersController.cs index 48b26e2acd..1908da2667 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUsersController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUsersController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices { public sealed class DomainUsersController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetDbContext.cs index 259bafb87e..f2ab748564 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.FireAndForgetDelivery +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class FireForgetDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetGroupDefinition.cs index 51437cdba5..e8abb064dd 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetGroupDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetGroupDefinition.cs @@ -4,9 +4,9 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.FireAndForgetDelivery +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class FireForgetGroupDefinition : MessagingGroupDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.Group.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.Group.cs index f5c3f7d255..be56f0e5fa 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.Group.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.Group.cs @@ -5,12 +5,12 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.FireAndForgetDelivery +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery { public sealed partial class FireForgetTests { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.User.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.User.cs index 1f2c376ac4..fa591caa2b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.User.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.User.cs @@ -4,12 +4,12 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.FireAndForgetDelivery +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery { public sealed partial class FireForgetTests { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.cs index 8d1fce0cae..a8a2c5a373 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.cs @@ -5,19 +5,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.FireAndForgetDelivery +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery { - public sealed partial class FireForgetTests : IClassFixture, FireForgetDbContext>> + public sealed partial class FireForgetTests : IClassFixture, FireForgetDbContext>> { - private readonly ExampleIntegrationTestContext, FireForgetDbContext> _testContext; + private readonly IntegrationTestContext, FireForgetDbContext> _testContext; private readonly DomainFakers _fakers = new(); - public FireForgetTests(ExampleIntegrationTestContext, FireForgetDbContext> testContext) + public FireForgetTests(IntegrationTestContext, FireForgetDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetUserDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetUserDefinition.cs index 34fd1504b5..aaa5414f35 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetUserDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetUserDefinition.cs @@ -4,9 +4,9 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.FireAndForgetDelivery +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class FireForgetUserDefinition : MessagingUserDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/MessageBroker.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/MessageBroker.cs index 594697b8a4..ee8b2fae7f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/MessageBroker.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/MessageBroker.cs @@ -4,9 +4,9 @@ using System.Threading.Tasks; using JsonApiDotNetCore.Errors; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.FireAndForgetDelivery +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery { public sealed class MessageBroker { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupCreatedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupCreatedContent.cs index 78e0d34b90..11541b5133 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupCreatedContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupCreatedContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class GroupCreatedContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupDeletedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupDeletedContent.cs index c168671ba6..d3bb447513 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupDeletedContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupDeletedContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class GroupDeletedContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupRenamedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupRenamedContent.cs index 0da1eb58ff..21044b4bcf 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupRenamedContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupRenamedContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class GroupRenamedContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/IMessageContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/IMessageContent.cs index e95b74e673..74fc43ab80 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/IMessageContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/IMessageContent.cs @@ -1,4 +1,4 @@ -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { public interface IMessageContent { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs index f001514efc..f1ed19ef3e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Newtonsoft.Json; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class OutgoingMessage diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserAddedToGroupContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserAddedToGroupContent.cs index 209f1d4035..0dd40a8ecc 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserAddedToGroupContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserAddedToGroupContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UserAddedToGroupContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserCreatedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserCreatedContent.cs index ebbffa4152..eff26c683f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserCreatedContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserCreatedContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UserCreatedContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDeletedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDeletedContent.cs index 94c77c0b49..d48fd1dedd 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDeletedContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDeletedContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UserDeletedContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDisplayNameChangedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDisplayNameChangedContent.cs index f461de5807..d9f00f533a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDisplayNameChangedContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDisplayNameChangedContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UserDisplayNameChangedContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserLoginNameChangedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserLoginNameChangedContent.cs index b6abe8a478..56015fbe13 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserLoginNameChangedContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserLoginNameChangedContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UserLoginNameChangedContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserMovedToGroupContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserMovedToGroupContent.cs index 1ef56bc316..29ed680283 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserMovedToGroupContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserMovedToGroupContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UserMovedToGroupContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserRemovedFromGroupContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserRemovedFromGroupContent.cs index 82cce6824e..8f2599e8ae 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserRemovedFromGroupContent.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserRemovedFromGroupContent.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UserRemovedFromGroupContent : IMessageContent diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs index f08d66ae5f..7c85223bd2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs @@ -7,10 +7,10 @@ using JsonApiDotNetCore.Middleware; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices { public abstract class MessagingGroupDefinition : JsonApiResourceDefinition { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs index f7f9ca81cf..bea8286624 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs @@ -6,10 +6,10 @@ using JsonApiDotNetCore.Middleware; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices { public abstract class MessagingUserDefinition : JsonApiResourceDefinition { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxDbContext.cs index 04edfda455..42e96e1d00 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxDbContext.cs @@ -1,8 +1,8 @@ using JetBrains.Annotations; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.TransactionalOutboxPattern +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class OutboxDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxGroupDefinition.cs index 480585b63e..19fa2e72f6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxGroupDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxGroupDefinition.cs @@ -3,10 +3,10 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.TransactionalOutboxPattern +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class OutboxGroupDefinition : MessagingGroupDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs index a2ed4c303f..5867e2d962 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs @@ -6,13 +6,13 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.TransactionalOutboxPattern +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern { public sealed partial class OutboxTests { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs index a4868a9c87..2a5d518b66 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs @@ -6,13 +6,13 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.TransactionalOutboxPattern +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern { public sealed partial class OutboxTests { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.cs index ff2517423d..8bfb695d55 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.cs @@ -7,23 +7,22 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.TransactionalOutboxPattern +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern { // Implements the Transactional Outbox Microservices pattern, described at: https://microservices.io/patterns/data/transactional-outbox.html - public sealed partial class OutboxTests : IClassFixture, OutboxDbContext>> + public sealed partial class OutboxTests : IClassFixture, OutboxDbContext>> { - private readonly ExampleIntegrationTestContext, OutboxDbContext> _testContext; + private readonly IntegrationTestContext, OutboxDbContext> _testContext; private readonly DomainFakers _fakers = new(); - public OutboxTests(ExampleIntegrationTestContext, OutboxDbContext> testContext) + public OutboxTests(IntegrationTestContext, OutboxDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxUserDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxUserDefinition.cs index a4b4731a22..82d02736b2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxUserDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxUserDefinition.cs @@ -3,10 +3,10 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; -using JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.Messages; +using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Microservices.TransactionalOutboxPattern +namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class OutboxUserDefinition : MessagingUserDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/IHasTenant.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/IHasTenant.cs index 055f86aef8..a936cf9de1 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/IHasTenant.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/IHasTenant.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public interface IHasTenant diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/ITenantProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/ITenantProvider.cs index 2a524cc06f..d3bef58692 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/ITenantProvider.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/ITenantProvider.cs @@ -1,6 +1,6 @@ using System; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { public interface ITenantProvider { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyDbContext.cs index d45206c35c..fed46351e1 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class MultiTenancyDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs index 2ebc6570f3..669ad84200 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { internal sealed class MultiTenancyFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyTests.cs index d53c4a5859..9faebf948c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyTests.cs @@ -6,24 +6,23 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { - public sealed class MultiTenancyTests : IClassFixture, MultiTenancyDbContext>> + public sealed class MultiTenancyTests : IClassFixture, MultiTenancyDbContext>> { private static readonly Guid ThisTenantId = RouteTenantProvider.TenantRegistry["nld"]; private static readonly Guid OtherTenantId = RouteTenantProvider.TenantRegistry["ita"]; - private readonly ExampleIntegrationTestContext, MultiTenancyDbContext> _testContext; + private readonly IntegrationTestContext, MultiTenancyDbContext> _testContext; private readonly MultiTenancyFakers _fakers = new(); - public MultiTenancyTests(ExampleIntegrationTestContext, MultiTenancyDbContext> testContext) + public MultiTenancyTests(IntegrationTestContext, MultiTenancyDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenantResourceService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenantResourceService.cs index 138bf96cac..01dbe88bcf 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenantResourceService.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenantResourceService.cs @@ -11,7 +11,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public class MultiTenantResourceService : JsonApiResourceService diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs index d02cd3037d..e373e1bcb6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Http; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { internal sealed class RouteTenantProvider : ITenantProvider { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProduct.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProduct.cs index afb75e8ceb..f7e65c2315 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProduct.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProduct.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WebProduct : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs index 1eaee35a11..3985fc3805 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { [DisableRoutingConvention] [Route("{countryCode}/products")] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShop.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShop.cs index 8620924234..ddddace8fa 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShop.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShop.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WebShop : Identifiable, IHasTenant diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs index c17ec48ec7..1c7c65ae4d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.MultiTenancy +namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy { [DisableRoutingConvention] [Route("{countryCode}/shops")] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs index fc23994b25..30dd4d2cd9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class DivingBoard : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoardsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoardsController.cs index 0e055f84b0..65e5f0b3e3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoardsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoardsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { public sealed class DivingBoardsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs index b6e762d46b..fb5241d17e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs @@ -1,10 +1,10 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json.Serialization; +using TestBuildingBlocks; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class KebabCasingConventionStartup : TestableStartup diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs index 3b7a75b5f2..e960c607a5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs @@ -7,14 +7,14 @@ using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { - public sealed class KebabCasingTests : IClassFixture, SwimmingDbContext>> + public sealed class KebabCasingTests : IClassFixture, SwimmingDbContext>> { - private readonly ExampleIntegrationTestContext, SwimmingDbContext> _testContext; + private readonly IntegrationTestContext, SwimmingDbContext> _testContext; private readonly SwimmingFakers _fakers = new(); - public KebabCasingTests(ExampleIntegrationTestContext, SwimmingDbContext> testContext) + public KebabCasingTests(IntegrationTestContext, SwimmingDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingDbContext.cs index 2722b91cc9..c250e90f22 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SwimmingDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingFakers.cs index f976bc0e74..7733a120b8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { internal sealed class SwimmingFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs index 324b984522..ae3b1ef04f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SwimmingPool : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPoolsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPoolsController.cs index 760227f2ff..2d0783bbb3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPoolsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPoolsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { public sealed class SwimmingPoolsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs index b9007dfe98..b74f2fcfe6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NamingConventions +namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WaterSlide : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiController.cs new file mode 100644 index 0000000000..fa783d5095 --- /dev/null +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiController.cs @@ -0,0 +1,55 @@ +using System.IO; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers +{ + [Route("[controller]")] + public sealed class NonJsonApiController : ControllerBase + { + [HttpGet] + public IActionResult Get() + { + string[] result = + { + "Welcome!" + }; + + return Ok(result); + } + + [HttpPost] + public async Task PostAsync() + { + string name = await new StreamReader(Request.Body).ReadToEndAsync(); + + if (string.IsNullOrEmpty(name)) + { + return BadRequest("Please send your name."); + } + + string result = "Hello, " + name; + return Ok(result); + } + + [HttpPut] + public IActionResult Put([FromBody] string name) + { + string result = "Hi, " + name; + return Ok(result); + } + + [HttpPatch] + public IActionResult Patch(string name) + { + string result = "Good day, " + name; + return Ok(result); + } + + [HttpDelete] + public IActionResult Delete() + { + return Ok("Bye."); + } + } +} diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs index dcb3efaae3..1b6fa12d8f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs @@ -3,20 +3,20 @@ using System.Net.Http.Headers; using System.Threading.Tasks; using FluentAssertions; -using JsonApiDotNetCoreExample.Startups; -using Microsoft.AspNetCore.Mvc.Testing; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.NonJsonApiControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers { - public sealed class NonJsonApiControllerTests : IClassFixture> + public sealed class NonJsonApiControllerTests : IClassFixture, NonJsonApiDbContext>> { - private readonly WebApplicationFactory _factory; + private readonly IntegrationTestContext, NonJsonApiDbContext> _testContext; - public NonJsonApiControllerTests(WebApplicationFactory factory) + public NonJsonApiControllerTests(IntegrationTestContext, NonJsonApiDbContext> testContext) { - _factory = factory; + _testContext = testContext; + + testContext.UseController(); } [Fact] @@ -25,7 +25,7 @@ public async Task Get_skips_middleware_and_formatters() // Arrange using var request = new HttpRequestMessage(HttpMethod.Get, "/NonJsonApi"); - HttpClient client = _factory.CreateClient(); + HttpClient client = _testContext.Factory.CreateClient(); // Act HttpResponseMessage httpResponse = await client.SendAsync(request); @@ -53,7 +53,7 @@ public async Task Post_skips_middleware_and_formatters() } }; - HttpClient client = _factory.CreateClient(); + HttpClient client = _testContext.Factory.CreateClient(); // Act HttpResponseMessage httpResponse = await client.SendAsync(request); @@ -72,7 +72,7 @@ public async Task Post_skips_error_handler() // Arrange using var request = new HttpRequestMessage(HttpMethod.Post, "/NonJsonApi"); - HttpClient client = _factory.CreateClient(); + HttpClient client = _testContext.Factory.CreateClient(); // Act HttpResponseMessage httpResponse = await client.SendAsync(request); @@ -100,7 +100,7 @@ public async Task Put_skips_middleware_and_formatters() } }; - HttpClient client = _factory.CreateClient(); + HttpClient client = _testContext.Factory.CreateClient(); // Act HttpResponseMessage httpResponse = await client.SendAsync(request); @@ -119,7 +119,7 @@ public async Task Patch_skips_middleware_and_formatters() // Arrange using var request = new HttpRequestMessage(HttpMethod.Patch, "/NonJsonApi?name=Janice"); - HttpClient client = _factory.CreateClient(); + HttpClient client = _testContext.Factory.CreateClient(); // Act HttpResponseMessage httpResponse = await client.SendAsync(request); @@ -138,7 +138,7 @@ public async Task Delete_skips_middleware_and_formatters() // Arrange using var request = new HttpRequestMessage(HttpMethod.Delete, "/NonJsonApi"); - HttpClient client = _factory.CreateClient(); + HttpClient client = _testContext.Factory.CreateClient(); // Act HttpResponseMessage httpResponse = await client.SendAsync(request); diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiDbContext.cs new file mode 100644 index 0000000000..5fb6d1d42e --- /dev/null +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiDbContext.cs @@ -0,0 +1,14 @@ +using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore; + +namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers +{ + [UsedImplicitly(ImplicitUseTargetFlags.Members)] + public sealed class NonJsonApiDbContext : DbContext + { + public NonJsonApiDbContext(DbContextOptions options) + : base(options) + { + } + } +} diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs index f623cf82d9..640fff74a9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class AccountPreferences : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs index d7a6f84e9a..7221f0815c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Appointment : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Blog.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Blog.cs index 6bcd37d005..e13dde1faa 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Blog.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Blog.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Blog : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPost.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPost.cs index 7254233f80..d62291379b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPost.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPost.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class BlogPost : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPostsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPostsController.cs index c5ccb8da12..ea357db55a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPostsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPostsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { public sealed class BlogPostsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogsController.cs index 3247bfa0aa..565d1f3e58 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { public sealed class BlogsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs index 494184ee68..5ca3125da3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Calendar : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CalendarsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CalendarsController.cs index 03e018cc91..76e6e213b5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CalendarsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CalendarsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { public sealed class CalendarsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Comment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Comment.cs index 199f8c1287..1c849ffcd7 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Comment.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Comment.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Comment : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CommentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CommentsController.cs index b4aae04a85..d00f138d77 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CommentsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CommentsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { public sealed class CommentsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs index 648de3fd31..df1677f380 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs @@ -9,18 +9,17 @@ using Humanizer; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Filtering +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering { - public sealed class FilterDataTypeTests : IClassFixture, FilterDbContext>> + public sealed class FilterDataTypeTests : IClassFixture, FilterDbContext>> { - private readonly ExampleIntegrationTestContext, FilterDbContext> _testContext; + private readonly IntegrationTestContext, FilterDbContext> _testContext; - public FilterDataTypeTests(ExampleIntegrationTestContext, FilterDbContext> testContext) + public FilterDataTypeTests(IntegrationTestContext, FilterDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDbContext.cs index 3b9201bbb2..26c59823cf 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Filtering +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class FilterDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs index f32b67180c..db03f0517e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs @@ -7,19 +7,18 @@ using FluentAssertions.Extensions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Filtering +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering { - public sealed class FilterDepthTests : IClassFixture, QueryStringDbContext>> + public sealed class FilterDepthTests : IClassFixture, QueryStringDbContext>> { - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public FilterDepthTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public FilterDepthTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs index 29e3f3b465..31b6aa41cd 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs @@ -9,18 +9,17 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Queries.Expressions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Filtering +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering { - public sealed class FilterOperatorTests : IClassFixture, FilterDbContext>> + public sealed class FilterOperatorTests : IClassFixture, FilterDbContext>> { - private readonly ExampleIntegrationTestContext, FilterDbContext> _testContext; + private readonly IntegrationTestContext, FilterDbContext> _testContext; - public FilterOperatorTests(ExampleIntegrationTestContext, FilterDbContext> testContext) + public FilterOperatorTests(IntegrationTestContext, FilterDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs index 1d208f241f..e4e5fdeec5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs @@ -5,19 +5,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Filtering +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering { - public sealed class FilterTests : IClassFixture, QueryStringDbContext>> + public sealed class FilterTests : IClassFixture, QueryStringDbContext>> { - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public FilterTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public FilterTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResource.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResource.cs index c4424ecf87..515eb70db0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResource.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResource.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Filtering +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class FilterableResource : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResourcesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResourcesController.cs index 77ae278e98..c475498915 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResourcesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResourcesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Filtering +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering { public sealed class FilterableResourcesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs index 3068ce2812..39bd0e68b5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs @@ -6,19 +6,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Includes +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Includes { - public sealed class IncludeTests : IClassFixture, QueryStringDbContext>> + public sealed class IncludeTests : IClassFixture, QueryStringDbContext>> { - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public IncludeTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public IncludeTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs index 5829484535..cac2a323d2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Label : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs index 62a35c09d2..344faf6a0c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public enum LabelColor diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs index cd94ebe88f..9d015e7fb6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs @@ -6,23 +6,21 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Pagination +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination { - public sealed class PaginationWithTotalCountTests - : IClassFixture, QueryStringDbContext>> + public sealed class PaginationWithTotalCountTests : IClassFixture, QueryStringDbContext>> { private const string HostPrefix = "http://localhost"; private const int DefaultPageSize = 5; - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public PaginationWithTotalCountTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public PaginationWithTotalCountTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithoutTotalCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithoutTotalCountTests.cs index bbca95dec7..9ff4accd59 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithoutTotalCountTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithoutTotalCountTests.cs @@ -5,23 +5,21 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Pagination +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination { - public sealed class PaginationWithoutTotalCountTests - : IClassFixture, QueryStringDbContext>> + public sealed class PaginationWithoutTotalCountTests : IClassFixture, QueryStringDbContext>> { private const string HostPrefix = "http://localhost"; private const int DefaultPageSize = 5; - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public PaginationWithoutTotalCountTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public PaginationWithoutTotalCountTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs index 5847d3ffc4..c6f576c94d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs @@ -5,20 +5,19 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Pagination +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination { - public sealed class RangeValidationTests : IClassFixture, QueryStringDbContext>> + public sealed class RangeValidationTests : IClassFixture, QueryStringDbContext>> { private const int DefaultPageSize = 5; - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public RangeValidationTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public RangeValidationTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs index 0e3833afac..583ae0d712 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs @@ -4,21 +4,19 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Pagination +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination { - public sealed class RangeValidationWithMaximumTests - : IClassFixture, QueryStringDbContext>> + public sealed class RangeValidationWithMaximumTests : IClassFixture, QueryStringDbContext>> { private const int MaximumPageSize = 15; private const int MaximumPageNumber = 20; - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; - public RangeValidationWithMaximumTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public RangeValidationWithMaximumTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs index 1d3c585411..b09dfbc278 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class QueryStringDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs index abf4650265..702ba9c7f5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { internal sealed class QueryStringFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringTests.cs index 2ff57e16f4..98c9bd85fa 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringTests.cs @@ -4,18 +4,17 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { - public sealed class QueryStringTests : IClassFixture, QueryStringDbContext>> + public sealed class QueryStringTests : IClassFixture, QueryStringDbContext>> { - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; - public QueryStringTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public QueryStringTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerDefaultValueHandlingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerDefaultValueHandlingTests.cs index 045c7a0653..6ac9eb4ac1 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerDefaultValueHandlingTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerDefaultValueHandlingTests.cs @@ -5,21 +5,19 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { - public sealed class SerializerDefaultValueHandlingTests - : IClassFixture, QueryStringDbContext>> + public sealed class SerializerDefaultValueHandlingTests : IClassFixture, QueryStringDbContext>> { - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public SerializerDefaultValueHandlingTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public SerializerDefaultValueHandlingTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerNullValueHandlingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerNullValueHandlingTests.cs index 8920fcbdfb..3217e06c2a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerNullValueHandlingTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerNullValueHandlingTests.cs @@ -5,21 +5,19 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { - public sealed class SerializerNullValueHandlingTests - : IClassFixture, QueryStringDbContext>> + public sealed class SerializerNullValueHandlingTests : IClassFixture, QueryStringDbContext>> { - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public SerializerNullValueHandlingTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public SerializerNullValueHandlingTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs index f75a0a97d8..c70b793b59 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs @@ -6,18 +6,17 @@ using FluentAssertions; using FluentAssertions.Extensions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.Sorting +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Sorting { - public sealed class SortTests : IClassFixture, QueryStringDbContext>> + public sealed class SortTests : IClassFixture, QueryStringDbContext>> { - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public SortTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public SortTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs index f29f49b33c..8a94831480 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.SparseFieldSets +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets { public sealed class ResourceCaptureStore { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs index 1ebbd87fd2..0bf6da70f0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs @@ -8,7 +8,7 @@ using JsonApiDotNetCore.Resources; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.SparseFieldSets +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets { /// /// Enables sparse fieldset tests to verify which fields were (not) retrieved from the database. diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs index dd556a3ad8..14ac363c02 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs @@ -5,19 +5,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings.SparseFieldSets +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets { - public sealed class SparseFieldSetTests : IClassFixture, QueryStringDbContext>> + public sealed class SparseFieldSetTests : IClassFixture, QueryStringDbContext>> { - private readonly ExampleIntegrationTestContext, QueryStringDbContext> _testContext; + private readonly IntegrationTestContext, QueryStringDbContext> _testContext; private readonly QueryStringFakers _fakers = new(); - public SparseFieldSetTests(ExampleIntegrationTestContext, QueryStringDbContext> testContext) + public SparseFieldSetTests(IntegrationTestContext, QueryStringDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccount.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccount.cs index 3a51366dc0..09a3e5f2a7 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccount.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccount.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WebAccount : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccountsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccountsController.cs index 302e3b3738..9842dcbc6f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccountsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccountsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings +namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings { public sealed class WebAccountsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs index 2ca5e9ee1d..6bbb3ce71c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs @@ -9,20 +9,19 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Creating +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating { - public sealed class CreateResourceTests : IClassFixture, ReadWriteDbContext>> + public sealed class CreateResourceTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public CreateResourceTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public CreateResourceTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs index 9e06bd9598..3c30d86e83 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs @@ -7,20 +7,19 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Creating +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating { public sealed class CreateResourceWithClientGeneratedIdTests - : IClassFixture, ReadWriteDbContext>> + : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public CreateResourceWithClientGeneratedIdTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public CreateResourceWithClientGeneratedIdTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs index 815df90212..f9d1caa667 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs @@ -5,20 +5,19 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Creating +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating { public sealed class CreateResourceWithToManyRelationshipTests - : IClassFixture, ReadWriteDbContext>> + : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public CreateResourceWithToManyRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public CreateResourceWithToManyRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs index 05e2d78341..761dfa50df 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs @@ -6,22 +6,21 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Creating +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating { public sealed class CreateResourceWithToOneRelationshipTests - : IClassFixture, ReadWriteDbContext>> + : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public CreateResourceWithToOneRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public CreateResourceWithToOneRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs index b24769210f..f3a75b461d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs @@ -5,19 +5,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Deleting +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Deleting { - public sealed class DeleteResourceTests : IClassFixture, ReadWriteDbContext>> + public sealed class DeleteResourceTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public DeleteResourceTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public DeleteResourceTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs index 3a8796ae96..5bcb2f98a0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs @@ -4,18 +4,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Fetching +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Fetching { - public sealed class FetchRelationshipTests : IClassFixture, ReadWriteDbContext>> + public sealed class FetchRelationshipTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public FetchRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public FetchRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs index de22ee8844..9185b53bcb 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs @@ -5,18 +5,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Fetching +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Fetching { - public sealed class FetchResourceTests : IClassFixture, ReadWriteDbContext>> + public sealed class FetchResourceTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public FetchResourceTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public FetchResourceTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs index ba58036605..81f437dc85 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs @@ -6,7 +6,7 @@ using JsonApiDotNetCore.Resources; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { /// /// Used to simulate side effects that occur in the database while saving, typically caused by database triggers. diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs index 13118246dc..23afe8480b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs @@ -7,7 +7,7 @@ using JsonApiDotNetCore.Resources; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { /// /// Used to simulate side effects that occur in the database while saving, typically caused by database triggers. diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs index a149fa9850..92d7c28888 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs @@ -4,7 +4,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ReadWriteDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs index a8e40bc388..fda5ba9218 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { internal sealed class ReadWriteFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColor.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColor.cs index 5e1094bd17..71e32d6618 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColor.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColor.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class RgbColor : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColorsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColorsController.cs index 15c1524b3e..ced6497481 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColorsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColorsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { public sealed class RgbColorsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs index 2de5c7ad04..d0b1e39b98 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs @@ -6,19 +6,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Updating.Relationships +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships { - public sealed class AddToToManyRelationshipTests : IClassFixture, ReadWriteDbContext>> + public sealed class AddToToManyRelationshipTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public AddToToManyRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public AddToToManyRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs index 1452e4adf0..d227ab5e09 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs @@ -12,21 +12,19 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Updating.Relationships +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships { - public sealed class RemoveFromToManyRelationshipTests - : IClassFixture, ReadWriteDbContext>> + public sealed class RemoveFromToManyRelationshipTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public RemoveFromToManyRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public RemoveFromToManyRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs index 10d9548039..8ae734fc0f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs @@ -7,19 +7,18 @@ using FluentAssertions; using JsonApiDotNetCore; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Updating.Relationships +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships { - public sealed class ReplaceToManyRelationshipTests : IClassFixture, ReadWriteDbContext>> + public sealed class ReplaceToManyRelationshipTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public ReplaceToManyRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public ReplaceToManyRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs index d49c44480c..e12ebf1ea4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs @@ -5,19 +5,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Updating.Relationships +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships { - public sealed class UpdateToOneRelationshipTests : IClassFixture, ReadWriteDbContext>> + public sealed class UpdateToOneRelationshipTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public UpdateToOneRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public UpdateToOneRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs index 491c9c326c..19d0979648 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs @@ -8,19 +8,18 @@ using JsonApiDotNetCore; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Updating.Resources +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources { - public sealed class ReplaceToManyRelationshipTests : IClassFixture, ReadWriteDbContext>> + public sealed class ReplaceToManyRelationshipTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public ReplaceToManyRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public ReplaceToManyRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs index b6b0c3d160..aea4a3734b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs @@ -9,19 +9,18 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Updating.Resources +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources { - public sealed class UpdateResourceTests : IClassFixture, ReadWriteDbContext>> + public sealed class UpdateResourceTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public UpdateResourceTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public UpdateResourceTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; @@ -359,7 +358,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext => responseDocument.SingleData.Attributes["description"].Should().Be(newDescription + ImplicitlyChangingWorkItemDefinition.Suffix); responseDocument.SingleData.Attributes["dueAt"].Should().BeNull(); responseDocument.SingleData.Attributes["priority"].Should().Be(existingWorkItem.Priority.ToString("G")); - responseDocument.SingleData.Attributes["isImportant"].Should().Be(false); + responseDocument.SingleData.Attributes["isImportant"].Should().Be(existingWorkItem.IsImportant); responseDocument.SingleData.Relationships.Should().NotBeEmpty(); await _testContext.RunOnDatabaseAsync(async dbContext => diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs index 55eb2b638c..ded40750a3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs @@ -6,19 +6,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite.Updating.Resources +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources { - public sealed class UpdateToOneRelationshipTests : IClassFixture, ReadWriteDbContext>> + public sealed class UpdateToOneRelationshipTests : IClassFixture, ReadWriteDbContext>> { - private readonly ExampleIntegrationTestContext, ReadWriteDbContext> _testContext; + private readonly IntegrationTestContext, ReadWriteDbContext> _testContext; private readonly ReadWriteFakers _fakers = new(); - public UpdateToOneRelationshipTests(ExampleIntegrationTestContext, ReadWriteDbContext> testContext) + public UpdateToOneRelationshipTests(IntegrationTestContext, ReadWriteDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccount.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccount.cs index a13f98a5be..957882a09f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccount.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccount.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UserAccount : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccountsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccountsController.cs index 6ecb32ac29..4d928d7ad5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccountsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccountsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { public sealed class UserAccountsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItem.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItem.cs index c35612f7d7..ed8a27f115 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItem.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItem.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WorkItem : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroup.cs index 3b33c5710d..de97a74176 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroup.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroup.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WorkItemGroup : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroupsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroupsController.cs index 78c57605fb..5a15706245 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroupsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroupsController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { public sealed class WorkItemGroupsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs index 4ee4e283e5..093a2d5a86 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public enum WorkItemPriority diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemToWorkItem.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemToWorkItem.cs index 1074c44182..564ec9b497 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemToWorkItem.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemToWorkItem.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WorkItemToWorkItem diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemsController.cs index c5b0a80553..7ad111fa28 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { public sealed class WorkItemsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkTag.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkTag.cs index f82b3e183e..fbb0be35f5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkTag.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkTag.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ReadWrite +namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class WorkTag : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Customer.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Customer.cs index 0dad711a61..27f6623a92 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Customer.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Customer.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Customer : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/CustomersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/CustomersController.cs index 36770c8ee8..b3fc7316b5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/CustomersController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/CustomersController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { public sealed class CustomersController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorDbContext.cs index 2c0e3a88df..9e2a89163a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class DefaultBehaviorDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs index 6c8716067f..b561b479e4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { internal sealed class DefaultBehaviorFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs index d83bdb4f1c..140065daed 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs @@ -5,21 +5,20 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { - public sealed class DefaultBehaviorTests : IClassFixture, DefaultBehaviorDbContext>> + public sealed class DefaultBehaviorTests : IClassFixture, DefaultBehaviorDbContext>> { - private readonly ExampleIntegrationTestContext, DefaultBehaviorDbContext> _testContext; + private readonly IntegrationTestContext, DefaultBehaviorDbContext> _testContext; private readonly DefaultBehaviorFakers _fakers = new(); - public DefaultBehaviorTests(ExampleIntegrationTestContext, DefaultBehaviorDbContext> testContext) + public DefaultBehaviorTests(IntegrationTestContext, DefaultBehaviorDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Order.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Order.cs index 7ddae205fa..124382e8f4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Order.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Order.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Order : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/OrdersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/OrdersController.cs index becbc9e96b..5f0159428c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/OrdersController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/OrdersController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { public sealed class OrdersController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Shipment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Shipment.cs index 24a33cfa5c..24768ad68e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Shipment.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Shipment.cs @@ -5,7 +5,7 @@ #pragma warning disable AV1115 // Member or local function contains the word 'and', which suggests doing multiple things -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Shipment : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/ShipmentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/ShipmentsController.cs index 6c652b17d0..7ca704fa6b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/ShipmentsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/ShipmentsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RequiredRelationships +namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships { public sealed class ShipmentsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificate.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificate.cs index ea508c877a..0c96d5c58a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificate.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificate.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Resources.Annotations; using Microsoft.AspNetCore.Authentication; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceConstructorInjection +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class GiftCertificate : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificatesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificatesController.cs index 0a76d0169d..b8592eab1e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificatesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificatesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceConstructorInjection +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection { public sealed class GiftCertificatesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionDbContext.cs index df174c7c6f..c885fc6cac 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionDbContext.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceConstructorInjection +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class InjectionDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs index 75d17e4d12..12d1f05145 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs @@ -7,7 +7,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceConstructorInjection +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection { internal sealed class InjectionFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOffice.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOffice.cs index 61b751b2a4..688faf36e4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOffice.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOffice.cs @@ -6,7 +6,7 @@ using JsonApiDotNetCore.Resources.Annotations; using Microsoft.AspNetCore.Authentication; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceConstructorInjection +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class PostOffice : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOfficesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOfficesController.cs index a1420a7a80..32167b3d2e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOfficesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOfficesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceConstructorInjection +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection { public sealed class PostOfficesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs index d972e81829..c08840a5d6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs @@ -6,21 +6,20 @@ using FluentAssertions.Common; using FluentAssertions.Extensions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.AspNetCore.Authentication; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceConstructorInjection +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection { - public sealed class ResourceInjectionTests : IClassFixture, InjectionDbContext>> + public sealed class ResourceInjectionTests : IClassFixture, InjectionDbContext>> { - private readonly ExampleIntegrationTestContext, InjectionDbContext> _testContext; + private readonly IntegrationTestContext, InjectionDbContext> _testContext; private readonly InjectionFakers _fakers; - public ResourceInjectionTests(ExampleIntegrationTestContext, InjectionDbContext> testContext) + public ResourceInjectionTests(IntegrationTestContext, InjectionDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionHitCounter.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionHitCounter.cs index fb09066912..3bbe48baea 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionHitCounter.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionHitCounter.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests +namespace JsonApiDotNetCoreTests.IntegrationTests { /// /// This is used solely in our tests, so we can assert which calls were made. diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/IClientSettingsProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/IClientSettingsProvider.cs index e5ed1386b9..ef79f15157 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/IClientSettingsProvider.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/IClientSettingsProvider.cs @@ -1,4 +1,4 @@ -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { public interface IClientSettingsProvider { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Moon.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Moon.cs index afdca8b7ce..a3a2e23199 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Moon.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Moon.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Moon : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs index 1f19221d70..5cdf8d49fd 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs @@ -7,7 +7,7 @@ using JsonApiDotNetCore.Resources.Annotations; using Microsoft.Extensions.Primitives; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class MoonDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonsController.cs index fe0e1e9cd6..f72d0c121a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { public sealed class MoonsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Planet.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Planet.cs index d9f51627c0..a4090b4228 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Planet.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Planet.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Planet : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetDefinition.cs index 9b547cf117..e121087275 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetDefinition.cs @@ -9,7 +9,7 @@ using JsonApiDotNetCore.Resources.Annotations; using JsonApiDotNetCore.Serialization.Objects; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class PlanetDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetsController.cs index d96f0fd2ef..3ccf4362ec 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { public sealed class PlanetsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs index 54d8f72825..0cd6d121d4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs @@ -6,19 +6,18 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { - public sealed class ResourceDefinitionReadTests : IClassFixture, UniverseDbContext>> + public sealed class ResourceDefinitionReadTests : IClassFixture, UniverseDbContext>> { - private readonly ExampleIntegrationTestContext, UniverseDbContext> _testContext; + private readonly IntegrationTestContext, UniverseDbContext> _testContext; private readonly UniverseFakers _fakers = new(); - public ResourceDefinitionReadTests(ExampleIntegrationTestContext, UniverseDbContext> testContext) + public ResourceDefinitionReadTests(IntegrationTestContext, UniverseDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Star.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Star.cs index 328b1346ee..84e51726c3 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Star.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Star.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Star : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs index 2ed3480dd3..1ac33675be 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Queries.Expressions; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class StarDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs index 0701442b41..7a04056716 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public enum StarKind diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarsController.cs index 483875106f..a23eabe4ec 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { public sealed class StarsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/TestClientSettingsProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/TestClientSettingsProvider.cs index 4005f1f29a..d975f4a85b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/TestClientSettingsProvider.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/TestClientSettingsProvider.cs @@ -1,4 +1,4 @@ -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { internal sealed class TestClientSettingsProvider : IClientSettingsProvider { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseDbContext.cs index f4e1c87b61..94f2065d07 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class UniverseDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs index 2bcb476cf5..de46186008 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Reading +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading { internal sealed class UniverseFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/AesEncryptionService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/AesEncryptionService.cs index c772b5c98f..5074d86359 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/AesEncryptionService.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/AesEncryptionService.cs @@ -2,7 +2,7 @@ using System.Security.Cryptography; using System.Text; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { public sealed class AesEncryptionService : IEncryptionService { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/IEncryptionService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/IEncryptionService.cs index 2b940ef991..2500137339 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/IEncryptionService.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/IEncryptionService.cs @@ -1,4 +1,4 @@ -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { public interface IEncryptionService { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ResourceDefinitionSerializationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ResourceDefinitionSerializationTests.cs index b4b0f4e241..693907a79a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ResourceDefinitionSerializationTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ResourceDefinitionSerializationTests.cs @@ -6,20 +6,19 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { public sealed class ResourceDefinitionSerializationTests - : IClassFixture, SerializationDbContext>> + : IClassFixture, SerializationDbContext>> { - private readonly ExampleIntegrationTestContext, SerializationDbContext> _testContext; + private readonly IntegrationTestContext, SerializationDbContext> _testContext; private readonly SerializationFakers _fakers = new(); - public ResourceDefinitionSerializationTests(ExampleIntegrationTestContext, SerializationDbContext> testContext) + public ResourceDefinitionSerializationTests(IntegrationTestContext, SerializationDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Scholarship.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Scholarship.cs index 397c8df3ec..cc8981559c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Scholarship.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Scholarship.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Scholarship : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ScholarshipsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ScholarshipsController.cs index 0a692758ae..227e96a2ad 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ScholarshipsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ScholarshipsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { public sealed class ScholarshipsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs index 86377b229c..dc9a7f8614 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SerializationDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs index 9f372e0ee8..814474a4ed 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs @@ -6,7 +6,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { internal sealed class SerializationFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Student.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Student.cs index bcec15bf30..32ebe1feb2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Student.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Student.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Student : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentDefinition.cs index 6ce5d5656f..b1a2776c06 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentDefinition.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentDefinition.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class StudentDefinition : JsonApiResourceDefinition diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentsController.cs index 0460c84f7f..3b82931c61 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization { public sealed class StudentsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceDbContext.cs index a36624167a..dc6e2f1533 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceDbContext.cs @@ -1,10 +1,10 @@ using JetBrains.Annotations; -using JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models; +using JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models; using Microsoft.EntityFrameworkCore; // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class InheritanceDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceTests.cs index db84fdc38b..be72317118 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceTests.cs @@ -3,19 +3,18 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models; -using JsonApiDotNetCoreExampleTests.Startups; +using JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models; using Microsoft.EntityFrameworkCore; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance { - public sealed class InheritanceTests : IClassFixture, InheritanceDbContext>> + public sealed class InheritanceTests : IClassFixture, InheritanceDbContext>> { - private readonly ExampleIntegrationTestContext, InheritanceDbContext> _testContext; + private readonly IntegrationTestContext, InheritanceDbContext> _testContext; - public InheritanceTests(ExampleIntegrationTestContext, InheritanceDbContext> testContext) + public InheritanceTests(IntegrationTestContext, InheritanceDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/MenController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/MenController.cs index 860a28b2c9..b0da27471e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/MenController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/MenController.cs @@ -1,10 +1,10 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Controllers; using JsonApiDotNetCore.Services; -using JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models; +using JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance { public sealed class MenController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Book.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Book.cs index 406456baa5..6c0e11eeee 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Book.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Book.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Book : ContentItem diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/CompanyHealthInsurance.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/CompanyHealthInsurance.cs index 4813c2b185..7b2a38715d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/CompanyHealthInsurance.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/CompanyHealthInsurance.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class CompanyHealthInsurance : HealthInsurance diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/ContentItem.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/ContentItem.cs index 7eca0cab9a..17c3683ae8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/ContentItem.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/ContentItem.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public abstract class ContentItem : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/FamilyHealthInsurance.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/FamilyHealthInsurance.cs index 66a9d2b1df..aaefbbf074 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/FamilyHealthInsurance.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/FamilyHealthInsurance.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class FamilyHealthInsurance : HealthInsurance diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/HealthInsurance.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/HealthInsurance.cs index eeaef53aa9..e4a2588e8a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/HealthInsurance.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/HealthInsurance.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public abstract class HealthInsurance : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Human.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Human.cs index afcb4a75c0..684d8d4bd2 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Human.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Human.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public abstract class Human : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Man.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Man.cs index 7c0acfaa35..2621c7008f 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Man.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Man.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Man : Human diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Video.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Video.cs index dc34ebaf6c..2c315151dc 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Video.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Video.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Video : ContentItem diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Woman.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Woman.cs index 29007907a8..b66f965666 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Woman.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Models/Woman.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceInheritance.Models +namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance.Models { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Woman : Human diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Bed.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Bed.cs index a576e6c903..286b6bca66 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Bed.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Bed.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Bed : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpDeleteController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpDeleteController.cs index 1c0761bc83..18d753341e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpDeleteController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpDeleteController.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [NoHttpDelete] [DisableQueryString(JsonApiQueryStringParameters.Sort | JsonApiQueryStringParameters.Page)] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpPatchController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpPatchController.cs index 3434d518f1..b3b2e5f55c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpPatchController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpPatchController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [NoHttpPatch] public sealed class BlockingHttpPatchController : JsonApiController diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpPostController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpPostController.cs index 5adecb42fe..1dd6a8f401 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpPostController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingHttpPostController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [NoHttpPost] public sealed class BlockingHttpPostController : JsonApiController diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingWritesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingWritesController.cs index f281ae0ff0..b5cd00e10d 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingWritesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BlockingWritesController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [HttpReadOnly] [DisableQueryString("skipCache")] diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Chair.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Chair.cs index 4f58b57233..d133b847ce 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Chair.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Chair.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Chair : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/DisableQueryStringTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/DisableQueryStringTests.cs index c959863bca..e99ee891f8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/DisableQueryStringTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/DisableQueryStringTests.cs @@ -4,18 +4,17 @@ using FluentAssertions; using JsonApiDotNetCore.QueryStrings; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { - public sealed class DisableQueryStringTests : IClassFixture, RestrictionDbContext>> + public sealed class DisableQueryStringTests : IClassFixture, RestrictionDbContext>> { - private readonly ExampleIntegrationTestContext, RestrictionDbContext> _testContext; + private readonly IntegrationTestContext, RestrictionDbContext> _testContext; - public DisableQueryStringTests(ExampleIntegrationTestContext, RestrictionDbContext> testContext) + public DisableQueryStringTests(IntegrationTestContext, RestrictionDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/HttpReadOnlyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/HttpReadOnlyTests.cs index 03a726ab4e..b8894c852e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/HttpReadOnlyTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/HttpReadOnlyTests.cs @@ -3,18 +3,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { - public sealed class HttpReadOnlyTests : IClassFixture, RestrictionDbContext>> + public sealed class HttpReadOnlyTests : IClassFixture, RestrictionDbContext>> { - private readonly ExampleIntegrationTestContext, RestrictionDbContext> _testContext; + private readonly IntegrationTestContext, RestrictionDbContext> _testContext; private readonly RestrictionFakers _fakers = new(); - public HttpReadOnlyTests(ExampleIntegrationTestContext, RestrictionDbContext> testContext) + public HttpReadOnlyTests(IntegrationTestContext, RestrictionDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpDeleteTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpDeleteTests.cs index d04a93fe6e..88917b3fd8 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpDeleteTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpDeleteTests.cs @@ -3,18 +3,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { - public sealed class NoHttpDeleteTests : IClassFixture, RestrictionDbContext>> + public sealed class NoHttpDeleteTests : IClassFixture, RestrictionDbContext>> { - private readonly ExampleIntegrationTestContext, RestrictionDbContext> _testContext; + private readonly IntegrationTestContext, RestrictionDbContext> _testContext; private readonly RestrictionFakers _fakers = new(); - public NoHttpDeleteTests(ExampleIntegrationTestContext, RestrictionDbContext> testContext) + public NoHttpDeleteTests(IntegrationTestContext, RestrictionDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpPatchTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpPatchTests.cs index 33a9695c10..1fbcbedade 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpPatchTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpPatchTests.cs @@ -3,18 +3,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { - public sealed class NoHttpPatchTests : IClassFixture, RestrictionDbContext>> + public sealed class NoHttpPatchTests : IClassFixture, RestrictionDbContext>> { - private readonly ExampleIntegrationTestContext, RestrictionDbContext> _testContext; + private readonly IntegrationTestContext, RestrictionDbContext> _testContext; private readonly RestrictionFakers _fakers = new(); - public NoHttpPatchTests(ExampleIntegrationTestContext, RestrictionDbContext> testContext) + public NoHttpPatchTests(IntegrationTestContext, RestrictionDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpPostTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpPostTests.cs index e248087b7e..b9dde5217c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpPostTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoHttpPostTests.cs @@ -3,18 +3,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { - public sealed class NoHttpPostTests : IClassFixture, RestrictionDbContext>> + public sealed class NoHttpPostTests : IClassFixture, RestrictionDbContext>> { - private readonly ExampleIntegrationTestContext, RestrictionDbContext> _testContext; + private readonly IntegrationTestContext, RestrictionDbContext> _testContext; private readonly RestrictionFakers _fakers = new(); - public NoHttpPostTests(ExampleIntegrationTestContext, RestrictionDbContext> testContext) + public NoHttpPostTests(IntegrationTestContext, RestrictionDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionDbContext.cs index c26e120450..02fd1482f1 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class RestrictionDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs index ec49c3c847..a811193dfb 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { internal sealed class RestrictionFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SkipCacheQueryStringParameterReader.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SkipCacheQueryStringParameterReader.cs index 0ec6475b15..43fe12f42a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SkipCacheQueryStringParameterReader.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SkipCacheQueryStringParameterReader.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.QueryStrings; using Microsoft.Extensions.Primitives; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { public sealed class SkipCacheQueryStringParameterReader : IQueryStringParameterReader { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Sofa.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Sofa.cs index a126d7d0cc..c34602fc18 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Sofa.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Sofa.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Sofa : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Table.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Table.cs index a9d2325ae2..8f3901bf26 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Table.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Table.cs @@ -2,7 +2,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.RestrictedControllers +namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Table : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs index aaa286c4cb..ebf88cda99 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs @@ -6,18 +6,17 @@ using System.Threading.Tasks; using FluentAssertions; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { - public sealed class ETagTests : IClassFixture, SerializationDbContext>> + public sealed class ETagTests : IClassFixture, SerializationDbContext>> { - private readonly ExampleIntegrationTestContext, SerializationDbContext> _testContext; + private readonly IntegrationTestContext, SerializationDbContext> _testContext; private readonly SerializationFakers _fakers = new(); - public ETagTests(ExampleIntegrationTestContext, SerializationDbContext> testContext) + public ETagTests(IntegrationTestContext, SerializationDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/Meeting.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/Meeting.cs index 24c7af0f2c..148391d0d4 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/Meeting.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/Meeting.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Meeting : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendee.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendee.cs index 86628469c5..410f0710d1 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendee.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendee.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class MeetingAttendee : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendeesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendeesController.cs index 683cbd8fdb..822908bc98 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendeesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendeesController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { public sealed class MeetingAttendeesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingLocation.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingLocation.cs index 0689abab13..0d48615e25 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingLocation.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingLocation.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { public sealed class MeetingLocation { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingsController.cs index c4d85da301..216b1081cd 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingsController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { public sealed class MeetingsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationDbContext.cs index 87e39675a7..31a6f3f8c6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationDbContext.cs @@ -1,7 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SerializationDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs index 95a692f5d9..3453c0f98e 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { internal sealed class SerializationFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs index e21a528917..95524efea0 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs @@ -8,21 +8,20 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.Serialization +namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization { - public sealed class SerializationTests : IClassFixture, SerializationDbContext>> + public sealed class SerializationTests : IClassFixture, SerializationDbContext>> { - private readonly ExampleIntegrationTestContext, SerializationDbContext> _testContext; + private readonly IntegrationTestContext, SerializationDbContext> _testContext; private readonly SerializationFakers _fakers = new(); - public SerializationTests(ExampleIntegrationTestContext, SerializationDbContext> testContext) + public SerializationTests(IntegrationTestContext, SerializationDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/CompaniesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/CompaniesController.cs index e330b69657..d866a48ac6 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/CompaniesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/CompaniesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { public sealed class CompaniesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Company.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Company.cs index c2cd8b7b45..dcb9f82509 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Company.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Company.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Company : Identifiable, ISoftDeletable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Department.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Department.cs index 3065f461a9..0913cbb84c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Department.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Department.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Department : Identifiable, ISoftDeletable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/DepartmentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/DepartmentsController.cs index 83a7729713..f49c4e1877 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/DepartmentsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/DepartmentsController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { public sealed class DepartmentsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/ISoftDeletable.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/ISoftDeletable.cs index 69fbbc5b45..5b575288f9 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/ISoftDeletable.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/ISoftDeletable.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public interface ISoftDeletable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs index b09bbff935..68ac5a6942 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public class SoftDeletionAwareResourceService : JsonApiResourceService diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionDbContext.cs index d46e2d3605..843e5d9aeb 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class SoftDeletionDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs index d28b21dcc5..85ddfd20e5 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { internal sealed class SoftDeletionFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs index dfe76b3050..18a6ac65cb 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs @@ -9,23 +9,22 @@ using FluentAssertions.Extensions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.AspNetCore.Authentication; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.SoftDeletion +namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion { - public sealed class SoftDeletionTests : IClassFixture, SoftDeletionDbContext>> + public sealed class SoftDeletionTests : IClassFixture, SoftDeletionDbContext>> { private static readonly DateTimeOffset SoftDeletionTime = 1.January(2001).ToDateTimeOffset(); - private readonly ExampleIntegrationTestContext, SoftDeletionDbContext> _testContext; + private readonly IntegrationTestContext, SoftDeletionDbContext> _testContext; private readonly SoftDeletionFakers _fakers = new(); - public SoftDeletionTests(ExampleIntegrationTestContext, SoftDeletionDbContext> testContext) + public SoftDeletionTests(IntegrationTestContext, SoftDeletionDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs index 207ce9305b..37f982762c 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs @@ -7,20 +7,19 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { - public sealed class EmptyGuidAsKeyTests : IClassFixture, ZeroKeyDbContext>> + public sealed class EmptyGuidAsKeyTests : IClassFixture, ZeroKeyDbContext>> { - private readonly ExampleIntegrationTestContext, ZeroKeyDbContext> _testContext; + private readonly IntegrationTestContext, ZeroKeyDbContext> _testContext; private readonly ZeroKeyFakers _fakers = new(); - public EmptyGuidAsKeyTests(ExampleIntegrationTestContext, ZeroKeyDbContext> testContext) + public EmptyGuidAsKeyTests(IntegrationTestContext, ZeroKeyDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Game.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Game.cs index 721da9d377..eb67acb164 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Game.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Game.cs @@ -5,7 +5,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Game : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/GamesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/GamesController.cs index 826e209f2e..21d9e8b7e7 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/GamesController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/GamesController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { public sealed class GamesController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Map.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Map.cs index 21ffe008a6..15b2c93491 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Map.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Map.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Map : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/MapsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/MapsController.cs index a14e5f2163..537de1425b 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/MapsController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/MapsController.cs @@ -4,7 +4,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { public sealed class MapsController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Player.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Player.cs index 3d5a6236cf..fec2c0cc08 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Player.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Player.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class Player : Identifiable diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/PlayersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/PlayersController.cs index 09269ef8d7..d22143619a 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/PlayersController.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/PlayersController.cs @@ -3,7 +3,7 @@ using JsonApiDotNetCore.Services; using Microsoft.Extensions.Logging; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { public sealed class PlayersController : JsonApiController { diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs index c00c7c64fc..a1e54cfd59 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs @@ -7,20 +7,19 @@ using FluentAssertions; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Serialization.Objects; -using JsonApiDotNetCoreExampleTests.Startups; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { - public sealed class ZeroAsKeyTests : IClassFixture, ZeroKeyDbContext>> + public sealed class ZeroAsKeyTests : IClassFixture, ZeroKeyDbContext>> { - private readonly ExampleIntegrationTestContext, ZeroKeyDbContext> _testContext; + private readonly IntegrationTestContext, ZeroKeyDbContext> _testContext; private readonly ZeroKeyFakers _fakers = new(); - public ZeroAsKeyTests(ExampleIntegrationTestContext, ZeroKeyDbContext> testContext) + public ZeroAsKeyTests(IntegrationTestContext, ZeroKeyDbContext> testContext) { _testContext = testContext; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs index d074e7b2f8..b9a32cbad7 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs @@ -3,7 +3,7 @@ // @formatter:wrap_chained_method_calls chop_always -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { [UsedImplicitly(ImplicitUseTargetFlags.Members)] public sealed class ZeroKeyDbContext : DbContext diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs index 811e3de219..9a6306bbfe 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs @@ -5,7 +5,7 @@ // @formatter:wrap_chained_method_calls chop_always // @formatter:keep_existing_linebreaks true -namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ZeroKeys +namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys { internal sealed class ZeroKeyFakers : FakerContainer { diff --git a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreExampleTests.csproj b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj similarity index 86% rename from test/JsonApiDotNetCoreTests/JsonApiDotNetCoreExampleTests.csproj rename to test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj index c670e2b662..c313e73850 100644 --- a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreExampleTests.csproj +++ b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj @@ -10,13 +10,13 @@ - + diff --git a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs index 261947f6e4..98c36e57a9 100644 --- a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs +++ b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs @@ -1,8 +1,9 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using Microsoft.EntityFrameworkCore; +using TestBuildingBlocks; -namespace JsonApiDotNetCoreExampleTests.Startups +namespace JsonApiDotNetCoreTests.Startups { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class AbsoluteLinksInApiNamespaceStartup : TestableStartup diff --git a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs index b3cd8df056..cce765bee7 100644 --- a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs +++ b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs @@ -1,8 +1,9 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using Microsoft.EntityFrameworkCore; +using TestBuildingBlocks; -namespace JsonApiDotNetCoreExampleTests.Startups +namespace JsonApiDotNetCoreTests.Startups { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class AbsoluteLinksNoNamespaceStartup : TestableStartup diff --git a/test/JsonApiDotNetCoreTests/Startups/ModelStateValidationStartup.cs b/test/JsonApiDotNetCoreTests/Startups/ModelStateValidationStartup.cs index 4a814722a8..374392ce5c 100644 --- a/test/JsonApiDotNetCoreTests/Startups/ModelStateValidationStartup.cs +++ b/test/JsonApiDotNetCoreTests/Startups/ModelStateValidationStartup.cs @@ -1,8 +1,9 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using Microsoft.EntityFrameworkCore; +using TestBuildingBlocks; -namespace JsonApiDotNetCoreExampleTests.Startups +namespace JsonApiDotNetCoreTests.Startups { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class ModelStateValidationStartup : TestableStartup diff --git a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs index 092a3c1ef1..7057ead134 100644 --- a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs +++ b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs @@ -1,8 +1,9 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using Microsoft.EntityFrameworkCore; +using TestBuildingBlocks; -namespace JsonApiDotNetCoreExampleTests.Startups +namespace JsonApiDotNetCoreTests.Startups { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class RelativeLinksInApiNamespaceStartup : TestableStartup diff --git a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs index 8623301d7a..f6bea55b88 100644 --- a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs +++ b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs @@ -1,8 +1,9 @@ using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using Microsoft.EntityFrameworkCore; +using TestBuildingBlocks; -namespace JsonApiDotNetCoreExampleTests.Startups +namespace JsonApiDotNetCoreTests.Startups { [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] public sealed class RelativeLinksNoNamespaceStartup : TestableStartup diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Configuration/DependencyContainerRegistrationTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Configuration/DependencyContainerRegistrationTests.cs index 39ce4b29d1..cc2d9566b0 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/Configuration/DependencyContainerRegistrationTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/Configuration/DependencyContainerRegistrationTests.cs @@ -2,13 +2,16 @@ using FluentAssertions; using JetBrains.Annotations; using JsonApiDotNetCore; -using JsonApiDotNetCoreExample.Startups; +using JsonApiDotNetCore.Resources; +using JsonApiDotNetCore.Resources.Annotations; using Microsoft.AspNetCore.Hosting; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using TestBuildingBlocks; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.Configuration +namespace JsonApiDotNetCoreTests.UnitTests.Configuration { public sealed class DependencyContainerRegistrationTests { @@ -72,7 +75,10 @@ private static IHostBuilder CreateValidatingHostBuilder() { IHostBuilder hostBuilder = Host.CreateDefaultBuilder().ConfigureWebHostDefaults(webBuilder => { - webBuilder.UseStartup(); + webBuilder.ConfigureServices(services => + services.AddDbContext(options => options.UseInMemoryDatabase("db"))); + + webBuilder.UseStartup>(); webBuilder.UseDefaultServiceProvider(options => { @@ -118,5 +124,23 @@ public CircularServiceB(CircularServiceA serviceA) ArgumentGuard.NotNull(serviceA, nameof(serviceA)); } } + + [UsedImplicitly(ImplicitUseTargetFlags.Members)] + private sealed class DependencyContainerRegistrationDbContext : DbContext + { + public DbSet Resources { get; set; } + + public DependencyContainerRegistrationDbContext(DbContextOptions options) + : base(options) + { + } + } + + [UsedImplicitly(ImplicitUseTargetFlags.Members)] + private sealed class Resource : Identifiable + { + [Attr] + public string Field { get; set; } + } } } diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs index 590292daa7..deceb19902 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Routing; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.Links +namespace JsonApiDotNetCoreTests.UnitTests.Links { public sealed class LinkInclusionTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs index 8eee4e52d5..9d55b6fe3c 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs @@ -1,9 +1,9 @@ using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; -using JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings; +using JsonApiDotNetCoreTests.IntegrationTests.QueryStrings; using Microsoft.Extensions.Logging.Abstractions; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public abstract class BaseParseTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/DefaultsParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/DefaultsParseTests.cs index d790bac795..f775273cbb 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/DefaultsParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/DefaultsParseTests.cs @@ -9,7 +9,7 @@ using Newtonsoft.Json; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public sealed class DefaultsParseTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs index 228ddedbb3..b628a06167 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs @@ -13,7 +13,7 @@ using JsonApiDotNetCore.Resources; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public sealed class FilterParseTests : BaseParseTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs index dcb1ce2557..30af87ab5c 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs @@ -12,7 +12,7 @@ using JsonApiDotNetCore.QueryStrings.Internal; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public sealed class IncludeParseTests : BaseParseTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs index 94e473a7d1..1c447a297a 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs @@ -9,10 +9,10 @@ using JsonApiDotNetCore.Queries.Expressions; using JsonApiDotNetCore.QueryStrings.Internal; using JsonApiDotNetCore.Resources; -using JsonApiDotNetCoreExampleTests.IntegrationTests.QueryStrings; +using JsonApiDotNetCoreTests.IntegrationTests.QueryStrings; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public sealed class LegacyFilterParseTests : BaseParseTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/NullsParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/NullsParseTests.cs index 63a7d5ed77..c5e83833b9 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/NullsParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/NullsParseTests.cs @@ -9,7 +9,7 @@ using Newtonsoft.Json; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public sealed class NullsParseTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/PaginationParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/PaginationParseTests.cs index f188a00ace..71afbca69f 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/PaginationParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/PaginationParseTests.cs @@ -12,7 +12,7 @@ using JsonApiDotNetCore.QueryStrings.Internal; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public sealed class PaginationParseTests : BaseParseTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs index 27d2262123..b5776bfbbf 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs @@ -11,7 +11,7 @@ using JsonApiDotNetCore.QueryStrings.Internal; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public sealed class SortParseTests : BaseParseTests { diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SparseFieldSetParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SparseFieldSetParseTests.cs index 41b7672d08..fb017cfd9b 100644 --- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SparseFieldSetParseTests.cs +++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SparseFieldSetParseTests.cs @@ -11,7 +11,7 @@ using JsonApiDotNetCore.QueryStrings.Internal; using Xunit; -namespace JsonApiDotNetCoreExampleTests.UnitTests.QueryStringParameters +namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters { public sealed class SparseFieldSetParseTests : BaseParseTests { diff --git a/test/TestBuildingBlocks/BaseIntegrationTestContext.cs b/test/TestBuildingBlocks/IntegrationTestContext.cs similarity index 84% rename from test/TestBuildingBlocks/BaseIntegrationTestContext.cs rename to test/TestBuildingBlocks/IntegrationTestContext.cs index 2e87eded6b..b690374c93 100644 --- a/test/TestBuildingBlocks/BaseIntegrationTestContext.cs +++ b/test/TestBuildingBlocks/IntegrationTestContext.cs @@ -1,9 +1,11 @@ using System; using System.Net.Http; using System.Threading.Tasks; +using JetBrains.Annotations; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.AspNetCore.TestHost; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -17,30 +19,27 @@ namespace TestBuildingBlocks /// before/after each test). See for details on shared context usage. /// /// - /// The server Startup class, which can be defined in the test project. - /// - /// - /// The base class for , which MUST be defined in the API project. + /// The server Startup class, which can be defined in the test project or API project. /// /// - /// The EF Core database context, which can be defined in the test project. + /// The EF Core database context, which can be defined in the test project or API project. /// - public abstract class BaseIntegrationTestContext : IntegrationTest, IDisposable + [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)] + public class IntegrationTestContext : IntegrationTest, IDisposable where TStartup : class - where TRemoteStartup : class where TDbContext : DbContext { - private readonly Lazy> _lazyFactory; + private readonly Lazy> _lazyFactory; private readonly TestControllerProvider _testControllerProvider = new(); private Action _loggingConfiguration; private Action _beforeServicesConfiguration; private Action _afterServicesConfiguration; - public WebApplicationFactory Factory => _lazyFactory.Value; + public WebApplicationFactory Factory => _lazyFactory.Value; - protected BaseIntegrationTestContext() + public IntegrationTestContext() { - _lazyFactory = new Lazy>(CreateFactory); + _lazyFactory = new Lazy>(CreateFactory); } public void UseController() @@ -54,7 +53,7 @@ protected override HttpClient CreateClient() return Factory.CreateClient(); } - private WebApplicationFactory CreateFactory() + private WebApplicationFactory CreateFactory() { string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres"; string dbConnectionString = $"Host=localhost;Port=5432;Database=JsonApiTest-{Guid.NewGuid():N};User ID=postgres;Password={postgresPassword}"; @@ -89,11 +88,16 @@ private WebApplicationFactory CreateFactory() factory.ConfigureServicesAfterStartup(_afterServicesConfiguration); - using IServiceScope scope = factory.Services.CreateScope(); + // We have placed an appsettings.json in the TestBuildingBlock project folder and set the content root to there. Note that controllers + // are not discovered in the content root but are registered manually using IntegrationTestContext.UseController. + WebApplicationFactory factoryWithConfiguredContentRoot = + factory.WithWebHostBuilder(builder => builder.UseSolutionRelativeContentRoot("test/" + nameof(TestBuildingBlocks))); + + using IServiceScope scope = factoryWithConfiguredContentRoot.Services.CreateScope(); var dbContext = scope.ServiceProvider.GetRequiredService(); dbContext.Database.EnsureCreated(); - return factory; + return factoryWithConfiguredContentRoot; } public void Dispose() @@ -126,7 +130,7 @@ public async Task RunOnDatabaseAsync(Func asyncAction) await asyncAction(dbContext); } - private sealed class IntegrationTestWebApplicationFactory : WebApplicationFactory + private sealed class IntegrationTestWebApplicationFactory : WebApplicationFactory { private Action _loggingConfiguration; private Action _beforeServicesConfiguration; diff --git a/test/JsonApiDotNetCoreTests/Startups/TestableStartup.cs b/test/TestBuildingBlocks/TestableStartup.cs similarity index 71% rename from test/JsonApiDotNetCoreTests/Startups/TestableStartup.cs rename to test/TestBuildingBlocks/TestableStartup.cs index ed5272d2c0..93705dfb2d 100644 --- a/test/JsonApiDotNetCoreTests/Startups/TestableStartup.cs +++ b/test/TestBuildingBlocks/TestableStartup.cs @@ -1,5 +1,4 @@ using JsonApiDotNetCore.Configuration; -using JsonApiDotNetCoreExample.Startups; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; @@ -8,12 +7,12 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace JsonApiDotNetCoreExampleTests.Startups +namespace TestBuildingBlocks { - public class TestableStartup : EmptyStartup + public class TestableStartup where TDbContext : DbContext { - public override void ConfigureServices(IServiceCollection services) + public virtual void ConfigureServices(IServiceCollection services) { services.AddJsonApi(SetJsonApiOptions); } @@ -25,7 +24,7 @@ protected virtual void SetJsonApiOptions(JsonApiOptions options) options.SerializerSettings.Converters.Add(new StringEnumConverter()); } - public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory) + public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory) { app.UseRouting(); app.UseJsonApi(); diff --git a/test/TestBuildingBlocks/appsettings.json b/test/TestBuildingBlocks/appsettings.json new file mode 100644 index 0000000000..160ba78e0f --- /dev/null +++ b/test/TestBuildingBlocks/appsettings.json @@ -0,0 +1,11 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Warning", + "Microsoft.Hosting.Lifetime": "Warning", + "Microsoft.EntityFrameworkCore.Update": "Critical", + "Microsoft.EntityFrameworkCore.Database.Command": "Critical", + "JsonApiDotNetCore.Middleware.JsonApiMiddleware": "Information" + } + } +} diff --git a/test/UnitTests/Builders/ResourceGraphBuilderTests.cs b/test/UnitTests/Builders/ResourceGraphBuilderTests.cs index d17c2ac432..69e5efe56f 100644 --- a/test/UnitTests/Builders/ResourceGraphBuilderTests.cs +++ b/test/UnitTests/Builders/ResourceGraphBuilderTests.cs @@ -20,9 +20,9 @@ public void Can_Build_ResourceGraph_Using_Builder() // Arrange var services = new ServiceCollection(); services.AddLogging(); - services.AddDbContext(); + services.AddDbContext(); - services.AddJsonApi(resources: builder => builder.Add("nonDbResources")); + services.AddJsonApi(resources: builder => builder.Add("nonDbResources")); // Act ServiceProvider container = services.BuildServiceProvider(); @@ -90,7 +90,7 @@ private sealed class DbResource : Identifiable } [UsedImplicitly(ImplicitUseTargetFlags.Members)] - private sealed class TestContext : DbContext + private sealed class TestDbContext : DbContext { public DbSet DbResources { get; set; } diff --git a/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs b/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs index 5cb26ff134..2d24270655 100644 --- a/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs +++ b/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs @@ -13,8 +13,6 @@ using JsonApiDotNetCore.Resources; using JsonApiDotNetCore.Resources.Annotations; using JsonApiDotNetCore.Services; -using JsonApiDotNetCoreExample.Data; -using JsonApiDotNetCoreExample.Models; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Xunit; @@ -29,8 +27,8 @@ public void RegisterResource_DeviatingDbContextPropertyName_RegistersCorrectly() // Arrange var services = new ServiceCollection(); services.AddLogging(); - services.AddDbContext(options => options.UseInMemoryDatabase("UnitTestDb")); - services.AddJsonApi(); + services.AddDbContext(options => options.UseInMemoryDatabase("UnitTestDb")); + services.AddJsonApi(); // Act // this is required because the DbContextResolver requires access to the current HttpContext @@ -169,12 +167,12 @@ public void AddJsonApi_With_Context_Uses_Resource_Type_Name_If_NoOtherSpecified( // Arrange var services = new ServiceCollection(); services.AddLogging(); - services.AddDbContext(options => options.UseInMemoryDatabase(Guid.NewGuid().ToString())); + services.AddDbContext(options => options.UseInMemoryDatabase(Guid.NewGuid().ToString())); services.AddScoped(); // Act - services.AddJsonApi(); + services.AddJsonApi(); // Assert ServiceProvider provider = services.BuildServiceProvider(); @@ -589,14 +587,20 @@ public void OnSerialize(GuidResource resource) } [UsedImplicitly(ImplicitUseTargetFlags.Members)] - private sealed class TestContext : DbContext + private sealed class TestDbContext : DbContext { public DbSet Resource { get; set; } + public DbSet People { get; set; } - public TestContext(DbContextOptions options) + public TestDbContext(DbContextOptions options) : base(options) { } } + + [UsedImplicitly(ImplicitUseKindFlags.Access)] + private sealed class Person : Identifiable + { + } } } diff --git a/test/UnitTests/Internal/RequestScopedServiceProviderTests.cs b/test/UnitTests/Internal/RequestScopedServiceProviderTests.cs index 0e512241b8..4da96708b0 100644 --- a/test/UnitTests/Internal/RequestScopedServiceProviderTests.cs +++ b/test/UnitTests/Internal/RequestScopedServiceProviderTests.cs @@ -1,7 +1,7 @@ using System; +using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Resources; -using JsonApiDotNetCoreExample.Models; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Xunit; @@ -14,7 +14,7 @@ public sealed class RequestScopedServiceProviderTests public void When_http_context_is_unavailable_it_must_fail() { // Arrange - Type serviceType = typeof(IIdentifiable); + Type serviceType = typeof(IIdentifiable); var provider = new RequestScopedServiceProvider(new HttpContextAccessor()); @@ -26,5 +26,10 @@ public void When_http_context_is_unavailable_it_must_fail() Assert.StartsWith("Cannot resolve scoped service " + $"'{serviceType.FullName}' outside the context of an HTTP request.", exception.Message); } + + [UsedImplicitly(ImplicitUseTargetFlags.Itself)] + private sealed class Model : Identifiable + { + } } } diff --git a/test/UnitTests/Internal/ResourceGraphBuilderTests.cs b/test/UnitTests/Internal/ResourceGraphBuilderTests.cs index 2b64b34974..2c2b391a8b 100644 --- a/test/UnitTests/Internal/ResourceGraphBuilderTests.cs +++ b/test/UnitTests/Internal/ResourceGraphBuilderTests.cs @@ -20,7 +20,7 @@ public void AddDbContext_Does_Not_Throw_If_Context_Contains_Members_That_Do_Not_ var resourceGraphBuilder = new ResourceGraphBuilder(new JsonApiOptions(), NullLoggerFactory.Instance); // Act - resourceGraphBuilder.Add(typeof(TestContext)); + resourceGraphBuilder.Add(typeof(TestDbContext)); var resourceGraph = (ResourceGraph)resourceGraphBuilder.Build(); // Assert @@ -33,7 +33,7 @@ public void Adding_DbContext_Members_That_Do_Not_Implement_IIdentifiable_Logs_Wa // Arrange var loggerFactory = new FakeLoggerFactory(LogLevel.Warning); var resourceGraphBuilder = new ResourceGraphBuilder(new JsonApiOptions(), loggerFactory); - resourceGraphBuilder.Add(typeof(TestContext)); + resourceGraphBuilder.Add(typeof(TestDbContext)); // Act resourceGraphBuilder.Build(); @@ -42,7 +42,7 @@ public void Adding_DbContext_Members_That_Do_Not_Implement_IIdentifiable_Logs_Wa Assert.Single(loggerFactory.Logger.Messages); Assert.Equal(LogLevel.Warning, loggerFactory.Logger.Messages.Single().LogLevel); - Assert.Equal("Entity 'UnitTests.Internal.ResourceGraphBuilderTests+TestContext' does not implement 'IIdentifiable'.", + Assert.Equal("Entity 'UnitTests.Internal.ResourceGraphBuilderTests+TestDbContext' does not implement 'IIdentifiable'.", loggerFactory.Logger.Messages.Single().Text); } @@ -84,7 +84,7 @@ private sealed class Foo } [UsedImplicitly(ImplicitUseTargetFlags.Members)] - private sealed class TestContext : DbContext + private sealed class TestDbContext : DbContext { public DbSet Foos { get; set; } } diff --git a/test/UnitTests/Middleware/JsonApiRequestTests.cs b/test/UnitTests/Middleware/JsonApiRequestTests.cs index a225522b0f..c1b172662f 100644 --- a/test/UnitTests/Middleware/JsonApiRequestTests.cs +++ b/test/UnitTests/Middleware/JsonApiRequestTests.cs @@ -1,11 +1,14 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; using FluentAssertions; +using JetBrains.Annotations; using JsonApiDotNetCore.Configuration; using JsonApiDotNetCore.Middleware; -using JsonApiDotNetCoreExample.Models; +using JsonApiDotNetCore.Resources; +using JsonApiDotNetCore.Resources.Annotations; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc.Controllers; @@ -115,5 +118,27 @@ private static void SetupRoutes(HttpContext httpContext, string requestMethod, s httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(controllerActionDescriptor), null)); } + + [UsedImplicitly(ImplicitUseTargetFlags.Itself)] + private sealed class Person : Identifiable + { + } + + [UsedImplicitly(ImplicitUseTargetFlags.Members)] + private sealed class Tag : Identifiable + { + [HasMany] + public ISet TodoItems { get; set; } + } + + [UsedImplicitly(ImplicitUseTargetFlags.Members)] + private sealed class TodoItem : Identifiable + { + [HasOne] + public Person Owner { get; set; } + + [HasMany] + public ISet Tags { get; set; } + } } } diff --git a/test/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj index 5c395abb89..32694ac90f 100644 --- a/test/UnitTests/UnitTests.csproj +++ b/test/UnitTests/UnitTests.csproj @@ -10,7 +10,6 @@ -