Skip to content

Commit df8ff45

Browse files
chore: rename to Until as it is no Wait Strategy
1 parent 4684425 commit df8ff45

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/Testcontainers/Configurations/WaitStrategies/HostTcpPortWaitStrategy.cs renamed to src/Testcontainers/Configurations/WaitStrategies/UntilHostTcpPortIsAvailable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace DotNet.Testcontainers.Configurations
1313
/// In these cases, the mapped port is always available even if the container is not listening on it.
1414
/// </remarks>
1515
/// <param name="port">The container port to check.</param>
16-
internal sealed class HostTcpPortWaitStrategy(int port) : IWaitUntil
16+
internal sealed class UntilHostTcpPortIsAvailable(int port) : IWaitUntil
1717
{
1818
// We don't have access to all mapped ports, so we need the user to provide the container port.
1919
private readonly int _containerPort = port;

src/Testcontainers/Configurations/WaitStrategies/WaitForContainerOS.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public IEnumerable<WaitStrategy> Build()
9797
public IWaitForContainerOS UntilHostTcpPortAvailable(int port, Action<IWaitStrategy> waitStrategyModifier = null)
9898
{
9999
UntilPortIsAvailable(port, waitStrategyModifier);
100-
return AddCustomWaitStrategy(new HostTcpPortWaitStrategy(port), waitStrategyModifier);
100+
return AddCustomWaitStrategy(new UntilHostTcpPortIsAvailable(port), waitStrategyModifier);
101101
}
102102
}
103103
}

tests/Testcontainers.Tests/Unit/Configurations/HostTcpPortWaitStrategyTest.cs renamed to tests/Testcontainers.Tests/Unit/Configurations/UntilHostTcpPortIsAvailableTest.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace DotNet.Testcontainers.Tests.Unit
88
using JetBrains.Annotations;
99
using Xunit;
1010

11-
public sealed class HostTcpPortWaitStrategyTest : IAsyncLifetime
11+
public sealed class UntilHostTcpPortIsAvailableTest : IAsyncLifetime
1212
{
1313
private const int listeningPort = 49152;
1414
private const int mappedPort = 49153;
@@ -35,9 +35,9 @@ public ValueTask DisposeAsync()
3535
}
3636

3737
[Fact]
38-
public async Task HostTcpPortWaitStrategyIsSucceeded()
38+
public async Task SucceededWhenPortIsAvailable()
3939
{
40-
var hostPortWaitStrategy = new HostTcpPortWaitStrategy(listeningPort);
40+
var hostPortWaitStrategy = new UntilHostTcpPortIsAvailable(listeningPort);
4141

4242
var succeeded = await hostPortWaitStrategy.UntilAsync(_container);
4343

@@ -49,19 +49,19 @@ public async Task HostTcpPortWaitStrategyIsSucceeded()
4949
/// This test might fail in docker configurations where mapped ports are always listened eg. DockerForMac (https://forums.docker.com/t/port-forwarding-of-exposed-ports-behaves-unexpectedly/15807/2)
5050
/// </summary>
5151
[Fact(Skip = "The GitHub Action runner allows establishing a connection to any mapped port.")]
52-
public async Task HostTcpPortWaitStrategyFailsWhenPortNotListening()
52+
public async Task FailsWhenPortNotListening()
5353
{
54-
var hostPortWaitStrategy = new HostTcpPortWaitStrategy(mappedPort);
54+
var hostPortWaitStrategy = new UntilHostTcpPortIsAvailable(mappedPort);
5555

5656
var succeeded = await hostPortWaitStrategy.UntilAsync(_container);
5757

5858
Assert.False(succeeded);
5959
}
6060

6161
[Fact]
62-
public async Task HostTcpPortWaitStrategyFailsWhenPortNotMapped()
62+
public async Task FailsWhenPortNotMapped()
6363
{
64-
var hostPortWaitStrategy = new HostTcpPortWaitStrategy(unmappedPort);
64+
var hostPortWaitStrategy = new UntilHostTcpPortIsAvailable(unmappedPort);
6565

6666
var succeeded = await hostPortWaitStrategy.UntilAsync(_container);
6767

0 commit comments

Comments
 (0)