Skip to content

Commit e6cff43

Browse files
JervenBollemanJervenBolleman
committed
GH-4592 Replace more Junit4 Suite with v5 DynamicTest
Also delete some deprecated tests classes that are no longer compatible with the junit5 way of doing things. Signed-off-by: Jerven Bolleman <jerven.bolleman@sib.swiss>
1 parent 5813329 commit e6cff43

29 files changed

Lines changed: 843 additions & 2979 deletions

‎compliance/geosparql/src/test/java/org/eclipse/rdf4j/query/algebra/geosparql/MemoryGeoSPARQLQueryTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,13 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.query.algebra.geosparql;
1212

13-
import org.eclipse.rdf4j.query.Dataset;
1413
import org.eclipse.rdf4j.repository.Repository;
1514
import org.eclipse.rdf4j.repository.sail.SailRepository;
1615
import org.eclipse.rdf4j.sail.memory.MemoryStore;
1716
import org.eclipse.rdf4j.testsuite.query.algebra.geosparql.GeoSPARQLManifestTest;
1817

1918
public class MemoryGeoSPARQLQueryTest extends GeoSPARQLManifestTest {
2019

21-
public MemoryGeoSPARQLQueryTest(String displayName, String testURI, String name, String queryFileURL,
22-
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
23-
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
24-
}
25-
2620
@Override
2721
protected Repository newRepository() {
2822
return new SailRepository(new MemoryStore());

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/HTTPSparqlUpdateTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.query.parser.sparql;
1212

13-
import static org.junit.Assert.assertFalse;
14-
import static org.junit.Assert.assertThrows;
15-
import static org.junit.Assert.assertTrue;
13+
import static org.junit.jupiter.api.Assertions.assertFalse;
14+
import static org.junit.jupiter.api.Assertions.assertThrows;
15+
import static org.junit.jupiter.api.Assertions.assertTrue;
1616

1717
import java.util.List;
1818

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/manifest/SPARQL12QueryTest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.query.parser.sparql.manifest;
1212

13-
import org.eclipse.rdf4j.query.Dataset;
1413
import org.eclipse.rdf4j.repository.Repository;
1514
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
1615
import org.eclipse.rdf4j.repository.sail.SailRepository;
@@ -24,11 +23,6 @@
2423
*/
2524
public class SPARQL12QueryTest extends SPARQL12QueryComplianceTest {
2625

27-
public SPARQL12QueryTest(String displayName, String testURI, String name, String queryFileURL, String resultFileURL,
28-
Dataset dataset, boolean ordered, boolean laxCardinality) {
29-
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
30-
}
31-
3226
@Override
3327
protected Repository newRepository() {
3428
return new DatasetRepository(new SailRepository(new MemoryStore()));

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL10QueryTest.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.query.parser.sparql.manifest;
1212

13-
import org.eclipse.rdf4j.query.Dataset;
1413
import org.eclipse.rdf4j.repository.Repository;
1514
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
1615
import org.eclipse.rdf4j.repository.sail.SailRepository;
@@ -24,20 +23,6 @@
2423
*/
2524
public class W3CApprovedSPARQL10QueryTest extends SPARQL10QueryComplianceTest {
2625

27-
/**
28-
* @param displayName
29-
* @param testURI
30-
* @param name
31-
* @param queryFileURL
32-
* @param resultFileURL
33-
* @param dataset
34-
* @param ordered
35-
*/
36-
public W3CApprovedSPARQL10QueryTest(String displayName, String testURI, String name, String queryFileURL,
37-
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
38-
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
39-
}
40-
4126
@Override
4227
protected Repository newRepository() {
4328
return new DatasetRepository(new SailRepository(new MemoryStore()));

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11QueryTest.java‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11SyntaxTest.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,6 @@
1818

1919
public class W3CApprovedSPARQL11SyntaxTest extends SPARQL11SyntaxComplianceTest {
2020

21-
/**
22-
* @param displayName
23-
* @param testURI
24-
* @param name
25-
* @param queryFileURL
26-
* @param resultFileURL
27-
* @param positiveTest
28-
*/
29-
public W3CApprovedSPARQL11SyntaxTest(String displayName, String testURI, String name, String queryFileURL,
30-
boolean positiveTest) {
31-
super(displayName, testURI, name, queryFileURL, positiveTest);
32-
}
33-
3421
@Override
3522
protected ParsedOperation parseOperation(String operation, String fileURL) throws MalformedQueryException {
3623
return QueryParserUtil.parseOperation(QueryLanguage.SPARQL, operation, fileURL);

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11UpdateTest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.query.parser.sparql.manifest;
1212

13-
import java.util.Map;
14-
15-
import org.eclipse.rdf4j.model.IRI;
1613
import org.eclipse.rdf4j.repository.Repository;
1714
import org.eclipse.rdf4j.repository.sail.SailRepository;
1815
import org.eclipse.rdf4j.sail.memory.MemoryStore;
@@ -26,13 +23,6 @@
2623
@Deprecated
2724
public class W3CApprovedSPARQL11UpdateTest extends SPARQL11UpdateComplianceTest {
2825

29-
public W3CApprovedSPARQL11UpdateTest(String displayName, String testURI, String name, String requestFile,
30-
IRI defaultGraphURI, Map<String, IRI> inputNamedGraphs, IRI resultDefaultGraphURI,
31-
Map<String, IRI> resultNamedGraphs) {
32-
super(displayName, testURI, name, requestFile, defaultGraphURI, inputNamedGraphs, resultDefaultGraphURI,
33-
resultNamedGraphs);
34-
}
35-
3626
@Override
3727
protected Repository newRepository() {
3828
SailRepository repo = new SailRepository(new MemoryStore());

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/sail/federation/FedXSPARQL11QueryComplianceTest.java‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.sail.federation;
1212

13+
import java.io.File;
1314
import java.io.IOException;
1415

1516
import org.eclipse.rdf4j.federated.FedXFactory;
1617
import org.eclipse.rdf4j.federated.repository.FedXRepository;
17-
import org.eclipse.rdf4j.query.Dataset;
1818
import org.eclipse.rdf4j.repository.Repository;
1919
import org.eclipse.rdf4j.repository.RepositoryException;
2020
import org.eclipse.rdf4j.repository.config.RepositoryConfig;
@@ -26,36 +26,28 @@
2626
import org.eclipse.rdf4j.repository.sail.config.SailRepositoryConfig;
2727
import org.eclipse.rdf4j.sail.memory.config.MemoryStoreConfig;
2828
import org.eclipse.rdf4j.testsuite.query.parser.sparql.manifest.SPARQL11QueryComplianceTest;
29-
import org.junit.Rule;
30-
import org.junit.rules.TemporaryFolder;
29+
import org.junit.jupiter.api.io.TempDir;
3130

3231
/**
3332
* @author jeen
3433
*/
3534
public class FedXSPARQL11QueryComplianceTest extends SPARQL11QueryComplianceTest {
3635

37-
@Rule
38-
public TemporaryFolder tempFolder = new TemporaryFolder();
39-
40-
private static final String dirName = "testmanager";
36+
@TempDir
37+
public File tempFolder;
4138

4239
private RepositoryManager manager;
4340

44-
public FedXSPARQL11QueryComplianceTest(String displayName, String testURI, String name, String queryFileURL,
45-
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
46-
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
41+
public FedXSPARQL11QueryComplianceTest() {
42+
super();
4743

4844
// FIXME see https://github.com/eclipse/rdf4j/issues/2173
4945
addIgnoredTest("sq04 - Subquery within graph pattern, default graph does not apply");
5046
}
5147

5248
private void initManager() {
5349
if (manager == null) {
54-
try {
55-
manager = RepositoryProvider.getRepositoryManager(tempFolder.newFolder(dirName));
56-
} catch (IOException e) {
57-
throw new RuntimeException(e);
58-
}
50+
manager = RepositoryProvider.getRepositoryManager(tempFolder);
5951
}
6052
}
6153

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbPARQL11UpdateComplianceTest.java‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,26 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.sail.lmdb;
1212

13-
import java.util.Map;
13+
import java.io.File;
1414

15-
import org.eclipse.rdf4j.model.IRI;
1615
import org.eclipse.rdf4j.repository.Repository;
1716
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
1817
import org.eclipse.rdf4j.repository.sail.SailRepository;
1918
import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreConfig;
2019
import org.eclipse.rdf4j.testsuite.query.parser.sparql.manifest.SPARQL11UpdateComplianceTest;
21-
import org.junit.Rule;
22-
import org.junit.rules.TemporaryFolder;
20+
import org.junit.jupiter.api.io.TempDir;
2321

2422
/**
2523
* Test SPARQL 1.1 Update functionality on LMDB store.
2624
*/
2725
public class LmdbPARQL11UpdateComplianceTest extends SPARQL11UpdateComplianceTest {
2826

29-
public LmdbPARQL11UpdateComplianceTest(String displayName, String testURI, String name, String requestFile,
30-
IRI defaultGraphURI, Map<String, IRI> inputNamedGraphs, IRI resultDefaultGraphURI,
31-
Map<String, IRI> resultNamedGraphs) {
32-
super(displayName, testURI, name, requestFile, defaultGraphURI, inputNamedGraphs, resultDefaultGraphURI,
33-
resultNamedGraphs);
34-
// TODO Auto-generated constructor stub
35-
}
36-
37-
@Rule
38-
public TemporaryFolder folder = new TemporaryFolder();
27+
@TempDir
28+
public File folder;
3929

4030
@Override
4131
protected Repository newRepository() throws Exception {
4232
return new DatasetRepository(
43-
new SailRepository(new LmdbStore(folder.newFolder(), new LmdbStoreConfig("spoc"))));
33+
new SailRepository(new LmdbStore(folder, new LmdbStoreConfig("spoc"))));
4434
}
4535
}

‎compliance/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbSPARQL11QueryComplianceTest.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,27 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.sail.lmdb;
1212

13-
import org.eclipse.rdf4j.query.Dataset;
13+
import java.io.File;
14+
1415
import org.eclipse.rdf4j.repository.Repository;
1516
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
1617
import org.eclipse.rdf4j.repository.sail.SailRepository;
1718
import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreConfig;
1819
import org.eclipse.rdf4j.testsuite.query.parser.sparql.manifest.SPARQL11QueryComplianceTest;
19-
import org.junit.Rule;
20-
import org.junit.rules.TemporaryFolder;
20+
import org.junit.jupiter.api.io.TempDir;
2121

2222
/**
2323
* Test SPARQL 1.1 query functionality on LMDB store.
2424
*/
2525
public class LmdbSPARQL11QueryComplianceTest extends SPARQL11QueryComplianceTest {
2626

27-
public LmdbSPARQL11QueryComplianceTest(String displayName, String testURI, String name, String queryFileURL,
28-
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
29-
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
30-
}
31-
32-
@Rule
33-
public TemporaryFolder folder = new TemporaryFolder();
27+
@TempDir
28+
public File folder;
3429

3530
@Override
3631
protected Repository newRepository() throws Exception {
3732
return new DatasetRepository(
38-
new SailRepository(new LmdbStore(folder.newFolder(), new LmdbStoreConfig("spoc"))));
33+
new SailRepository(new LmdbStore(folder, new LmdbStoreConfig("spoc"))));
3934
}
4035

4136
}

0 commit comments

Comments
 (0)