Skip to content
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

GH-4592 Replace a Junit4 Suite with v5 DynamicTest #4593

Merged
merged 6 commits into from
Nov 23, 2023
Merged

GH-4592 Replace a Junit4 Suite with v5 DynamicTest #4593

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
21fb00e
GH-4592 Replace a Junit4 Suite with v5 DynamicTest
JervenBolleman May 22, 2023
b7fc16b
GH-4592 Replace more Junit4 Suite with v5 DynamicTest
JervenBolleman May 22, 2023
940e316
GH-4592 Make sure tests do not share state as they run concurrently.
JervenBolleman Nov 3, 2023
7beed16
GH-4592 Reduce code duplication and difference to the develop branch.
JervenBolleman Nov 3, 2023
da3e01e
GH-4592 Reenable geosparql junit testing.
JervenBolleman Nov 10, 2023
04143fb
GH-4592 Fix missing @TestFactory
JervenBolleman Nov 10, 2023
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
6 changes: 0 additions & 6 deletions ...rql/src/test/java/org/eclipse/rdf4j/query/algebra/geosparql/MemoryGeoSPARQLQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,13 @@
*******************************************************************************/
package org.eclipse.rdf4j.query.algebra.geosparql;

import org.eclipse.rdf4j.query.Dataset;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.sail.SailRepository;
import org.eclipse.rdf4j.sail.memory.MemoryStore;
import org.eclipse.rdf4j.testsuite.query.algebra.geosparql.GeoSPARQLManifestTest;

