You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2022/01/27 22:23:48 UTC
[jena] branch main updated: JENA-2262: Fix test configuration
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 60cc29c JENA-2262: Fix test configuration
new be5c8ab Merge pull request #1179 from afs/test-admin
60cc29c is described below
commit 60cc29c3cfaf16682f378470ea4c23413f20111d
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Thu Jan 27 21:14:59 2022 +0000
JENA-2262: Fix test configuration
---
.../org/apache/jena/fuseki/build/FusekiConfig.java | 5 ++++-
.../test/java/org/apache/jena/fuseki/TestAdmin.java | 20 +++++++++++++++-----
.../testing/{config-tdb2.ttl => config-tdb2a.ttl} | 12 ++++++------
.../testing/{config-tdb2.ttl => config-tdb2b.ttl} | 12 ++++++------
4 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
index 8c61283..c1bb42d 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
@@ -626,7 +626,10 @@ public class FusekiConfig {
Resource r = (Resource)ep;
try {
// [ fuseki:name ""; fuseki:allowedUsers ( "" "" ) ]
- endpointName = r.getProperty(FusekiVocab.pEndpointName).getString();
+ Statement stmt = r.getProperty(FusekiVocab.pEndpointName);
+ if ( stmt == null )
+ throw new FusekiConfigException("Expected property <"+FusekiVocab.pEndpointName+"> with <"+property.getURI()+"> for <"+svc+">");
+ endpointName = stmt.getString();
List<RDFNode> x = GraphUtils.multiValue(r, FusekiVocab.pAllowedUsers);
if ( x.size() > 1 )
throw new FusekiConfigException("Multiple fuseki:"+FusekiVocab.pAllowedUsers.getLocalName()+" for "+r);
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
index f39c7a4..3060ebd 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdmin.java
@@ -32,6 +32,7 @@ import java.net.http.HttpRequest.BodyPublishers;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.SystemUtils;
@@ -63,7 +64,7 @@ public class TestAdmin extends AbstractFusekiWebappTest {
// There are two Fuseki-TDB2 tests: add_delete_dataset_6() and compact_01().
//
- // On certain build systems (GH action/Linux underload, ASF Jenkins sometimes),
+ // On certain build systems (GH action/Linux under load, ASF Jenkins sometimes),
// add_delete_dataset_6 fails (transactions active), or compact_01 (gets a 404),
// if the two databases are the same.
static String dsTestTdb2a = "test-tdb2a";
@@ -216,7 +217,7 @@ public class TestAdmin extends AbstractFusekiWebappTest {
checkNotThere(testDB);
- addTestDatasetTdb2();
+ addTestDatasetTDB2(testDB);
// Check exists.
checkExists(testDB);
@@ -335,7 +336,7 @@ public class TestAdmin extends AbstractFusekiWebappTest {
String testDB = dsTestTdb2b;
try {
checkNotThere(testDB);
- addTestDatasetTdb2();
+ addTestDatasetTDB2(testDB);
checkExists(testDB);
String id = null;
@@ -549,8 +550,17 @@ public class TestAdmin extends AbstractFusekiWebappTest {
addTestDataset(fileBase+"config-ds-inf.ttl");
}
- private static void addTestDatasetTdb2() {
- addTestDataset(fileBase+"config-tdb2.ttl");
+ private static void addTestDatasetTDB2(String DBname) {
+ Objects.nonNull(DBname);
+ if ( DBname.equals(dsTestTdb2a) ) {
+ addTestDataset(fileBase+"config-tdb2a.ttl");
+ return;
+ }
+ if ( DBname.equals(dsTestTdb2b) ) {
+ addTestDataset(fileBase+"config-tdb2b.ttl");
+ return;
+ }
+ throw new IllegalArgumentException("No configuration for "+DBname);
}
private static void addTestDataset(String filename) {
diff --git a/jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2.ttl b/jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2a.ttl
similarity index 60%
copy from jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2.ttl
copy to jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2a.ttl
index 0c35f4c..6ad26b9 100644
--- a/jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2.ttl
+++ b/jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2a.ttl
@@ -8,11 +8,11 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
PREFIX tdb2: <http://jena.apache.org/2016/tdb#>
-<#service1> #rdf:type fuseki:Service ;
- # URI of the dataset -- http://host:port/ds
- fuseki:name "test-tdb2" ;
- fuseki:serviceQuery "sparql" ;
- fuseki:dataset <#dataset> .
+<#service1> rdf:type fuseki:Service ;
+ fuseki:name "test-tdb2a" ;
+ fuseki:endpoint [ fuseki:name "sparql" ;
+ fuseki:operation fuseki:query ] ;
+ fuseki:dataset <#dataset> .
<#dataset> rdf:type tdb2:DatasetTDB2 ;
- tdb2:location "target/tdb2" .
+ tdb2:location "target/tdb2a" .
diff --git a/jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2.ttl b/jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2b.ttl
similarity index 60%
rename from jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2.ttl
rename to jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2b.ttl
index 0c35f4c..572927c 100644
--- a/jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2.ttl
+++ b/jena-fuseki2/jena-fuseki-webapp/testing/config-tdb2b.ttl
@@ -8,11 +8,11 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX ja: <http://jena.hpl.hp.com/2005/11/Assembler#>
PREFIX tdb2: <http://jena.apache.org/2016/tdb#>
-<#service1> #rdf:type fuseki:Service ;
- # URI of the dataset -- http://host:port/ds
- fuseki:name "test-tdb2" ;
- fuseki:serviceQuery "sparql" ;
- fuseki:dataset <#dataset> .
+<#service1> rdf:type fuseki:Service ;
+ fuseki:name "test-tdb2b" ;
+ fuseki:endpoint [ fuseki:name "sparql" ;
+ fuseki:operation fuseki:query ] ;
+ fuseki:dataset <#dataset> .
<#dataset> rdf:type tdb2:DatasetTDB2 ;
- tdb2:location "target/tdb2" .
+ tdb2:location "target/tdb2b" .