Skip to content

GH-5498 Elasticsearch Testcontainer #5499

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

Draft
wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

GH-5498 Elasticsearch Testcontainer #5499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d10c21e
initial commit
hmottestad Oct 6, 2025
a61e702
migrate more tests
hmottestad Oct 6, 2025
e9f5c25
add more tests
hmottestad Oct 8, 2025
5f4fa50
add more tests
hmottestad Oct 8, 2025
9dbe37e
add more tests
hmottestad Oct 8, 2025
11fae1d
add more tests
hmottestad Oct 9, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ e2e/test-results
/tools/server/.lwjgl/
/tools/server/.lwjgl/
.m2_repo/
/.m2/
48 changes: 20 additions & 28 deletions compliance/elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,34 +37,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${lucene.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.elasticsearch.test</groupId>
<artifactId>framework</artifactId>
<version>${elasticsearch.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand Down Expand Up @@ -109,8 +81,28 @@
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.elasticsearch</groupId>
<artifactId>jna</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.19.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>elasticsearch</artifactId>
<version>1.19.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
Expand Down
38 changes: 14 additions & 24 deletions ...sticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchIndexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.elasticsearch;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.io.IOException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
Expand All @@ -31,19 +37,14 @@
import org.eclipse.rdf4j.sail.memory.MemoryStore;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.reindex.ReindexPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

@ClusterScope(numDataNodes = 1)
public class ElasticsearchIndexTest extends ESIntegTestCase {
public class ElasticsearchIndexTest extends ElasticsearchTestContainerSupport {

private static final ValueFactory vf = SimpleValueFactory.getInstance();

Expand Down Expand Up @@ -97,39 +98,28 @@ public class ElasticsearchIndexTest extends ESIntegTestCase {
ElasticsearchIndex index;

@Before
@Override
public void setUp() throws Exception {
super.setUp();
client = (TransportClient) internalCluster().transportClient();
client = createTransportClient();

Properties sailProperties = new Properties();
sailProperties.put(ElasticsearchIndex.TRANSPORT_KEY, client.transportAddresses().get(0).toString());
sailProperties.put(ElasticsearchIndex.ELASTICSEARCH_KEY_PREFIX + "cluster.name",
client.settings().get("cluster.name"));
sailProperties.put(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
sailProperties.put(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "green");
sailProperties.put(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
sailProperties.put(ElasticsearchIndex.WAIT_FOR_NODES_KEY, ">=1");
index = new ElasticsearchIndex();
index.initialize(sailProperties);
}

@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
return List.of(ReindexPlugin.class);
}

@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return List.of(ReindexPlugin.class);
}

@After
@Override
public void tearDown() throws Exception {
try {
index.shutDown();
if (index != null) {
index.shutDown();
}
} finally {
super.tearDown();
closeQuietly(client);
}

org.eclipse.rdf4j.common.concurrent.locks.Properties.setLockTrackingEnabled(false);
Expand Down
34 changes: 8 additions & 26 deletions ...ch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailGeoSPARQLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,25 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.elasticsearch;

import java.util.Collection;
import java.util.List;

import org.eclipse.rdf4j.query.MalformedQueryException;
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.repository.RepositoryException;
import org.eclipse.rdf4j.sail.lucene.LuceneSail;
import org.eclipse.testsuite.rdf4j.sail.lucene.AbstractLuceneSailGeoSPARQLTest;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.index.reindex.ReindexPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;

@ClusterScope(numDataNodes = 1)
public class ElasticsearchSailGeoSPARQLTest extends ESIntegTestCase {
public class ElasticsearchSailGeoSPARQLTest extends ElasticsearchTestContainerSupport {

AbstractLuceneSailGeoSPARQLTest delegateTest;
TransportClient client;

@Before
@Override
public void setUp() throws Exception {
super.setUp();
TransportClient client = (TransportClient) internalCluster().transportClient();
client = createTransportClient();
delegateTest = new AbstractLuceneSailGeoSPARQLTest() {

@Override
Expand All @@ -47,30 +38,21 @@ protected void configure(LuceneSail sail) {
client.settings().get("cluster.name"));
sail.setParameter(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
sail.setParameter(LuceneSail.INDEX_CLASS_KEY, ElasticsearchIndex.class.getName());
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "green");
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
sail.setParameter(ElasticsearchIndex.WAIT_FOR_NODES_KEY, ">=1");
}
};
delegateTest.setUp();
}

@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
return List.of(ReindexPlugin.class);
}

@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return List.of(ReindexPlugin.class);
}

@After
@Override
public void tearDown() throws Exception {
try {
delegateTest.tearDown();
if (delegateTest != null) {
delegateTest.tearDown();
}
} finally {
super.tearDown();
closeQuietly(client);
}
}

Expand Down
34 changes: 8 additions & 26 deletions ...est/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailIndexedPropertiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,24 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.elasticsearch;

import java.util.Collection;
import java.util.List;

import org.eclipse.rdf4j.query.MalformedQueryException;
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.repository.RepositoryException;
import org.eclipse.rdf4j.sail.lucene.LuceneSail;
import org.eclipse.testsuite.rdf4j.sail.lucene.AbstractLuceneSailIndexedPropertiesTest;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.index.reindex.ReindexPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

@ClusterScope(numDataNodes = 1)
public class ElasticsearchSailIndexedPropertiesTest extends ESIntegTestCase {
public class ElasticsearchSailIndexedPropertiesTest extends ElasticsearchTestContainerSupport {

AbstractLuceneSailIndexedPropertiesTest delegateTest;
TransportClient client;

@Before
@Override
public void setUp() throws Exception {
super.setUp();
TransportClient client = (TransportClient) internalCluster().transportClient();
client = createTransportClient();
delegateTest = new AbstractLuceneSailIndexedPropertiesTest() {

@Override
Expand All @@ -46,30 +37,21 @@ protected void configure(LuceneSail sail) {
client.settings().get("cluster.name"));
sail.setParameter(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
sail.setParameter(LuceneSail.INDEX_CLASS_KEY, ElasticsearchIndex.class.getName());
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "green");
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
sail.setParameter(ElasticsearchIndex.WAIT_FOR_NODES_KEY, ">=1");
}
};
delegateTest.setUp();
}

@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
return List.of(ReindexPlugin.class);
}

@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return List.of(ReindexPlugin.class);
}

@After
@Override
public void tearDown() throws Exception {
try {
delegateTest.tearDown();
if (delegateTest != null) {
delegateTest.tearDown();
}
} finally {
super.tearDown();
closeQuietly(client);
}
}

Expand Down
34 changes: 8 additions & 26 deletions ...asticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,24 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.elasticsearch;

import java.util.Collection;
import java.util.List;

import org.eclipse.rdf4j.query.MalformedQueryException;
import org.eclipse.rdf4j.query.QueryEvaluationException;
import org.eclipse.rdf4j.repository.RepositoryException;
import org.eclipse.rdf4j.sail.lucene.LuceneSail;
import org.eclipse.testsuite.rdf4j.sail.lucene.AbstractLuceneSailTest;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.index.reindex.ReindexPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

@ClusterScope(numDataNodes = 1)
public class ElasticsearchSailTest extends ESIntegTestCase {
public class ElasticsearchSailTest extends ElasticsearchTestContainerSupport {

AbstractLuceneSailTest delegateTest;
TransportClient client;

@Before
@Override
public void setUp() throws Exception {
super.setUp();
TransportClient client = (TransportClient) internalCluster().transportClient();
client = createTransportClient();
delegateTest = new AbstractLuceneSailTest() {

@Override
Expand All @@ -46,30 +37,21 @@ protected void configure(LuceneSail sail) {
client.settings().get("cluster.name"));
sail.setParameter(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
sail.setParameter(LuceneSail.INDEX_CLASS_KEY, ElasticsearchIndex.class.getName());
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "green");
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
sail.setParameter(ElasticsearchIndex.WAIT_FOR_NODES_KEY, ">=1");
}
};
delegateTest.setUp();
}

@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
return List.of(ReindexPlugin.class);
}

@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return List.of(ReindexPlugin.class);
}

@After
@Override
public void tearDown() throws Exception {
try {
delegateTest.tearDown();
if (delegateTest != null) {
delegateTest.tearDown();
}
} finally {
super.tearDown();
closeQuietly(client);
}
}

Expand Down
Loading
Loading