Skip to content

Commit a6a2d15

Browse files
committed
Switch SQLServer tests
1 parent a726680 commit a6a2d15

File tree

2 files changed

+17
-30
lines changed

2 files changed

+17
-30
lines changed
Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,36 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Data.SqlClient;
4-
using Docker.Testify;
2+
using System.Threading.Tasks;
3+
using Squadron;
54
using Xunit;
65

76
namespace WorkflowCore.Tests.SqlServer
87
{
9-
public class SqlDockerSetup : DockerSetup
8+
public class SqlDockerSetup : IAsyncLifetime
109
{
10+
private readonly SqlServerResource _sqlServerResource;
1111
public static string ConnectionString { get; set; }
1212
public static string ScenarioConnectionString { get; set; }
1313

14-
public override string ImageName => "mcr.microsoft.com/mssql/server";
15-
public override int InternalPort => 1433;
16-
public override TimeSpan TimeOut => TimeSpan.FromSeconds(120);
17-
18-
public const string SqlPassword = "I@mJustT3st1ing";
19-
20-
public override IList<string> EnvironmentVariables => new List<string> {"ACCEPT_EULA=Y", $"SA_PASSWORD={SqlPassword}"};
21-
22-
public override void PublishConnectionInfo()
14+
public SqlDockerSetup()
2315
{
24-
ConnectionString = $"Server=127.0.0.1,{ExternalPort};Database=workflowcore-tests;User Id=sa;Password={SqlPassword};";
25-
ScenarioConnectionString = $"Server=127.0.0.1,{ExternalPort};Database=workflowcore-scenario-tests;User Id=sa;Password={SqlPassword};";
16+
_sqlServerResource = new SqlServerResource();
2617
}
2718

28-
public override bool TestReady()
19+
public async Task InitializeAsync()
2920
{
30-
try
31-
{
32-
var client = new SqlConnection($"Server=127.0.0.1,{ExternalPort};Database=master;User Id=sa;Password={SqlPassword};");
33-
client.Open();
34-
client.Close();
35-
return true;
36-
}
37-
catch
38-
{
39-
return false;
40-
}
21+
await _sqlServerResource.InitializeAsync();
22+
ConnectionString = _sqlServerResource.CreateConnectionString("workflowcore-tests");
23+
ScenarioConnectionString = _sqlServerResource.CreateConnectionString("workflowcore-scenario-tests");
24+
}
4125

26+
public Task DisposeAsync()
27+
{
28+
return _sqlServerResource.DisposeAsync();
4229
}
4330
}
4431

4532
[CollectionDefinition("SqlServer collection")]
4633
public class SqlServerCollection : ICollectionFixture<SqlDockerSetup>
4734
{
4835
}
49-
5036
}

test/WorkflowCore.Tests.SqlServer/WorkflowCore.Tests.SqlServer.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
<ItemGroup>
44
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
5-
<PackageReference Include="xunit" Version="2.3.1" />
6-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
5+
<PackageReference Include="xunit" Version="2.4.1" />
6+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
7+
<PackageReference Include="Squadron.SqlServer" Version="0.17.0" />
78
</ItemGroup>
89

910
<ItemGroup>

0 commit comments

Comments
 (0)