switch SPARQL ?resource variable to ?this in order to align with SHACL

jimkont · jimkont · commit c210ae9b4efa · 2016-01-30T17:19:45.000+02:00
diff --git a/ns/core.ttl b/ns/core.ttl
@@ -85,7 +85,7 @@ rut:Pattern
 rut:sparqlWherePattern
     a owl:DatatypeProperty ;
     rdfs:label "sparqlWherePattern"@en ;
-    rdfs:comment "The WHERE part of a sparql query with %%parameter%% placeholders. Must bind variables ?resource and ?message (see rut:sparqlWhere)"@en ;
+    rdfs:comment "The WHERE part of a sparql query with %%parameter%% placeholders. Must bind variables ?this and ?message (see rut:sparqlWhere)"@en ;
     rdfs:domain rut:Pattern ;
     rdfs:range xsd:string .
 
@@ -331,7 +331,7 @@ rut:sparqlWhere
     rdfs:label "sparqlWhere"@en ;
     rdfs:comment
         """The WHERE part of a SPARQL query. Must be enclosed in brackets {} and bind the following variables:
-        ?resource: the instance (URI) where the constraint violation occurs;
+        ?this: the instance (URI) where the constraint violation occurs;
         ?message: a logging message."""@en ;
     rdfs:domain rut:ManualTestCase ;
     rdfs:range xsd:string .
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/io/writer/RDFHTMLResultsRlogWriter.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/io/writer/RDFHTMLResultsRlogWriter.java
@@ -49,11 +49,11 @@ protected StringBuffer getResultsList(QueryExecutionFactory qef, String testExec
         String template = "<tr class=\"%s\"><td>%s</td><td>%s</ts><td><a href=\"%s\">%s</a></td><td>%s</td></tr>";
 
         String sparql = PrefixNSService.getSparqlPrefixDecl() +
-                " SELECT DISTINCT ?level ?message ?resource ?testcase WHERE {" +
+                " SELECT DISTINCT ?level ?message ?this ?testcase WHERE {" +
                 " ?s a rut:RLOGTestCaseResult ; " +
                 "    rlog:level ?level ;" +
                 "    rlog:message ?message ; " +
-                "    rlog:resource ?resource ; " +
+                "    rlog:resource ?this ; " +
                 "    rut:testCase ?testcase ; " +
                 //"    prov:wasGeneratedBy <" + testExecutionURI + "> " +
                 "} ";
@@ -68,7 +68,7 @@ protected StringBuffer getResultsList(QueryExecutionFactory qef, String testExec
                 QuerySolution qs = rs.next();
                 String level = qs.get("level").toString();
                 String message = qs.get("message").toString();
-                String resource = qs.get("resource").toString();
+                String resource = qs.get("this").toString();
                 String testcase = qs.get("testcase").toString();
 
                 String levelShort = PrefixNSService.getLocalName(level, "rlog");
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/io/writer/RDFHTMLResultsShaclWriter.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/io/writer/RDFHTMLResultsShaclWriter.java
@@ -49,11 +49,11 @@ protected StringBuffer getResultsList(QueryExecutionFactory qef, String testExec
         String template = "<tr class=\"%s\"><td>%s</td><td>%s</ts><td><a href=\"%s\">%s</a></td><td>%s</td></tr>";
 
         String sparql = PrefixNSService.getSparqlPrefixDecl() +
-                " SELECT DISTINCT ?level ?message ?resource ?testcase WHERE {" +
+                " SELECT DISTINCT ?level ?message ?this ?testcase WHERE {" +
                 " ?s a sh:ValidationResult ; " +
                 "    sh:severity ?level ;" +
                 "    sh:message ?message ; " +
-                "    sh:focusNode ?resource ; " +
+                "    sh:focusNode ?this ; " +
                 "    rut:testCase ?testcase ; " +
                 //"    prov:wasGeneratedBy <" + testExecutionURI + "> " +
                 "} ";
@@ -68,7 +68,7 @@ protected StringBuffer getResultsList(QueryExecutionFactory qef, String testExec
                 QuerySolution qs = rs.next();
                 String level = qs.get("level").toString();
                 String message = qs.get("message").toString();
-                String resource = qs.get("resource").toString();
+                String resource = qs.get("this").toString();
                 String testcase = qs.get("testcase").toString();
 
                 String levelShort = PrefixNSService.getLocalName(level, "rlog");
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/TestCaseValidator.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/TestCaseValidator.java
@@ -50,13 +50,13 @@ public void validate() {
         // check for Resource & message
         boolean hasResource = false;
         for (String v : vars) {
-            if ("resource".equals(v)) {
+            if ("this".equals(v)) {
                 hasResource = true;
             }
 
         }
         if (!hasResource) {
-           // throw new TestCaseInstantiationException("?resource is not included in SELECT for Test: " + testCase.getTestURI());
+           // throw new TestCaseInstantiationException("?this is not included in SELECT for Test: " + testCase.getTestURI());
         }
 
         // Message is allowed to exist either in SELECT or as a result annotation
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/executors/ExtendedTestExecutor.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/executors/ExtendedTestExecutor.java
@@ -60,8 +60,8 @@ protected Collection<TestCaseResult> executeSingleTest(TestSource testSource, Te
 
                 QuerySolution qs = results.next();
 
-                String resource = qs.get("resource").toString();
-                if (qs.get("resource").isLiteral()) {
+                String resource = qs.get("this").toString();
+                if (qs.get("this").isLiteral()) {
                     resource = StringUtils.getHashFromString(resource);
                 }
                 String message = testCase.getResultMessage();
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/executors/RLOGTestExecutor.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/executors/RLOGTestExecutor.java
@@ -54,8 +54,8 @@ protected Collection<TestCaseResult> executeSingleTest(TestSource testSource, Te
 
                 QuerySolution qs = results.next();
 
-                String resource = qs.get("resource").toString();
-                if (qs.get("resource").isLiteral()) {
+                String resource = qs.get("this").toString();
+                if (qs.get("this").isLiteral()) {
                     resource = StringUtils.getHashFromString(resource);
                 }
                 String message = testCase.getResultMessage();
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/executors/ShaclFullTestExecutor.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/executors/ShaclFullTestExecutor.java
@@ -58,8 +58,8 @@ protected Collection<TestCaseResult> executeSingleTest(TestSource testSource, Te
 
                 QuerySolution qs = results.next();
 
-                String resource = qs.get("resource").toString();
-                if (qs.get("resource").isLiteral()) {
+                String resource = qs.get("this").toString();
+                if (qs.get("this").isLiteral()) {
                     resource = StringUtils.getHashFromString(resource);
                 }
                 String message = testCase.getResultMessage();
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/executors/ShaclSimpleTestExecutor.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/executors/ShaclSimpleTestExecutor.java
@@ -54,8 +54,8 @@ protected Collection<TestCaseResult> executeSingleTest(TestSource testSource, Te
 
                 QuerySolution qs = results.next();
 
-                String resource = qs.get("resource").toString();
-                if (qs.get("resource").isLiteral()) {
+                String resource = qs.get("this").toString();
+                if (qs.get("this").isLiteral()) {
                     resource = StringUtils.getHashFromString(resource);
                 }
                 String message = testCase.getResultMessage();
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/query_generation/QueryGenerationCountFactory.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/query_generation/QueryGenerationCountFactory.java
@@ -14,10 +14,10 @@
  */
 public class QueryGenerationCountFactory implements QueryGenerationFactory {
 
-    private static final String selectClauseSimple = " SELECT (count(DISTINCT ?resource ) AS ?total ) WHERE ";
+    private static final String selectClauseSimple = " SELECT (count(DISTINCT ?this ) AS ?total ) WHERE ";
 
-    private static final String selectClauseGroupStart = " SELECT (count(DISTINCT ?resource ) AS ?total ) WHERE {" +
-                                                   " SELECT ?resource WHERE ";
+    private static final String selectClauseGroupStart = " SELECT (count(DISTINCT ?this ) AS ?total ) WHERE {" +
+                                                   " SELECT ?this WHERE ";
     private static final String selectClauseGroupEnd = "}";
 
     /** {@inheritDoc} */
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/query_generation/QueryGenerationExtendedSelectFactory.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/query_generation/QueryGenerationExtendedSelectFactory.java
@@ -11,21 +11,21 @@
 
 /**
  * Factory that returns select queries and besides
- * SELECT ?resource it adds all variable annotations
+ * SELECT ?this it adds all variable annotations
  *
  * @author Dimitris Kontokostas
  * @since 7/25/14 10:02 PM
  * @version $Id: $Id
  */
 public class QueryGenerationExtendedSelectFactory implements QueryGenerationFactory {
 
-    private static final String selectDistinctResource = " SELECT DISTINCT ?resource ";
+    private static final String selectDistinctResource = " SELECT DISTINCT ?this ";
 
-    private static final String resourceVar = "?resource";
+    private static final String resourceVar = "?this";
 
     private static final String whereClause = " WHERE ";
 
-    private static final String orderByResourceAsc = "  ORDER BY ASC(?resource) ";
+    private static final String orderByResourceAsc = "  ORDER BY ASC(?this) ";
 
     /** {@inheritDoc} */
     @Override
diff --git a/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/query_generation/QueryGenerationSelectFactory.java b/rdfunit-core/src/main/java/org/aksw/rdfunit/tests/query_generation/QueryGenerationSelectFactory.java
@@ -14,7 +14,7 @@
  */
 public class QueryGenerationSelectFactory implements QueryGenerationFactory {
 
-    private static final String selectClause = " SELECT DISTINCT ?resource WHERE ";
+    private static final String selectClause = " SELECT DISTINCT ?this WHERE ";
 
     /** {@inheritDoc} */
     @Override
diff --git a/rdfunit-core/src/test/java/org/aksw/rdfunit/tests/query_generation/QueryGenerationSelectFactoryTest.java b/rdfunit-core/src/test/java/org/aksw/rdfunit/tests/query_generation/QueryGenerationSelectFactoryTest.java
@@ -19,9 +19,9 @@ public class QueryGenerationSelectFactoryTest {
 
     private static final String sparqlPrefix = "";
 
-    private static final String sparqlSelect = " SELECT DISTINCT ?resource WHERE ";
+    private static final String sparqlSelect = " SELECT DISTINCT ?this WHERE ";
 
-    private static final String goodSparqlQuery = "{ ?resource ?p ?o }";
+    private static final String goodSparqlQuery = "{ ?this ?p ?o }";
 
     private QueryGenerationSelectFactory queryGenerationSelectFactory;
 
diff --git a/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/dbpedia.org/dbpedia.org.tests.Manual.ttl b/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/dbpedia.org/dbpedia.org.tests.Manual.ttl
@@ -47,10 +47,10 @@ rutt:dbpedia-org-manual-dateofbirthbirthdate
     rut:references <http://dbpedia.org/property/dateOfBirth>  ;
     rut:source <http://dbpedia.org> ;
     rut:sparqlWhere """ {
-                                 ?resource <http://dbpedia.org/property/dateOfBirth> ?v1 .
-                                 FILTER NOT EXISTS {?resource <http://dbpedia.org/ontology/birthDate> ?v2}} """ ;
-    rut:sparqlPrevalence """ SELECT (count(?resource) AS ?total) WHERE {
-                                 ?resource <http://dbpedia.org/property/dateOfBirth> ?v1 . } """ ;
+                                 ?this <http://dbpedia.org/property/dateOfBirth> ?v1 .
+                                 FILTER NOT EXISTS {?this <http://dbpedia.org/ontology/birthDate> ?v2}} """ ;
+    rut:sparqlPrevalence """ SELECT (count(?this) AS ?total) WHERE {
+                                 ?this <http://dbpedia.org/property/dateOfBirth> ?v1 . } """ ;
     rut:testCaseLogLevel
               rlog:WARN .
 
diff --git a/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/dbpedia.org/ontology/dbo.tests.Manual.ttl b/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/dbpedia.org/ontology/dbo.tests.Manual.ttl
@@ -133,16 +133,16 @@ rutt:dbo-LITRAN-rangeheightperson
     rut:source <http://dbpedia.org/ontology/> ;
     rut:sparqlWhere """  {
                              {
-                                ?resource a <http://dbpedia.org/ontology/Person> .
-                                ?resource <http://dbpedia.org/ontology/height> ?v1 .
+                                ?this a <http://dbpedia.org/ontology/Person> .
+                                ?this <http://dbpedia.org/ontology/height> ?v1 .
                              }  UNION {
-                                ?resource a ?class .
+                                ?this a ?class .
                                 ?class rdfs:subClassOf+ <http://dbpedia.org/ontology/Person> .
-                                ?resource <http://dbpedia.org/ontology/height> ?v1 .
+                                ?this <http://dbpedia.org/ontology/height> ?v1 .
                              }
                              FILTER ( !(xsd:double(?v1) < 44 || xsd:double(?v1) > 250))} """ ;
-    rut:sparqlPrevalence """ SELECT (count(?resource) AS ?total) WHERE {
-                                 ?resource <http://dbpedia.org/ontology/height> ?v1 . } """ ;
+    rut:sparqlPrevalence """ SELECT (count(?this) AS ?total) WHERE {
+                                 ?this <http://dbpedia.org/ontology/height> ?v1 . } """ ;
     rut:testCaseLogLevel
         rlog:WARN ;
     rut:resultAnnotation [
diff --git a/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/lemon-model.net/lemon/lemon.tests.Manual.ttl b/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/lemon-model.net/lemon/lemon.tests.Manual.ttl
diff --git a/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/persistence.uni-leipzig.org/nlp2rdf/ontologies/nif-core/nif.tests.Manual.ttl b/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/persistence.uni-leipzig.org/nlp2rdf/ontologies/nif-core/nif.tests.Manual.ttl
diff --git a/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/www.w3.org/2004/02/skos/core/skos.tests.Manual.ttl b/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/www.w3.org/2004/02/skos/core/skos.tests.Manual.ttl
diff --git a/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/www.w3.org/ns/r2rml/rr.tests.Manual.ttl b/rdfunit-manual-tests/src/main/resources/org/aksw/rdfunit/tests/Manual/www.w3.org/ns/r2rml/rr.tests.Manual.ttl
diff --git a/rdfunit-model/src/main/resources/org/aksw/rdfunit/configuration/patterns.ttl b/rdfunit-model/src/main/resources/org/aksw/rdfunit/configuration/patterns.ttl

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ public void validate() {`
`50`	`50`	`// check for Resource & message`
`51`	`51`	`boolean hasResource = false;`
`52`	`52`	`for (String v : vars) {`
`53`		`- if ("resource".equals(v)) {`
	`53`	`+ if ("this".equals(v)) {`
`54`	`54`	`hasResource = true;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`}`
`58`	`58`	`if (!hasResource) {`
`59`		`- // throw new TestCaseInstantiationException("?resource is not included in SELECT for Test: " + testCase.getTestURI());`
	`59`	`+ // throw new TestCaseInstantiationException("?this is not included in SELECT for Test: " + testCase.getTestURI());`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`// Message is allowed to exist either in SELECT or as a result annotation`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ protected Collection<TestCaseResult> executeSingleTest(TestSource testSource, Te`
`60`	`60`
`61`	`61`	`QuerySolution qs = results.next();`
`62`	`62`
`63`		`- String resource = qs.get("resource").toString();`
`64`		`- if (qs.get("resource").isLiteral()) {`
	`63`	`+ String resource = qs.get("this").toString();`
	`64`	`+ if (qs.get("this").isLiteral()) {`
`65`	`65`	`resource = StringUtils.getHashFromString(resource);`
`66`	`66`	`}`
`67`	`67`	`String message = testCase.getResultMessage();`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ protected Collection<TestCaseResult> executeSingleTest(TestSource testSource, Te`
`54`	`54`
`55`	`55`	`QuerySolution qs = results.next();`
`56`	`56`
`57`		`- String resource = qs.get("resource").toString();`
`58`		`- if (qs.get("resource").isLiteral()) {`
	`57`	`+ String resource = qs.get("this").toString();`
	`58`	`+ if (qs.get("this").isLiteral()) {`
`59`	`59`	`resource = StringUtils.getHashFromString(resource);`
`60`	`60`	`}`
`61`	`61`	`String message = testCase.getResultMessage();`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ protected Collection<TestCaseResult> executeSingleTest(TestSource testSource, Te`
`58`	`58`
`59`	`59`	`QuerySolution qs = results.next();`
`60`	`60`
`61`		`- String resource = qs.get("resource").toString();`
`62`		`- if (qs.get("resource").isLiteral()) {`
	`61`	`+ String resource = qs.get("this").toString();`
	`62`	`+ if (qs.get("this").isLiteral()) {`
`63`	`63`	`resource = StringUtils.getHashFromString(resource);`
`64`	`64`	`}`
`65`	`65`	`String message = testCase.getResultMessage();`