Skip to content

getContainerByServiceName should work without suffix #5776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 31, 2022
Merged

getContainerByServiceName should work without suffix #5776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5ad11a
getContainerByServiceName should work with non-suffixed name
aidando73 Aug 27, 2022
909efde
spotlessApply
aidando73 Aug 27, 2022
708d6bf
check if CI failed due to a flaky test
aidando73 Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,8 @@ public SELF withStartupTimeout(Duration startupTimeout) {
}

public Optional<ContainerState> getContainerByServiceName(String serviceName) {
return Optional.ofNullable(serviceInstanceMap.get(serviceName));
String serviceInstantName = getServiceInstanceName(serviceName);
return Optional.ofNullable(serviceInstanceMap.get(serviceInstantName));
}

private void followLogs(String containerId, Consumer<OutputFrame> consumer) {
Expand Down
14 changes: 14 additions & 0 deletions core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public void testGetServicePort() {
public void shouldRetrieveContainerByServiceName() {
String existingServiceName = "db_1";
Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);

assertThat(result)
.as(String.format("Container should be found by service name %s", existingServiceName))
.isPresent();
Expand All @@ -52,6 +53,19 @@ public void shouldRetrieveContainerByServiceName() {
.isEqualTo(result.get().getExposedPorts());
}

@Test
public void shouldRetrieveContainerByServiceNameWithoutNumberedSuffix() {
String existingServiceName = "db";
Optional<ContainerState> result = environment.getContainerByServiceName(existingServiceName);

assertThat(result)
.as(String.format("Container should be found by service name %s", existingServiceName))
.isPresent();
assertThat(result.get().getExposedPorts())
.as("Mapped port for result container was wrong, perhaps wrong container was found")
.isEqualTo(Collections.singletonList(3306));
}

@Test
public void shouldReturnEmptyResultOnNoneExistingService() {
String notExistingServiceName = "db_256";
Expand Down