Refactoring fixtures

DEFRA · Jan 3, 2025 · 0ce82d6 · 0ce82d6
1 parent 534daff
commit 0ce82d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Btms.Backend.IntegrationTests/DecisionTests/ChedPSimpleTests.cs b/Btms.Backend.IntegrationTests/DecisionTests/ChedPSimpleTests.cs
@@ -16,14 +16,9 @@ namespace Btms.Backend.IntegrationTests.DecisionTests;
 // public class ChedPSimpleTests(InMemoryScenarioApplicationFactory<SimpleMatchScenarioGenerator> factory, ITestOutputHelper testOutputHelper)
 //     : BaseApiTests(factory, testOutputHelper, "DecisionTests"), IClassFixture<InMemoryScenarioApplicationFactory<SimpleMatchScenarioGenerator>>
 
-public class ChedPSimpleTests(ITestOutputHelper testOutputHelper,
+public class ChedPSimpleTests(ITestOutputHelper testOutputHelper, BackendFixture backendFixture, TestGeneratorFixture generatorFixture)
     // BackendGeneratorFixture<CrNoMatchSingleItemWithDecisionScenarioGenerator> backendGeneratorFixture)
-    BackendFixture<SimpleMatchScenarioGenerator> backendFixture,
-    TestGeneratorFixture<SimpleMatchScenarioGenerator> generatorFixture)
-    : BaseTest<SimpleMatchScenarioGenerator>(testOutputHelper, generatorFixture, backendFixture),
-        IClassFixture<BackendFixture<SimpleMatchScenarioGenerator>>,
-        IClassFixture<TestGeneratorFixture<SimpleMatchScenarioGenerator>>
-
+    : BaseTest<SimpleMatchScenarioGenerator>(testOutputHelper, generatorFixture, backendFixture)
 {
 
     [Fact]

diff --git a/TestGenerator.IntegrationTesting.Backend/BaseTest.cs b/TestGenerator.IntegrationTesting.Backend/BaseTest.cs
@@ -21,18 +21,19 @@ protected BaseTest(ITestOutputHelper testOutputHelper,
         BackendFixture backendFixture
     )
     {
-        Client = backendFixture.BtmsClient;
         TestGeneratorFixture = testGeneratorFixture;
         BackendFixture = backendFixture;
 
         // Client = backendGeneratorFixture.Backend.BtmsClient;
         // TestGeneratorFixture = backendGeneratorFixture.TestGenerator;
         // BackendFixture = backendGeneratorFixture.Backend;
         TestOutputHelper = testOutputHelper;
+
         backendFixture.TestOutputHelper = testOutputHelper;
         backendFixture.DatabaseName = GetType().Name;
         backendFixture.Init(GetType().Name);
 
+        Client = backendFixture.BtmsClient;
 
         var data = TestGeneratorFixture.GenerateTestData<T>();
         LoadedData = BackendFixture