public class MemoryGeoSPARQLQueryTest extends GeoSPARQLManifestTest {

public MemoryGeoSPARQLQueryTest(String displayName, String testURI, String name, String queryFileURL,
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
}

@Override
protected Repository newRepository() {
return new SailRepository(new MemoryStore());
Expand Down
6 changes: 3 additions & 3 deletions ...ance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/HTTPSparqlUpdateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*******************************************************************************/
package org.eclipse.rdf4j.query.parser.sparql;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.List;

Expand Down
6 changes: 0 additions & 6 deletions ...parql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/manifest/SPARQL12QueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.rdf4j.query.parser.sparql.manifest;

import org.eclipse.rdf4j.query.Dataset;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
import org.eclipse.rdf4j.repository.sail.SailRepository;
Expand All @@ -24,11 +23,6 @@
*/
public class SPARQL12QueryTest extends SPARQL12QueryComplianceTest {

public SPARQL12QueryTest(String displayName, String testURI, String name, String queryFileURL, String resultFileURL,
Dataset dataset, boolean ordered, boolean laxCardinality) {
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
}

@Override
protected Repository newRepository() {
return new DatasetRepository(new SailRepository(new MemoryStore()));
Expand Down
15 changes: 0 additions & 15 deletions ...est/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL10QueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.rdf4j.query.parser.sparql.manifest;

import org.eclipse.rdf4j.query.Dataset;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
import org.eclipse.rdf4j.repository.sail.SailRepository;
Expand All @@ -24,20 +23,6 @@
*/
public class W3CApprovedSPARQL10QueryTest extends SPARQL10QueryComplianceTest {

/**
* @param displayName
* @param testURI
* @param name
* @param queryFileURL
* @param resultFileURL
* @param dataset
* @param ordered
*/
public W3CApprovedSPARQL10QueryTest(String displayName, String testURI, String name, String queryFileURL,
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
}

@Override
protected Repository newRepository() {
return new DatasetRepository(new SailRepository(new MemoryStore()));
Expand Down
79 changes: 0 additions & 79 deletions ...est/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11QueryTest.java
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ...st/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11SyntaxTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@

public class W3CApprovedSPARQL11SyntaxTest extends SPARQL11SyntaxComplianceTest {

/**
* @param displayName
* @param testURI
* @param name
* @param queryFileURL
* @param resultFileURL
* @param positiveTest
*/
public W3CApprovedSPARQL11SyntaxTest(String displayName, String testURI, String name, String queryFileURL,
boolean positiveTest) {
super(displayName, testURI, name, queryFileURL, positiveTest);
}

@Override
protected ParsedOperation parseOperation(String operation, String fileURL) throws MalformedQueryException {
return QueryParserUtil.parseOperation(QueryLanguage.SPARQL, operation, fileURL);
Expand Down
10 changes: 0 additions & 10 deletions ...st/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11UpdateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
*******************************************************************************/
package org.eclipse.rdf4j.query.parser.sparql.manifest;

import java.util.Map;

import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.sail.SailRepository;
import org.eclipse.rdf4j.sail.memory.MemoryStore;
Expand All @@ -26,13 +23,6 @@
@Deprecated
public class W3CApprovedSPARQL11UpdateTest extends SPARQL11UpdateComplianceTest {

public W3CApprovedSPARQL11UpdateTest(String displayName, String testURI, String name, String requestFile,
IRI defaultGraphURI, Map<String, IRI> inputNamedGraphs, IRI resultDefaultGraphURI,
Map<String, IRI> resultNamedGraphs) {
super(displayName, testURI, name, requestFile, defaultGraphURI, inputNamedGraphs, resultDefaultGraphURI,
resultNamedGraphs);
}

@Override
protected Repository newRepository() {
SailRepository repo = new SailRepository(new MemoryStore());
Expand Down
22 changes: 7 additions & 15 deletions ...arql/src/test/java/org/eclipse/rdf4j/sail/federation/FedXSPARQL11QueryComplianceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.federation;

import java.io.File;
import java.io.IOException;

import org.eclipse.rdf4j.federated.FedXFactory;
import org.eclipse.rdf4j.federated.repository.FedXRepository;
import org.eclipse.rdf4j.query.Dataset;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.RepositoryException;
import org.eclipse.rdf4j.repository.config.RepositoryConfig;
Expand All @@ -26,36 +26,28 @@
import org.eclipse.rdf4j.repository.sail.config.SailRepositoryConfig;
import org.eclipse.rdf4j.sail.memory.config.MemoryStoreConfig;
import org.eclipse.rdf4j.testsuite.query.parser.sparql.manifest.SPARQL11QueryComplianceTest;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import org.junit.jupiter.api.io.TempDir;

/**
* @author jeen
*/
public class FedXSPARQL11QueryComplianceTest extends SPARQL11QueryComplianceTest {

@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();

private static final String dirName = "testmanager";
@TempDir
public File tempFolder;

private RepositoryManager manager;

public FedXSPARQL11QueryComplianceTest(String displayName, String testURI, String name, String queryFileURL,
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
public FedXSPARQL11QueryComplianceTest() {
super();

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

private void initManager() {
if (manager == null) {
try {
manager = RepositoryProvider.getRepositoryManager(tempFolder.newFolder(dirName));
} catch (IOException e) {
throw new RuntimeException(e);
}
manager = RepositoryProvider.getRepositoryManager(tempFolder);
}
}

Expand Down
20 changes: 5 additions & 15 deletions ...nce/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbPARQL11UpdateComplianceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,26 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.lmdb;

import java.util.Map;
import java.io.File;

import org.eclipse.rdf4j.model.IRI;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
import org.eclipse.rdf4j.repository.sail.SailRepository;
import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreConfig;
import org.eclipse.rdf4j.testsuite.query.parser.sparql.manifest.SPARQL11UpdateComplianceTest;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import org.junit.jupiter.api.io.TempDir;

/**
* Test SPARQL 1.1 Update functionality on LMDB store.
*/
public class LmdbPARQL11UpdateComplianceTest extends SPARQL11UpdateComplianceTest {

public LmdbPARQL11UpdateComplianceTest(String displayName, String testURI, String name, String requestFile,
IRI defaultGraphURI, Map<String, IRI> inputNamedGraphs, IRI resultDefaultGraphURI,
Map<String, IRI> resultNamedGraphs) {
super(displayName, testURI, name, requestFile, defaultGraphURI, inputNamedGraphs, resultDefaultGraphURI,
resultNamedGraphs);
// TODO Auto-generated constructor stub
}

@Rule
public TemporaryFolder folder = new TemporaryFolder();
@TempDir
public File folder;

@Override
protected Repository newRepository() throws Exception {
return new DatasetRepository(
new SailRepository(new LmdbStore(folder.newFolder(), new LmdbStoreConfig("spoc"))));
new SailRepository(new LmdbStore(folder, new LmdbStoreConfig("spoc"))));
}
}
17 changes: 6 additions & 11 deletions ...nce/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbSPARQL11QueryComplianceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,27 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.lmdb;

import org.eclipse.rdf4j.query.Dataset;
import java.io.File;

import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
import org.eclipse.rdf4j.repository.sail.SailRepository;
import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreConfig;
import org.eclipse.rdf4j.testsuite.query.parser.sparql.manifest.SPARQL11QueryComplianceTest;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import org.junit.jupiter.api.io.TempDir;

/**
* Test SPARQL 1.1 query functionality on LMDB store.
*/
public class LmdbSPARQL11QueryComplianceTest extends SPARQL11QueryComplianceTest {

public LmdbSPARQL11QueryComplianceTest(String displayName, String testURI, String name, String queryFileURL,
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
}

@Rule
public TemporaryFolder folder = new TemporaryFolder();
@TempDir
public File folder;

@Override
protected Repository newRepository() throws Exception {
return new DatasetRepository(
new SailRepository(new LmdbStore(folder.newFolder(), new LmdbStoreConfig("spoc"))));
new SailRepository(new LmdbStore(folder, new LmdbStoreConfig("spoc"))));
}

}
12 changes: 2 additions & 10 deletions compliance/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbSPARQLComplianceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,19 @@
import org.eclipse.rdf4j.repository.sail.config.SailRepositoryFactory;
import org.eclipse.rdf4j.sail.lmdb.config.LmdbStoreFactory;
import org.eclipse.rdf4j.testsuite.sparql.RepositorySPARQLComplianceTestSuite;
import org.junit.AfterClass;
import org.junit.BeforeClass;

/**
* Test additional SPARQL functionality on LMDB store.
*/
public class LmdbSPARQLComplianceTest extends RepositorySPARQLComplianceTestSuite {

@BeforeClass
public static void setUpFactory() throws Exception {
setRepositoryFactory(new SailRepositoryFactory() {
public LmdbSPARQLComplianceTest() {
super(new SailRepositoryFactory() {
@Override
public RepositoryImplConfig getConfig() {

return new SailRepositoryConfig(new LmdbStoreFactory().getConfig());
}
});
}

@AfterClass
public static void tearDownFactory() throws Exception {
setRepositoryFactory(null);
}
}
6 changes: 0 additions & 6 deletions ...sparql/src/test/java/org/eclipse/rdf4j/sail/memory/MemorySPARQL11QueryComplianceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.rdf4j.sail.memory;

import org.eclipse.rdf4j.query.Dataset;
import org.eclipse.rdf4j.repository.Repository;
import org.eclipse.rdf4j.repository.dataset.DatasetRepository;
import org.eclipse.rdf4j.repository.sail.SailRepository;
Expand All @@ -23,11 +22,6 @@
*/
public class MemorySPARQL11QueryComplianceTest extends SPARQL11QueryComplianceTest {

public MemorySPARQL11QueryComplianceTest(String displayName, String testURI, String name, String queryFileURL,
String resultFileURL, Dataset dataset, boolean ordered, boolean laxCardinality) {
super(displayName, testURI, name, queryFileURL, resultFileURL, dataset, ordered, laxCardinality);
}

@Override
protected Repository newRepository() {
return new DatasetRepository(new SailRepository(new MemoryStore()));
Expand Down
Loading
Loading