Merge branch 'develop' into GH-4819-merge-join

eclipse-rdf4j · Nov 23, 2023 · e58cbae · e58cbae
2 parents 6072846 + bb7ac22
commit e58cbae
Show file tree

Hide file tree

Showing 79 changed files with 2,758 additions and 3,562 deletions.
diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml
@@ -124,6 +124,37 @@ jobs:
           repo: eclipse/rdf4j
           workflow_id: ${{ github.run_id }}
           access_token: ${{ github.token }}
+  e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-jdk11-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-jdk11-maven-
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y libxml2-utils
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: Run end-to-end tests of RDF4J Server and Workbench
+        working-directory: ./e2e
+        run: ./run.sh
+      - name: Cancel workflow on failure
+        uses: vishnudxb/[email protected]
+        if: failure()
+        with:
+          repo: eclipse/rdf4j
+          workflow_id: ${{ github.run_id }}
+          access_token: ${{ github.token }}
   copyright-check:
     runs-on: ubuntu-latest
     steps:

diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,7 @@ compliance/*/overlays
 docker/ignore
 /core/queryparser/sparql/JavaCC/javacc/
 /scripts/temp/
+org.eclipse.dash.licenses-1.0.2.jar
+e2e/node_modules
+e2e/playwright-report
+e2e/test-results
diff --git a/...rql/src/test/java/org/eclipse/rdf4j/query/algebra/geosparql/MemoryGeoSPARQLQueryTest.java b/...rql/src/test/java/org/eclipse/rdf4j/query/algebra/geosparql/MemoryGeoSPARQLQueryTest.java
@@ -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());

diff --git a/...ance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/HTTPSparqlUpdateTest.java b/...ance/sparql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/HTTPSparqlUpdateTest.java
@@ -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;
 

diff --git a/...parql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/manifest/SPARQL12QueryTest.java b/...parql/src/test/java/org/eclipse/rdf4j/query/parser/sparql/manifest/SPARQL12QueryTest.java
@@ -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;
@@ -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()));

diff --git a/...est/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL10QueryTest.java b/...est/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL10QueryTest.java
@@ -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;
@@ -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()));

diff --git a/...est/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11QueryTest.java b/...est/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11QueryTest.java
diff --git a/...st/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11SyntaxTest.java b/...st/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11SyntaxTest.java
@@ -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);

diff --git a/...st/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11UpdateTest.java b/...st/java/org/eclipse/rdf4j/query/parser/sparql/manifest/W3CApprovedSPARQL11UpdateTest.java
@@ -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;
@@ -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());

diff --git a/...arql/src/test/java/org/eclipse/rdf4j/sail/federation/FedXSPARQL11QueryComplianceTest.java b/...arql/src/test/java/org/eclipse/rdf4j/sail/federation/FedXSPARQL11QueryComplianceTest.java
@@ -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;
@@ -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);
 		}
 	}
 

diff --git a/...nce/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbPARQL11UpdateComplianceTest.java b/...nce/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbPARQL11UpdateComplianceTest.java
@@ -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"))));
 	}
 }
diff --git a/...nce/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbSPARQL11QueryComplianceTest.java b/...nce/sparql/src/test/java/org/eclipse/rdf4j/sail/lmdb/LmdbSPARQL11QueryComplianceTest.java
@@ -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"))));
 	}
 
 }