Switch postgress and mongo tests to Squadron

Author: glucaci

test/WorkflowCore.Tests.MongoDB/MongoDockerSetup.cs

@@ -1,46 +1,37 @@
 using System;
-using Docker.Testify;
+using System.Threading.Tasks;
 using MongoDB.Bson;
-using MongoDB.Driver;
+using Squadron;
 using Xunit;
 
 namespace WorkflowCore.Tests.MongoDB
 {    
-    public class MongoDockerSetup : DockerSetup
+    public class MongoDockerSetup : IAsyncLifetime
     {
+        private readonly MongoResource _mongoResource;
         public static string ConnectionString { get; set; }
 
-        public override string ImageName => "mongo";
-        public override int InternalPort => 27017;
-
-        public override void PublishConnectionInfo()
+        public MongoDockerSetup()
         {
-            ConnectionString = $"mongodb://localhost:{ExternalPort}";
+            _mongoResource = new MongoResource();
         }
-
-        public override bool TestReady()
+        
+        public async Task InitializeAsync()
         {
-            try
-            {
-                var client = new MongoClient($"mongodb://localhost:{ExternalPort}");
-                client.ListDatabases();
-                
-                var command = new BsonDocument { { "setParameter", 1 }, { "notablescan", 1 } };
-                client.GetDatabase("admin").RunCommand<BsonDocument>(command);
-                
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
+            await _mongoResource.InitializeAsync();
+            var command = new BsonDocument { { "setParameter", 1 }, { "notablescan", 1 } };
+            _mongoResource.Client.GetDatabase("admin").RunCommand<BsonDocument>(command);
+            ConnectionString = _mongoResource.ConnectionString;
+        }
 
+        public Task DisposeAsync()
+        {
+            return _mongoResource.DisposeAsync();
         }
     }
 
     [CollectionDefinition("Mongo collection")]
     public class MongoCollection : ICollectionFixture<MongoDockerSetup>
     {        
     }
-
 }

test/WorkflowCore.Tests.MongoDB/WorkflowCore.Tests.MongoDB.csproj

@@ -24,8 +24,9 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Squadron.Mongo" Version="0.17.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Include="MongoDB.Driver" Version="2.10.0" />
   </ItemGroup>
 

test/WorkflowCore.Tests.PostgreSQL/DockerSetup.cs

@@ -1,49 +1,36 @@
 using System;
-using System.Collections.Generic;
-using Docker.Testify;
-using Npgsql;
+using System.Threading.Tasks;
+using Squadron;
 using Xunit;
 
 namespace WorkflowCore.Tests.PostgreSQL
 {
-    public class PostgresDockerSetup : DockerSetup
+    public class PostgresDockerSetup : IAsyncLifetime
     {
+        private readonly PostgreSqlResource _postgreSqlResource;
         public static string ConnectionString { get; set; }
         public static string ScenarioConnectionString { get; set; }
 
-        public override string ImageName => "postgres";
-        public override int InternalPort => 5432;
-
-        private const string PostgresHostAuthMethod = "trust";
-        public override IList<string> EnvironmentVariables => new List<string> {
-            $"POSTGRES_HOST_AUTH_METHOD={PostgresHostAuthMethod}"
-        };
-        public override void PublishConnectionInfo()
+        public PostgresDockerSetup()
         {
-            ConnectionString = $"Server=127.0.0.1;Port={ExternalPort};Database=workflow;User Id=postgres;";
-            ScenarioConnectionString = $"Server=127.0.0.1;Port={ExternalPort};Database=workflow-scenarios;User Id=postgres;";
+            _postgreSqlResource = new PostgreSqlResource();
         }
-
-        public override bool TestReady()
+        
+        public async Task InitializeAsync()
         {
-            try
-            {
-                var connection = new NpgsqlConnection($"Server=127.0.0.1;Port={ExternalPort};Database=postgres;User Id=postgres;");
-                connection.Open();
-                connection.Close();
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
+            await _postgreSqlResource.InitializeAsync();
+            ConnectionString = _postgreSqlResource.ConnectionString;
+            ScenarioConnectionString = _postgreSqlResource.ConnectionString;
+        }
 
+        public Task DisposeAsync()
+        {
+            return _postgreSqlResource.DisposeAsync();
         }
     }
 
     [CollectionDefinition("Postgres collection")]
     public class PostgresCollection : ICollectionFixture<PostgresDockerSetup>
     {        
     }
-
 }

test/WorkflowCore.Tests.PostgreSQL/WorkflowCore.Tests.PostgreSQL.csproj

@@ -21,8 +21,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="Squadron.PostgreSql" Version="0.17.0" />
   </ItemGroup>
 
 </Project>