Skip to content

Commit bcca9f3

Browse files
authored
Add ComposeContainer test to junit-jupiter module (#9407)
1 parent 94e4c85 commit bcca9f3

File tree

2 files changed

+41
-16
lines changed

2 files changed

+41
-16
lines changed

modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/ComposeContainerTests.java

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import org.apache.http.client.HttpClient;
55
import org.apache.http.client.methods.HttpGet;
66
import org.apache.http.impl.client.HttpClientBuilder;
7-
import org.junit.jupiter.api.BeforeEach;
87
import org.junit.jupiter.api.Test;
9-
import org.testcontainers.containers.DockerComposeContainer;
8+
import org.testcontainers.containers.ComposeContainer;
109
import org.testcontainers.containers.wait.strategy.Wait;
1110

1211
import java.io.File;
@@ -17,25 +16,16 @@
1716
class ComposeContainerTests {
1817

1918
@Container
20-
private DockerComposeContainer composeContainer = new DockerComposeContainer(
21-
new File("src/test/resources/docker-compose.yml")
22-
)
23-
.withExposedService("whoami_1", 80, Wait.forHttp("/"));
24-
25-
private String host;
26-
27-
private int port;
28-
29-
@BeforeEach
30-
void setup() {
31-
host = composeContainer.getServiceHost("whoami_1", 80);
32-
port = composeContainer.getServicePort("whoami_1", 80);
33-
}
19+
private ComposeContainer composeContainer = new ComposeContainer(new File("src/test/resources/docker-compose.yml"))
20+
.withExposedService("whoami-1", 80, Wait.forHttp("/"));
3421

3522
@Test
3623
void running_compose_defined_container_is_accessible_on_configured_port() throws Exception {
3724
HttpClient client = HttpClientBuilder.create().build();
3825

26+
String host = composeContainer.getServiceHost("whoami-1", 80);
27+
int port = composeContainer.getServicePort("whoami-1", 80);
28+
3929
HttpResponse response = client.execute(new HttpGet("http://" + host + ":" + port));
4030

4131
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package org.testcontainers.junit.jupiter;
2+
3+
import org.apache.http.HttpResponse;
4+
import org.apache.http.client.HttpClient;
5+
import org.apache.http.client.methods.HttpGet;
6+
import org.apache.http.impl.client.HttpClientBuilder;
7+
import org.junit.jupiter.api.Test;
8+
import org.testcontainers.containers.DockerComposeContainer;
9+
import org.testcontainers.containers.wait.strategy.Wait;
10+
11+
import java.io.File;
12+
13+
import static org.assertj.core.api.Assertions.assertThat;
14+
15+
@Testcontainers
16+
class DockerComposeContainerTests {
17+
18+
@Container
19+
private DockerComposeContainer composeContainer = new DockerComposeContainer(
20+
new File("src/test/resources/docker-compose.yml")
21+
)
22+
.withExposedService("whoami_1", 80, Wait.forHttp("/"));
23+
24+
@Test
25+
void running_compose_defined_container_is_accessible_on_configured_port() throws Exception {
26+
HttpClient client = HttpClientBuilder.create().build();
27+
28+
String host = composeContainer.getServiceHost("whoami_1", 80);
29+
int port = composeContainer.getServicePort("whoami_1", 80);
30+
31+
HttpResponse response = client.execute(new HttpGet("http://" + host + ":" + port));
32+
33+
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
34+
}
35+
}

0 commit comments

Comments
 (0)