diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj
index 38943a0..695911b 100644
--- a/MessagingService.Client/MessagingService.Client.csproj
+++ b/MessagingService.Client/MessagingService.Client.csproj
@@ -6,9 +6,9 @@
-
+
-
+
diff --git a/MessagingService.Client/MessagingServiceClient.cs b/MessagingService.Client/MessagingServiceClient.cs
index 9d63bda..62c29f0 100644
--- a/MessagingService.Client/MessagingServiceClient.cs
+++ b/MessagingService.Client/MessagingServiceClient.cs
@@ -43,7 +43,7 @@ public async Task SendEmail(String accessToken,
try
{
- Result> result = await this.SendPostRequest>(requestUri, accessToken, sendEmailRequest, cancellationToken);
+ Result> result = await this.SendHttpPostRequest>(requestUri, sendEmailRequest, accessToken, cancellationToken);
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
@@ -65,7 +65,7 @@ public async Task ResendEmail(String accessToken,
String requestUri = this.BuildRequestUrl("/api/email/resend");
try {
- Result> result = await this.SendPostRequest>(requestUri, accessToken, resendEmailRequest, cancellationToken);
+ Result> result = await this.SendHttpPostRequest>(requestUri, resendEmailRequest, accessToken, cancellationToken);
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
@@ -88,7 +88,7 @@ public async Task SendSMS(String accessToken,
try
{
- Result> result = await this.SendPostRequest>(requestUri, accessToken, sendSMSRequest, cancellationToken);
+ Result> result = await this.SendHttpPostRequest>(requestUri, sendSMSRequest, accessToken, cancellationToken);
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
index e1d967a..4c243ef 100644
--- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
+++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
index 36ed7e0..7abb890 100644
--- a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
+++ b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
index d93bdd6..6ee5073 100644
--- a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
+++ b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj b/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj
index b3ac028..ee9c882 100644
--- a/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj
+++ b/MessagingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/MessagingService.IntegrationTests/Common/DockerHelper.cs b/MessagingService.IntegrationTests/Common/DockerHelper.cs
index 6be51e8..85835e3 100644
--- a/MessagingService.IntegrationTests/Common/DockerHelper.cs
+++ b/MessagingService.IntegrationTests/Common/DockerHelper.cs
@@ -23,7 +23,7 @@ namespace MessagingService.IntegrationTests.Common
///
///
///
- public class DockerHelper : global::Shared.IntegrationTesting.DockerHelper
+ public class DockerHelper : global::Shared.IntegrationTesting.TestContainers.DockerHelper
{
#region Fields
diff --git a/MessagingService.IntegrationTests/Common/GenericSteps.cs b/MessagingService.IntegrationTests/Common/GenericSteps.cs
index f11eb6f..cae43ea 100644
--- a/MessagingService.IntegrationTests/Common/GenericSteps.cs
+++ b/MessagingService.IntegrationTests/Common/GenericSteps.cs
@@ -45,8 +45,6 @@ public async Task StartSystem()
await Setup.GlobalSetup(this.TestingContext.DockerHelper);
- this.TestingContext.DockerHelper.SqlServerContainer = Setup.DatabaseServerContainer;
- this.TestingContext.DockerHelper.SqlServerNetwork = Setup.DatabaseServerNetwork;
this.TestingContext.DockerHelper.DockerCredentials = Setup.DockerCredentials;
this.TestingContext.DockerHelper.SqlCredentials = Setup.SqlCredentials;
this.TestingContext.DockerHelper.SqlServerContainerName = "sharedsqlserver";
@@ -62,7 +60,7 @@ public async Task StartSystem()
[AfterScenario]
public async Task StopSystem(){
- DockerServices dockerSharedServices = DockerServices.SqlServer;
+ DockerServices dockerSharedServices = DockerServices.None;
this.TestingContext.Logger.LogInformation("About to Stop Containers for Scenario Run");
await this.TestingContext.DockerHelper.StopContainersForScenarioRun(dockerSharedServices).ConfigureAwait(false);
this.TestingContext.Logger.LogInformation("Containers for Scenario Run Stopped");
diff --git a/MessagingService.IntegrationTests/Common/Setup.cs b/MessagingService.IntegrationTests/Common/Setup.cs
index d2bac8b..0ce7bf4 100644
--- a/MessagingService.IntegrationTests/Common/Setup.cs
+++ b/MessagingService.IntegrationTests/Common/Setup.cs
@@ -14,39 +14,12 @@ namespace MessagingService.IntegrationTests.Common
[Binding]
public class Setup
{
- public static IContainerService DatabaseServerContainer;
- public static INetworkService DatabaseServerNetwork;
public static (String usename, String password) SqlCredentials = ("sa", "thisisalongpassword123!");
public static (String url, String username, String password) DockerCredentials = ("https://www.docker.com", "stuartferguson", "Sc0tland");
- static object padLock = new object(); // Object to lock on
-
+
public static async Task GlobalSetup(DockerHelper dockerHelper)
{
ShouldlyConfiguration.DefaultTaskTimeout = TimeSpan.FromMinutes(1);
- dockerHelper.SqlCredentials = Setup.SqlCredentials;
- dockerHelper.DockerCredentials = Setup.DockerCredentials;
- dockerHelper.SqlServerContainerName = "sharedsqlserver";
-
- // Only one thread can execute this block at a time
- lock (Setup.padLock)
- {
- Setup.DatabaseServerNetwork = dockerHelper.SetupTestNetwork("sharednetwork");
-
- dockerHelper.Logger.LogInformation("in start SetupSqlServerContainer");
- Setup.DatabaseServerContainer = dockerHelper.SetupSqlServerContainer(Setup.DatabaseServerNetwork).Result;
- }
- }
-
- public static String GetConnectionString(String databaseName)
- {
- return $"server={Setup.DatabaseServerContainer.Name};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
- }
-
- public static String GetLocalConnectionString(String databaseName)
- {
- Int32 databaseHostPort = Setup.DatabaseServerContainer.ToHostExposedEndpoint("1433/tcp").Port;
-
- return $"server=localhost,{databaseHostPort};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
}
}
}
diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
index 14ba96f..dfebc63 100644
--- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
+++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
@@ -6,7 +6,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
all
diff --git a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
index 5637812..aa4d6a7 100644
--- a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
+++ b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
index 13cc55c..a7a7046 100644
--- a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
+++ b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj
index 0fb2325..8b2a8d5 100644
--- a/MessagingService/MessagingService.csproj
+++ b/MessagingService/MessagingService.csproj
@@ -18,13 +18,13 @@
-
-
+
+
-
-
+
+