Stop using shared CollectionDefinition.cs

dlcs · Nov 28, 2024 · f366036 · f366036
1 parent b5c028c
commit f366036
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 18 deletions.
diff --git a/src/IIIFPresentation/API.Tests/Helpers/PresentationContextXTests.cs b/src/IIIFPresentation/API.Tests/Helpers/PresentationContextXTests.cs
@@ -1,7 +1,7 @@
 using API.Features.Storage.Helpers;
+using API.Tests.Integration.Infrastructure;
 using Repository;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 
 namespace API.Tests.Helpers;
 

diff --git a/src/IIIFPresentation/API.Tests/Integration/DeleteCollectionTests.cs b/src/IIIFPresentation/API.Tests/Integration/DeleteCollectionTests.cs
@@ -10,13 +10,12 @@
 using Repository;
 using Test.Helpers.Helpers;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 
 namespace API.Tests.Integration;
 
 [Trait("Category", "Integration")]
 [Collection(CollectionDefinitions.StorageCollection.CollectionName)]
-public class DeleteCollectionTests : IClassFixture<PresentationAppFactory<Program>>, IClassFixture<StorageFixture>
+public class DeleteCollectionTests : IClassFixture<PresentationAppFactory<Program>>
 {
     private readonly HttpClient httpClient;
 

diff --git a/src/IIIFPresentation/API.Tests/Integration/DeleteManifestTests.cs b/src/IIIFPresentation/API.Tests/Integration/DeleteManifestTests.cs
@@ -11,13 +11,12 @@
 using Repository;
 using Test.Helpers.Helpers;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 
 namespace API.Tests.Integration;
 
 [Trait("Category", "Integration")]
 [Collection(CollectionDefinitions.StorageCollection.CollectionName)]
-public class DeleteManifestTests : IClassFixture<PresentationAppFactory<Program>>, IClassFixture<StorageFixture>
+public class DeleteManifestTests : IClassFixture<PresentationAppFactory<Program>>
 {
     private readonly HttpClient httpClient;
     private readonly PresentationContext dbContext;

diff --git a/src/IIIFPresentation/API.Tests/Integration/GetCollectionTests.cs b/src/IIIFPresentation/API.Tests/Integration/GetCollectionTests.cs
@@ -7,13 +7,12 @@
 using Models.API.Collection;
 using Test.Helpers.Helpers;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 
 namespace API.Tests.Integration;
 
 [Trait("Category", "Integration")]
 [Collection(CollectionDefinitions.StorageCollection.CollectionName)]
-public class GetCollectionTests : IClassFixture<PresentationAppFactory<Program>>, IClassFixture<StorageFixture>
+public class GetCollectionTests : IClassFixture<PresentationAppFactory<Program>>
 {
     private readonly HttpClient httpClient;
     private const int TotalDatabaseChildItems = 4;

diff --git a/src/IIIFPresentation/API.Tests/Integration/GetManifestTests.cs b/src/IIIFPresentation/API.Tests/Integration/GetManifestTests.cs
@@ -7,13 +7,12 @@
 using Models.API.Manifest;
 using Microsoft.Net.Http.Headers;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 
 namespace API.Tests.Integration;
 
 [Trait("Category", "Integration")]
 [Collection(CollectionDefinitions.StorageCollection.CollectionName)]
-public class GetManifestTests : IClassFixture<PresentationAppFactory<Program>>, IClassFixture<StorageFixture>
+public class GetManifestTests : IClassFixture<PresentationAppFactory<Program>>
 {
     private readonly HttpClient httpClient;
 

diff --git a/...on/Infrastructure/CollectionDefinition.cs → ...on/Infrastructure/CollectionDefinition.cs b/...on/Infrastructure/CollectionDefinition.cs → ...on/Infrastructure/CollectionDefinition.cs
@@ -1,4 +1,6 @@
-namespace Test.Helpers.Integration.Infrastructure;
+using Test.Helpers.Integration;
+
+namespace API.Tests.Integration.Infrastructure;
 
 public class CollectionDefinitions
 {

diff --git a/src/IIIFPresentation/API.Tests/Integration/ModifyCollectionTests.cs b/src/IIIFPresentation/API.Tests/Integration/ModifyCollectionTests.cs
@@ -23,14 +23,13 @@
 using Repository;
 using Test.Helpers.Helpers;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace API.Tests.Integration;
 
 [Trait("Category", "Integration")]
 [Collection(CollectionDefinitions.StorageCollection.CollectionName)]
-public class ModifyCollectionTests : IClassFixture<PresentationAppFactory<Program>>, IClassFixture<StorageFixture>
+public class ModifyCollectionTests : IClassFixture<PresentationAppFactory<Program>>
 {
     private readonly HttpClient httpClient;
 

diff --git a/src/IIIFPresentation/API.Tests/Integration/ModifyManifestCreateTests.cs b/src/IIIFPresentation/API.Tests/Integration/ModifyManifestCreateTests.cs
@@ -16,13 +16,12 @@
 using Test.Helpers;
 using Test.Helpers.Helpers;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 
 namespace API.Tests.Integration;
 
 [Trait("Category", "Integration")]
 [Collection(CollectionDefinitions.StorageCollection.CollectionName)]
-public class ModifyManifestCreateTests : IClassFixture<PresentationAppFactory<Program>>, IClassFixture<StorageFixture>
+public class ModifyManifestCreateTests : IClassFixture<PresentationAppFactory<Program>>
 {
     private readonly HttpClient httpClient;
     private readonly PresentationContext dbContext;

diff --git a/src/IIIFPresentation/API.Tests/Integration/ModifyManifestUpdateTests.cs b/src/IIIFPresentation/API.Tests/Integration/ModifyManifestUpdateTests.cs
@@ -16,13 +16,12 @@
 using Repository;
 using Test.Helpers.Helpers;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 
 namespace API.Tests.Integration;
 
 [Trait("Category", "Integration")]
 [Collection(CollectionDefinitions.StorageCollection.CollectionName)]
-public class ModifyManifestUpdateTests : IClassFixture<PresentationAppFactory<Program>>, IClassFixture<StorageFixture>
+public class ModifyManifestUpdateTests : IClassFixture<PresentationAppFactory<Program>>
 {
     private readonly HttpClient httpClient;
     private readonly PresentationContext dbContext;

diff --git a/...sentation/BackgroundHandler.Tests/CustomerCreation/CustomerCreationMessageHandlerTests.cs b/...sentation/BackgroundHandler.Tests/CustomerCreation/CustomerCreationMessageHandlerTests.cs
@@ -1,13 +1,13 @@
 using AWS.SQS;
 using BackgroundHandler.CustomerCreation;
+using BackgroundHandler.Tests.infrastructure;
 using FluentAssertions;
 using Microsoft.Extensions.Logging.Abstractions;
 using Models.Database.General;
 using Repository;
 using Test.Helpers.Integration;
-using Test.Helpers.Integration.Infrastructure;
 
-namespace BackgroundServices.Tests.CustomerCreation;
+namespace BackgroundHandler.Tests.CustomerCreation;
 
 [Trait("Category", "Database")]
 [Collection(CollectionDefinitions.DatabaseCollection.CollectionName)]

diff --git a/src/IIIFPresentation/BackgroundHandler.Tests/infrastructure/CollectionDefinition.cs b/src/IIIFPresentation/BackgroundHandler.Tests/infrastructure/CollectionDefinition.cs
@@ -0,0 +1,12 @@
+using Test.Helpers.Integration;
+
+namespace BackgroundHandler.Tests.infrastructure;
+
+public class CollectionDefinitions
+{
+    [CollectionDefinition(CollectionName)]
+    public class DatabaseCollection : ICollectionFixture<PresentationContextFixture>
+    {
+        public const string CollectionName = "Database Collection";
+    }
+}