minor crime fixed

Author: StuartFerguson

EstateReportingAPI.IntegrationTests/ControllerTestsBase.cs

@@ -19,32 +19,13 @@ public abstract class ControllerTestsBase : IAsyncLifetime
     protected List<String> merchantsList;
     protected List<(String contract, String operatorname)> contractList;
     protected Dictionary<String, List<String>> contractProducts;
-
+    protected DatabaseHelper helper;
     public virtual async Task InitializeAsync()
     {
-        await this.SetupStandingData();
-    }
-
-    public virtual async Task DisposeAsync()
-    {
-    }
-
-    protected DatabaseHelper helper;
-
-    protected EstateManagementGenericContext context;
-
-    protected abstract Task ClearStandingData();
-    protected abstract Task SetupStandingData();
-
-    protected readonly HttpClient Client;
-    protected readonly CustomWebApplicationFactory<Startup> factory;
-
-    protected readonly Guid TestId;
+        this.TestId = Guid.NewGuid();
 
-    public ControllerTestsBase(){
-       this.StartSqlContainer();
+        await this.StartSqlContainer();
 
-        this.TestId = Guid.NewGuid();
         String dbConnString = GetLocalConnectionString($"EstateReportingReadModel{this.TestId}");
 
         this.factory = new CustomWebApplicationFactory<Startup>(dbConnString);
@@ -53,8 +34,24 @@ public ControllerTestsBase(){
         this.context = new EstateManagementSqlServerContext(GetLocalConnectionString($"EstateReportingReadModel{this.TestId.ToString()}"));
 
         this.helper = new DatabaseHelper(context);
+
+        await this.SetupStandingData();
     }
 
+    public virtual async Task DisposeAsync()
+    {
+    }
+    
+    protected EstateManagementGenericContext context;
+
+    protected abstract Task ClearStandingData();
+    protected abstract Task SetupStandingData();
+
+    protected HttpClient Client;
+    protected CustomWebApplicationFactory<Startup> factory;
+
+    protected Guid TestId;
+    
     internal async Task<T?> CreateAndSendHttpRequestMessage<T>(String url, CancellationToken cancellationToken)
     {
         HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
@@ -78,7 +75,7 @@ public static String GetLocalConnectionString(String databaseName)
         return $"server=localhost,{databaseHostPort};database={databaseName};user id={SqlCredentials.usename};password={SqlCredentials.password};Encrypt=false";
     }
 
-    internal void StartSqlContainer(){
+    internal async Task StartSqlContainer(){
         DockerHelper dockerHelper = new TestDockerHelper();
 
         NlogLogger logger = new NlogLogger();
@@ -87,9 +84,10 @@ internal void StartSqlContainer(){
         dockerHelper.Logger = logger;
         dockerHelper.SqlCredentials = SqlCredentials;
         dockerHelper.SqlServerContainerName = "sharedsqlserver";
+        dockerHelper.RequiredDockerServices = DockerServices.SqlServer;
 
         DatabaseServerNetwork = dockerHelper.SetupTestNetwork("sharednetwork", true);
-        Retry.For(async () => {
+        await Retry.For(async () => {
                       DatabaseServerContainer = await dockerHelper.SetupSqlServerContainer(DatabaseServerNetwork);
                   });
     }

EstateReportingAPI.IntegrationTests/DimensionControllerTests.cs

@@ -14,13 +14,6 @@
 using ResponseCode = DataTrasferObjects.ResponseCode;
 
 public class DimensionsControllerTests :ControllerTestsBase{
-    private DatabaseHelper helper;
-    public DimensionsControllerTests(){
-        EstateManagementGenericContext context = new EstateManagementSqlServerContext(GetLocalConnectionString($"EstateReportingReadModel{this.TestId.ToString()}"));
-
-        this.helper = new DatabaseHelper(context);
-    }
-
 
     [Fact]
     public async Task DimensionsController_GetCalendarYears_NoDataInDatabase(){

EstateReportingAPI.IntegrationTests/FactSettlementsControllerTests.cs

@@ -11,12 +11,12 @@
     public class FactSettlementsControllerTests : ControllerTestsBase
     {
         protected override async Task ClearStandingData(){
-        await this.helper.DeleteAllContracts();
-        await this.helper.DeleteAllEstateOperator();
-        await this.helper.DeleteAllMerchants();
-    }
+            await this.helper.DeleteAllContracts();
+            await this.helper.DeleteAllEstateOperator();
+            await this.helper.DeleteAllMerchants();
+        }
 
-    protected override async Task SetupStandingData(){
+        protected override async Task SetupStandingData(){
         // Estates
         await helper.AddEstate("Test Estate", "Ref1");