Skip to content

Commit e770131

Browse files
glucaciglucaci
committed
Consolidate tests projects dependencies
1 parent dac4917 commit e770131

File tree

14 files changed

+38
-87
lines changed

14 files changed

+38
-87
lines changed

‎test/Directory.Build.props

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,25 @@
44
<LangVersion>latest</LangVersion>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0"/>
10+
<PackageReference Include="xunit" Version="2.4.1"/>
11+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1"/>
12+
<PackageReference Include="FluentAssertions" Version="5.10.3" />
13+
<PackageReference Include="Moq" Version="4.7.145" />
14+
<PackageReference Include="FakeItEasy" Version="4.9.2" />
15+
</ItemGroup>
16+
17+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
18+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
24+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
27+
</ItemGroup>
728
</Project>

‎test/WorkflowCore.IntegrationTests/WorkflowCore.IntegrationTests.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
22-
<PackageReference Include="FluentAssertions" Version="4.19.4" />
23-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
24-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
25-
<PackageReference Include="Moq" Version="4.7.145" />
26-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
27-
<PackageReference Include="xunit" Version="2.3.1" />
28-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
2921
</ItemGroup>
3022

3123
<ItemGroup>

‎test/WorkflowCore.TestAssets/WorkflowCore.TestAssets.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="FluentAssertions" Version="4.19.4" />
42-
<PackageReference Include="Moq" Version="4.7.145" />
4341
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
4442
<PackageReference Include="NUnit" Version="3.6.1" />
4543
</ItemGroup>

‎test/WorkflowCore.Tests.DynamoDB/WorkflowCore.Tests.DynamoDB.csproj

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

33
<ItemGroup>
44
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.3.11" />
5-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
6-
<PackageReference Include="xunit" Version="2.4.0" />
7-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
85
</ItemGroup>
96

107
<ItemGroup>

‎test/WorkflowCore.Tests.Elasticsearch/WorkflowCore.Tests.Elasticsearch.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
54
<PackageReference Include="NEST" Version="7.14.1" />
6-
<PackageReference Include="xunit" Version="2.4.1" />
7-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
85
<PackageReference Include="Squadron.Elasticsearch" Version="0.17.0" />
96
</ItemGroup>
107

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
24-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
25-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
26-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
2723
<PackageReference Include="Squadron.Mongo" Version="0.17.0" />
28-
<PackageReference Include="xunit" Version="2.4.1" />
29-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
3024
<PackageReference Include="MongoDB.Driver" Version="2.10.0" />
3125
</ItemGroup>
3226

‎test/WorkflowCore.Tests.MySQL/DockerSetup.cs

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,36 @@
1-
using System.Collections.Generic;
2-
using Docker.Testify;
3-
using Xunit;
1+
using Xunit;
42
using System;
5-
using MySqlConnector;
3+
using System.Threading.Tasks;
4+
using Squadron;
65

76
namespace WorkflowCore.Tests.MySQL
87
{
9-
public class MysqlDockerSetup : DockerSetup
8+
public class MysqlDockerSetup : IAsyncLifetime
109
{
10+
private readonly MySqlResource _mySqlResource;
1111
public static string ConnectionString { get; set; }
1212
public static string ScenarioConnectionString { get; set; }
13-
public static string RootPassword => "rootpwd123";
1413

15-
public override TimeSpan TimeOut => TimeSpan.FromSeconds(60);
16-
17-
public override string ImageName => "mysql";
18-
public override IList<string> EnvironmentVariables => new List<string> {
19-
$"MYSQL_ROOT_PASSWORD={RootPassword}"
20-
};
21-
22-
public override int InternalPort => 3306;
23-
24-
public override void PublishConnectionInfo()
14+
public MysqlDockerSetup()
2515
{
26-
ConnectionString = $"Server=127.0.0.1;Port={ExternalPort};Database=workflow;User=root;Password={RootPassword};";
27-
ScenarioConnectionString = $"Server=127.0.0.1;Port={ExternalPort};Database=scenarios;User=root;Password={RootPassword};";
16+
_mySqlResource = new MySqlResource();
2817
}
29-
30-
public override bool TestReady()
18+
19+
public async Task InitializeAsync()
3120
{
32-
try
33-
{
34-
var connection = new MySqlConnection($"host=127.0.0.1;port={ExternalPort};user=root;password={RootPassword};database=mysql;");
35-
connection.Open();
36-
connection.Close();
37-
return true;
38-
}
39-
catch
40-
{
41-
return false;
42-
}
21+
await _mySqlResource.InitializeAsync();
22+
ConnectionString = _mySqlResource.ConnectionString;
23+
ScenarioConnectionString = _mySqlResource.ConnectionString;
24+
}
4325

26+
public Task DisposeAsync()
27+
{
28+
return _mySqlResource.DisposeAsync();
4429
}
4530
}
4631

4732
[CollectionDefinition("Mysql collection")]
4833
public class MysqlCollection : ICollectionFixture<MysqlDockerSetup>
4934
{
5035
}
51-
5236
}

‎test/WorkflowCore.Tests.MySQL/WorkflowCore.Tests.MySQL.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
5-
<PackageReference Include="xunit" Version="2.4.0" />
6-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
4+
<PackageReference Include="Squadron.MySql" Version="0.17.0" />
75
</ItemGroup>
86

97
<ItemGroup>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
24-
<PackageReference Include="xunit" Version="2.4.1" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
2623
<PackageReference Include="Squadron.PostgreSql" Version="0.17.0" />
2724
</ItemGroup>
2825

‎test/WorkflowCore.Tests.QueueProviders.RabbitMQ/WorkflowCore.Tests.QueueProviders.RabbitMQ.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
5-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
6-
<PackageReference Include="xunit" Version="2.4.0" />
7-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
84
<PackageReference Include="coverlet.collector" Version="1.2.0" />
95
</ItemGroup>
106

0 commit comments

Comments
 (0)