Skip to content

Move Elasticsearch tests to JUnit Jupiter #10735

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
eddumelendez merged 1 commit into from
Sep 2, 2025
Merged

Move Elasticsearch tests to JUnit Jupiter #10735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions modules/elasticsearch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ description = "Testcontainers :: elasticsearch"

dependencies {
api project(':testcontainers')

testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'

testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
testImplementation "org.elasticsearch.client:elasticsearch-rest-client:9.1.2"
testImplementation "org.elasticsearch.client:transport:7.17.29"
testImplementation 'org.assertj:assertj-core:3.27.4'
Expand All @@ -12,3 +16,7 @@ tasks.japicmp {
"org.testcontainers.elasticsearch.ElasticsearchContainer"
]
}

test {
useJUnitPlatform()
}
48 changes: 24 additions & 24 deletions ...sticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.transport.client.PreBuiltTransportClient;
import org.junit.After;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
Expand All @@ -34,7 +34,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;

public class ElasticsearchContainerTest {
class ElasticsearchContainerTest {

/**
* Elasticsearch version which should be used for the Tests
Expand All @@ -59,7 +59,7 @@ public class ElasticsearchContainerTest {

private RestClient anonymousClient = null;

@After
@AfterEach
public void stopRestClient() throws IOException {
if (client != null) {
client.close();
Expand All @@ -74,7 +74,7 @@ public void stopRestClient() throws IOException {
@SuppressWarnings("deprecation") // Using deprecated constructor for verification of backwards compatibility
@Test
@Deprecated // We will remove this test in the future
public void elasticsearchDeprecatedCtorTest() throws IOException {
void elasticsearchDeprecatedCtorTest() throws IOException {
// Create the elasticsearch container.
try (
ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
Expand All @@ -96,7 +96,7 @@ public void elasticsearchDeprecatedCtorTest() throws IOException {
}

@Test
public void elasticsearchDefaultTest() throws IOException {
void elasticsearchDefaultTest() throws IOException {
// Create the elasticsearch container.
try (
ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
Expand All @@ -118,7 +118,7 @@ public void elasticsearchDefaultTest() throws IOException {
}

@Test
public void elasticsearchSecuredTest() throws IOException {
void elasticsearchSecuredTest() throws IOException {
try (
ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)
.withPassword(ELASTICSEARCH_PASSWORD)
Expand All @@ -138,7 +138,7 @@ public void elasticsearchSecuredTest() throws IOException {
}

@Test
public void elasticsearchVersion() throws IOException {
void elasticsearchVersion() throws IOException {
try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
container.start();
Response response = getClient(container).performRequest(new Request("GET", "/"));
Expand All @@ -149,7 +149,7 @@ public void elasticsearchVersion() throws IOException {
}

@Test
public void elasticsearchVersion83() throws IOException {
void elasticsearchVersion83() throws IOException {
try (
ElasticsearchContainer container = new ElasticsearchContainer(
"docker.elastic.co/elasticsearch/elasticsearch:8.3.0"
Expand All @@ -163,7 +163,7 @@ public void elasticsearchVersion83() throws IOException {
}

@Test
public void elasticsearchOssImage() throws IOException {
void elasticsearchOssImage() throws IOException {
try (
// ossContainer {
ElasticsearchContainer container = new ElasticsearchContainer(
Expand All @@ -182,7 +182,7 @@ public void elasticsearchOssImage() throws IOException {
}

@Test
public void restClientClusterHealth() throws IOException {
void restClientClusterHealth() throws IOException {
// httpClientContainer7 {
// Create the elasticsearch container.
try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
Expand Down Expand Up @@ -214,7 +214,7 @@ public void restClientClusterHealth() throws IOException {
}

@Test
public void restClientClusterHealthElasticsearch8() throws IOException {
void restClientClusterHealthElasticsearch8() throws IOException {
// httpClientContainer8 {
// Create the elasticsearch container.
try (
Expand Down Expand Up @@ -254,7 +254,7 @@ public void restClientClusterHealthElasticsearch8() throws IOException {
}

@Test
public void restClientClusterHealthElasticsearch8WithoutSSL() throws IOException {
void restClientClusterHealthElasticsearch8WithoutSSL() throws IOException {
// httpClientContainerNoSSL8 {
// Create the elasticsearch container.
try (
Expand Down Expand Up @@ -293,7 +293,7 @@ public void restClientClusterHealthElasticsearch8WithoutSSL() throws IOException
}

@Test
public void restClientSecuredClusterHealth() throws IOException {
void restClientSecuredClusterHealth() throws IOException {
// httpClientSecuredContainer {
// Create the elasticsearch container.
try (
Expand Down Expand Up @@ -330,7 +330,7 @@ public void restClientSecuredClusterHealth() throws IOException {

@SuppressWarnings("deprecation") // The TransportClient will be removed in Elasticsearch 8.
@Test
public void transportClientClusterHealth() {
void transportClientClusterHealth() {
// transportClientContainer {
// Create the elasticsearch container.
try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
Expand All @@ -356,7 +356,7 @@ public void transportClientClusterHealth() {
}

@Test
public void incompatibleSettingsTest() {
void incompatibleSettingsTest() {
// The OSS image can not use security feature
assertThat(
catchThrowable(() -> {
Expand All @@ -369,7 +369,7 @@ public void incompatibleSettingsTest() {
}

@Test
public void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
try (ElasticsearchContainer container = new ElasticsearchContainer("elasticsearch:8.1.2")) {
container.start();

Expand All @@ -378,7 +378,7 @@ public void testDockerHubElasticsearch8ImageSecureByDefault() throws Exception {
}

@Test
public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exception {
void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exception {
final MountableFile mountableFile = MountableFile.forClasspathResource("http_ca.crt");
String caPath = "/tmp/http_ca.crt";
try (
Expand All @@ -400,7 +400,7 @@ public void testElasticsearch8SecureByDefaultCustomCaCertFails() throws Exceptio
}

@Test
public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception {
void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception {
final HttpWaitStrategy httpsWaitStrategy = Wait
.forHttps("/")
.forPort(9200)
Expand All @@ -423,7 +423,7 @@ public void testElasticsearch8SecureByDefaultHttpWaitStrategy() throws Exception
}

@Test
public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throws Exception {
void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throws Exception {
// this test exists for custom images by users that use the `latest` tag
// even though the version might be older than version 8
// this tags an old 7.x version as :latest
Expand All @@ -442,7 +442,7 @@ public void testElasticsearch8SecureByDefaultFailsSilentlyOnLatestImages() throw
}

@Test
public void testElasticsearch7CanHaveSecurityEnabledAndUseSslContext() throws Exception {
void testElasticsearch7CanHaveSecurityEnabledAndUseSslContext() throws Exception {
String customizedCertPath = "/usr/share/elasticsearch/config/certs/http_ca_customized.crt";
try (
ElasticsearchContainer container = new ElasticsearchContainer(
Expand Down Expand Up @@ -485,7 +485,7 @@ public void testElasticsearch7CanHaveSecurityEnabledAndUseSslContext() throws Ex
}

@Test
public void testElasticsearchDefaultMaxHeapSize() throws Exception {
void testElasticsearchDefaultMaxHeapSize() throws Exception {
long defaultHeapSize = 2147483648L;

try (ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE)) {
Expand All @@ -495,7 +495,7 @@ public void testElasticsearchDefaultMaxHeapSize() throws Exception {
}

@Test
public void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exception {
void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exception {
long customHeapSize = 1574961152;

try (
Expand All @@ -508,7 +508,7 @@ public void testElasticsearchCustomMaxHeapSizeInEnvironmentVariable() throws Exc
}

@Test
public void testElasticsearchCustomMaxHeapSizeInJvmOptionsFile() throws Exception {
void testElasticsearchCustomMaxHeapSizeInJvmOptionsFile() throws Exception {
long customHeapSize = 1574961152;

try (
Expand Down
Loading