Skip to content

Commit dac4917

Browse files
committed
Switch elasticsearch tests
1 parent a6a2d15 commit dac4917

File tree

2 files changed

+16
-28
lines changed

2 files changed

+16
-28
lines changed

test/WorkflowCore.Tests.Elasticsearch/ElasticsearchDockerSetup.cs

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,29 @@
11
using System;
2-
using System.Collections.Generic;
3-
using Docker.Testify;
4-
using Nest;
2+
using System.Threading.Tasks;
3+
using Squadron;
54
using Xunit;
65

76
namespace WorkflowCore.Tests.Elasticsearch
87
{
9-
public class ElasticsearchDockerSetup : DockerSetup
8+
public class ElasticsearchDockerSetup : IAsyncLifetime
109
{
10+
private readonly ElasticsearchResource _elasticsearchResource;
1111
public static string ConnectionString { get; set; }
12-
13-
public override string ImageName => @"elasticsearch";
14-
public override string ImageTag => "7.5.1";
15-
public override int InternalPort => 9200;
16-
public override TimeSpan TimeOut => TimeSpan.FromSeconds(30);
17-
18-
public override IList<string> EnvironmentVariables => new List<string> {
19-
$"discovery.type=single-node"
20-
};
2112

22-
public override void PublishConnectionInfo()
13+
public ElasticsearchDockerSetup()
2314
{
24-
ConnectionString = $"http://localhost:{ExternalPort}";
15+
_elasticsearchResource = new ElasticsearchResource();
2516
}
2617

27-
public override bool TestReady()
18+
public async Task InitializeAsync()
2819
{
29-
try
30-
{
31-
var client = new ElasticClient(new ConnectionSettings(new Uri($"http://localhost:{ExternalPort}")));
32-
var ping = client.Ping();
33-
return ping.IsValid;
34-
}
35-
catch
36-
{
37-
return false;
38-
}
20+
await _elasticsearchResource.InitializeAsync();
21+
ConnectionString = $"http://localhost:{_elasticsearchResource.Instance.HostPort}";
22+
}
3923

24+
public Task DisposeAsync()
25+
{
26+
return _elasticsearchResource.DisposeAsync();
4027
}
4128
}
4229

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
<ItemGroup>
44
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
55
<PackageReference Include="NEST" Version="7.14.1" />
6-
<PackageReference Include="xunit" Version="2.4.0" />
7-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
6+
<PackageReference Include="xunit" Version="2.4.1" />
7+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
8+
<PackageReference Include="Squadron.Elasticsearch" Version="0.17.0" />
89
</ItemGroup>
910

1011
<ItemGroup>

0 commit comments

Comments
 (0)