Skip to content

Commit 4de4207

Browse files
committed
GH-4592 allows users to see variables that are used in compliance tests
1 parent a92ae7b commit 4de4207

8 files changed

Lines changed: 191 additions & 179 deletions

File tree

testsuites/sparql/src/main/java/org/eclipse/rdf4j/testsuite/query/parser/sparql/manifest/SPARQL10QueryComplianceTest.java

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

13-
import java.util.ArrayList;
1413
import java.util.Collection;
1514
import java.util.List;
1615

@@ -21,28 +20,26 @@
2120
* A test suite that runs the W3C Approved SPARQL 1.0 query tests.
2221
*
2322
* @author Jeen Broekstra
24-
*
2523
* @see <a href="https://www.w3.org/2009/sparql/docs/tests/">sparql docs test</a>
2624
*/
2725
public abstract class SPARQL10QueryComplianceTest extends SPARQLQueryComplianceTest {
2826

29-
private final List<String> defaultIgnoredTests = new ArrayList<>();
30-
{
31-
// incompatible with SPARQL 1.1 - syntax for decimals was modified
32-
defaultIgnoredTests.add("Basic - Term 6");
33-
// incompatible with SPARQL 1.1 - syntax for decimals was modified
34-
defaultIgnoredTests.add("Basic - Term 7");
35-
// Test is incorrect: assumes timezoned date is comparable with non-timezoned
36-
defaultIgnoredTests.add("date-2");
37-
// Incompatible with SPARQL 1.1 - string-typed literals and plain literals are
38-
// identical
39-
defaultIgnoredTests.add("Strings: Distinct");
40-
// Incompatible with SPARQL 1.1 - string-typed literals and plain literals are
41-
// identical
42-
defaultIgnoredTests.add("All: Distinct");
43-
// Incompatible with SPARQL 1.1 - string-typed literals and plain literals are
44-
// identical
45-
defaultIgnoredTests.add("SELECT REDUCED ?x with strings");
27+
private static final String[] defaultIgnoredTests = {
28+
// incompatible with SPARQL 1.1 - syntax for decimals was modified
29+
"Basic - Term 6",
30+
// incompatible with SPARQL 1.1 - syntax for decimals was modified
31+
"Basic - Term 7",
32+
// Test is incorrect: assumes timezoned date is comparable with non-timezoned
33+
"date-2",
34+
// Incompatible with SPARQL 1.1 - string-typed literals and plain literals are
35+
// identical
36+
"Strings: Distinct",
37+
// Incompatible with SPARQL 1.1 - string-typed literals and plain literals are
38+
// identical
39+
"All: Distinct",
40+
// Incompatible with SPARQL 1.1 - string-typed literals and plain literals are
41+
// identical
42+
"SELECT REDUCED ?x with strings"
4643
};
4744

4845
public SPARQL10QueryComplianceTest() {

testsuites/sparql/src/main/java/org/eclipse/rdf4j/testsuite/query/parser/sparql/manifest/SPARQL11QueryComplianceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
* A test suite that runs the W3C Approved SPARQL 1.1 query tests.
2121
*
2222
* @author Jeen Broekstra
23-
*
2423
* @see <a href="https://www.w3.org/2009/sparql/docs/tests/">sparql docs tests</a>
2524
*/
2625
public abstract class SPARQL11QueryComplianceTest extends SPARQLQueryComplianceTest {
2726

2827
public SPARQL11QueryComplianceTest() {
2928
super(List.of("service"));
30-
for (String ig : defaultIgnoredTests)
29+
for (String ig : defaultIgnoredTests) {
3130
addIgnoredTest(ig);
31+
}
3232
}
3333

3434
private static final String[] defaultIgnoredTests = {

testsuites/sparql/src/main/java/org/eclipse/rdf4j/testsuite/query/parser/sparql/manifest/SPARQL11SyntaxComplianceTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* A test suite that runs the W3C Approved SPARQL 1.1 Syntax tests.
1818
*
1919
* @author Jeen Broekstra
20-
*
2120
* @see <a href="https://www.w3.org/2009/sparql/docs/tests/">sparql docs tests</a>
2221
*/
2322

testsuites/sparql/src/main/java/org/eclipse/rdf4j/testsuite/query/parser/sparql/manifest/SPARQL11UpdateComplianceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,9 @@ public SPARQLUpdateTestManifest(String filename) {
383383
DynamicSPARQL11UpdateComplianceTest ds11ut = new DynamicSPARQL11UpdateComplianceTest(
384384
displayName, testURI.stringValue(), testName, requestFile.stringValue(),
385385
defaultGraphURI, inputNamedGraphs, resultDefaultGraphURI, resultNamedGraphs);
386-
if (!shouldIgnoredTest(testName))
386+
if (!shouldIgnoredTest(testName)) {
387387
tests.add(DynamicTest.dynamicTest(displayName, ds11ut::test));
388+
}
388389
}
389390
}
390391
}

testsuites/sparql/src/main/java/org/eclipse/rdf4j/testsuite/query/parser/sparql/manifest/SPARQL12QueryComplianceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
* A test suite that runs the SPARQL 1.2 community group's query tests.
2121
*
2222
* @author Jeen Broekstra
23-
*
2423
* @see <a href="https://github.com/w3c/sparql-12/">sparql 1.2</a>
2524
*/
2625
public abstract class SPARQL12QueryComplianceTest extends SPARQLQueryComplianceTest {
@@ -31,8 +30,9 @@ public abstract class SPARQL12QueryComplianceTest extends SPARQLQueryComplianceT
3130

3231
public SPARQL12QueryComplianceTest() {
3332
super(excludedSubdirs);
34-
for (String ig : defaultIgnoredTests)
33+
for (String ig : defaultIgnoredTests) {
3534
addIgnoredTest(ig);
35+
}
3636
}
3737

3838
@TestFactory

testsuites/sparql/src/main/java/org/eclipse/rdf4j/testsuite/query/parser/sparql/manifest/SPARQLComplianceTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
* Base functionality for SPARQL compliance test suites using a W3C-style Manifest.
4242
*
4343
* @author Jeen Broekstra
44-
*
4544
*/
4645
public abstract class SPARQLComplianceTest {
4746

0 commit comments

Comments
 (0)