Skip to content

Commit 089a4b0

Browse files
hmottestadhmottestad
committed
GH-5498 initial test container commit
1 parent 4700995 commit 089a4b0

4 files changed

Lines changed: 42 additions & 33 deletions

File tree

‎compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchIndexTest.java‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
1010
*******************************************************************************/
11+
// Some portions generated by Codex
1112
package org.eclipse.rdf4j.sail.elasticsearch;
1213

13-
import static org.junit.Assert.*;
14+
import static org.junit.jupiter.api.Assertions.assertEquals;
15+
import static org.junit.jupiter.api.Assertions.assertFalse;
16+
import static org.junit.jupiter.api.Assertions.assertNotNull;
17+
import static org.junit.jupiter.api.Assertions.assertNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
19+
import static org.junit.jupiter.api.Assertions.fail;
1420

1521
import java.io.IOException;
1622
import java.util.HashSet;
@@ -34,9 +40,9 @@
3440
import org.elasticsearch.search.SearchHit;
3541
import org.elasticsearch.search.SearchHits;
3642
import org.elasticsearch.search.builder.SearchSourceBuilder;
37-
import org.junit.After;
38-
import org.junit.Before;
39-
import org.junit.Test;
43+
import org.junit.jupiter.api.AfterEach;
44+
import org.junit.jupiter.api.BeforeEach;
45+
import org.junit.jupiter.api.Test;
4046

4147
public class ElasticsearchIndexTest extends AbstractElasticsearchTest {
4248

@@ -89,20 +95,20 @@ public class ElasticsearchIndexTest extends AbstractElasticsearchTest {
8995

9096
ElasticsearchIndex index;
9197

92-
@Before
98+
@BeforeEach
9399
public void setUp() throws Exception {
94100
Properties sailProperties = new Properties();
95101
sailProperties.put(ElasticsearchIndex.TRANSPORT_KEY, client.transportAddresses().get(0).toString());
96102
sailProperties.put(ElasticsearchIndex.ELASTICSEARCH_KEY_PREFIX + "cluster.name",
97103
client.settings().get("cluster.name"));
98104
sailProperties.put(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
99-
sailProperties.put(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "green");
105+
sailProperties.put(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
100106
sailProperties.put(ElasticsearchIndex.WAIT_FOR_NODES_KEY, ">=1");
101107
index = new ElasticsearchIndex();
102108
index.initialize(sailProperties);
103109
}
104110

105-
@After
111+
@AfterEach
106112
public void tearDown() throws Exception {
107113
try {
108114
index.shutDown();
@@ -423,10 +429,10 @@ public void testRejectedDatatypes() {
423429
Literal literal2 = vf.createLiteral("hi there, too", STRING);
424430
Literal literal3 = vf.createLiteral("1.0");
425431
Literal literal4 = vf.createLiteral("1.0", FLOAT);
426-
assertTrue("Is the first literal accepted?", index.accept(literal1));
427-
assertTrue("Is the second literal accepted?", index.accept(literal2));
428-
assertTrue("Is the third literal accepted?", index.accept(literal3));
429-
assertFalse("Is the fourth literal accepted?", index.accept(literal4));
432+
assertTrue(index.accept(literal1), "Is the first literal accepted?");
433+
assertTrue(index.accept(literal2), "Is the second literal accepted?");
434+
assertTrue(index.accept(literal3), "Is the third literal accepted?");
435+
assertFalse(index.accept(literal4), "Is the fourth literal accepted?");
430436
}
431437

432438
private void assertStatement(Statement statement) throws Exception {
@@ -447,7 +453,7 @@ private void assertNoStatement(Statement statement) throws Exception {
447453

448454
private void assertStatement(Statement statement, SearchDocument document) {
449455
List<String> fields = document.getProperty(SearchFields.getPropertyField(statement.getPredicate()));
450-
assertNotNull("field " + statement.getPredicate() + " not found in document " + document, fields);
456+
assertNotNull(fields, "field " + statement.getPredicate() + " not found in document " + document);
451457
for (String f : fields) {
452458
if (((Literal) statement.getObject()).getLabel().equals(f)) {
453459
return;

‎compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailGeoSPARQLTest.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,24 @@
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
1010
*******************************************************************************/
11+
// Some portions generated by Codex
1112
package org.eclipse.rdf4j.sail.elasticsearch;
1213

1314
import org.eclipse.rdf4j.query.MalformedQueryException;
1415
import org.eclipse.rdf4j.query.QueryEvaluationException;
1516
import org.eclipse.rdf4j.repository.RepositoryException;
1617
import org.eclipse.rdf4j.sail.lucene.LuceneSail;
1718
import org.eclipse.testsuite.rdf4j.sail.lucene.AbstractLuceneSailGeoSPARQLTest;
18-
import org.junit.AfterClass;
19-
import org.junit.BeforeClass;
20-
import org.junit.Ignore;
21-
import org.junit.Test;
19+
import org.junit.jupiter.api.AfterAll;
20+
import org.junit.jupiter.api.BeforeAll;
21+
import org.junit.jupiter.api.Disabled;
22+
import org.junit.jupiter.api.Test;
2223

2324
public class ElasticsearchSailGeoSPARQLTest extends AbstractElasticsearchTest {
2425

2526
private static AbstractLuceneSailGeoSPARQLTest delegateTest;
2627

27-
@BeforeClass
28+
@BeforeAll
2829
public static void setUpClass() throws Exception {
2930
delegateTest = new AbstractLuceneSailGeoSPARQLTest() {
3031

@@ -35,14 +36,14 @@ protected void configure(LuceneSail sail) {
3536
client.settings().get("cluster.name"));
3637
sail.setParameter(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
3738
sail.setParameter(LuceneSail.INDEX_CLASS_KEY, ElasticsearchIndex.class.getName());
38-
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "green");
39+
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
3940
sail.setParameter(ElasticsearchIndex.WAIT_FOR_NODES_KEY, ">=1");
4041
}
4142
};
4243
delegateTest.setUp();
4344
}
4445

45-
@AfterClass
46+
@AfterAll
4647
public static void tearDownClass() throws Exception {
4748
try {
4849
delegateTest.tearDown();
@@ -68,13 +69,13 @@ public void testComplexDistanceQuery()
6869
}
6970

7071
@Test
71-
@Ignore // JTS is required
72+
@Disabled // JTS is required
7273
public void testIntersectionQuery() throws RepositoryException, MalformedQueryException, QueryEvaluationException {
7374
delegateTest.testIntersectionQuery();
7475
}
7576

7677
@Test
77-
@Ignore // JTS is required
78+
@Disabled // JTS is required
7879
public void testComplexIntersectionQuery()
7980
throws RepositoryException, MalformedQueryException, QueryEvaluationException {
8081
delegateTest.testComplexIntersectionQuery();

‎compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailIndexedPropertiesTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,23 @@
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
1010
*******************************************************************************/
11+
// Some portions generated by Codex
1112
package org.eclipse.rdf4j.sail.elasticsearch;
1213

1314
import org.eclipse.rdf4j.query.MalformedQueryException;
1415
import org.eclipse.rdf4j.query.QueryEvaluationException;
1516
import org.eclipse.rdf4j.repository.RepositoryException;
1617
import org.eclipse.rdf4j.sail.lucene.LuceneSail;
1718
import org.eclipse.testsuite.rdf4j.sail.lucene.AbstractLuceneSailIndexedPropertiesTest;
18-
import org.junit.After;
19-
import org.junit.Before;
20-
import org.junit.Test;
19+
import org.junit.jupiter.api.AfterEach;
20+
import org.junit.jupiter.api.BeforeEach;
21+
import org.junit.jupiter.api.Test;
2122

2223
public class ElasticsearchSailIndexedPropertiesTest extends AbstractElasticsearchTest {
2324

2425
AbstractLuceneSailIndexedPropertiesTest delegateTest;
2526

26-
@Before
27+
@BeforeEach
2728
public void setUp() throws Exception {
2829
delegateTest = new AbstractLuceneSailIndexedPropertiesTest() {
2930

@@ -34,14 +35,14 @@ protected void configure(LuceneSail sail) {
3435
client.settings().get("cluster.name"));
3536
sail.setParameter(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
3637
sail.setParameter(LuceneSail.INDEX_CLASS_KEY, ElasticsearchIndex.class.getName());
37-
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "green");
38+
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
3839
sail.setParameter(ElasticsearchIndex.WAIT_FOR_NODES_KEY, ">=1");
3940
}
4041
};
4142
delegateTest.setUp();
4243
}
4344

44-
@After
45+
@AfterEach
4546
public void tearDown() throws Exception {
4647
try {
4748
delegateTest.tearDown();

‎compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,23 @@
88
*
99
* SPDX-License-Identifier: BSD-3-Clause
1010
*******************************************************************************/
11+
// Some portions generated by Codex
1112
package org.eclipse.rdf4j.sail.elasticsearch;
1213

1314
import org.eclipse.rdf4j.query.MalformedQueryException;
1415
import org.eclipse.rdf4j.query.QueryEvaluationException;
1516
import org.eclipse.rdf4j.repository.RepositoryException;
1617
import org.eclipse.rdf4j.sail.lucene.LuceneSail;
1718
import org.eclipse.testsuite.rdf4j.sail.lucene.AbstractLuceneSailTest;
18-
import org.junit.After;
19-
import org.junit.Before;
20-
import org.junit.Test;
19+
import org.junit.jupiter.api.AfterEach;
20+
import org.junit.jupiter.api.BeforeEach;
21+
import org.junit.jupiter.api.Test;
2122

2223
public class ElasticsearchSailTest extends AbstractElasticsearchTest {
2324

2425
AbstractLuceneSailTest delegateTest;
2526

26-
@Before
27+
@BeforeEach
2728
public void setUp() throws Exception {
2829
delegateTest = new AbstractLuceneSailTest() {
2930

@@ -34,14 +35,14 @@ protected void configure(LuceneSail sail) {
3435
client.settings().get("cluster.name"));
3536
sail.setParameter(ElasticsearchIndex.INDEX_NAME_KEY, ElasticsearchTestUtils.getNextTestIndexName());
3637
sail.setParameter(LuceneSail.INDEX_CLASS_KEY, ElasticsearchIndex.class.getName());
37-
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "green");
38+
sail.setParameter(ElasticsearchIndex.WAIT_FOR_STATUS_KEY, "yellow");
3839
sail.setParameter(ElasticsearchIndex.WAIT_FOR_NODES_KEY, ">=1");
3940
}
4041
};
4142
delegateTest.setUp();
4243
}
4344

44-
@After
45+
@AfterEach
4546
public void tearDown() throws Exception {
4647
try {
4748
delegateTest.tearDown();

0 commit comments

Comments
 (0)