Skip to content

Commit e18c817

Browse files
committed
GH-5167 test cases
1 parent e25913a commit e18c817

127 files changed

Lines changed: 1593 additions & 8 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/AbstractShaclTest.java

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
package org.eclipse.rdf4j.sail.shacl;
1313

14+
import static org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT;
1415
import static org.junit.jupiter.params.provider.Arguments.arguments;
1516

1617
import java.io.File;
@@ -83,6 +84,7 @@
8384
import org.junit.jupiter.api.AfterEach;
8485
import org.junit.jupiter.api.Assertions;
8586
import org.junit.jupiter.api.BeforeAll;
87+
import org.junit.jupiter.api.parallel.Execution;
8688
import org.junit.jupiter.api.parallel.Isolated;
8789
import org.junit.jupiter.params.provider.Arguments;
8890
import org.slf4j.Logger;
@@ -115,7 +117,7 @@ abstract public class AbstractShaclTest {
115117
"test-cases/path/zeroOrOnePath"
116118

117119
);
118-
public static final Set<IsolationLevels> ISOLATION_LEVELS = Set.of(
120+
public static final List<IsolationLevels> ISOLATION_LEVELS = List.of(
119121
IsolationLevels.NONE,
120122
IsolationLevels.SNAPSHOT,
121123
IsolationLevels.SERIALIZABLE
@@ -222,7 +224,7 @@ private static Stream<TestCase> findTestCases(String testCase, ExpectedResult ba
222224
if (files != null) {
223225
Optional<String> initialData = Arrays.stream(files)
224226
.map(File::getName)
225-
.filter(name -> name.equals("initialData.ttl"))
227+
.filter(name -> name.equals("initialData.trig"))
226228
.findAny();
227229
List<File> queries = Arrays.stream(files)
228230
.filter(f -> f.getName().endsWith(".rq"))
@@ -553,16 +555,21 @@ void referenceImplementationTestCaseValidation(TestCase testCase) {
553555
return;
554556
}
555557

556-
// uses rsx:nodeShape
558+
// uses rsx:targetShape
557559
if (testCase.testCasePath.startsWith("test-cases/qualifiedShape/complex/")) {
558560
return;
559561
}
560562

561-
// uses rsx:nodeShape
563+
// uses rsx:targetShape
562564
if (testCase.testCasePath.startsWith("test-cases/complex/targetShapeAndQualifiedShape/")) {
563565
return;
564566
}
565567

568+
// uses rsx:targetShape
569+
if (testCase.testCasePath.startsWith("test-cases/path/sequencePathTargetShape")) {
570+
return;
571+
}
572+
566573
// sh:shapesGraph
567574
if (testCase.testCasePath.startsWith("test-cases/datatype/simpleNamedGraph/")) {
568575
return;
@@ -1067,7 +1074,13 @@ void runParsingTest(TestCase testCase) {
10671074
return;
10681075
}
10691076

1070-
SailRepository shaclRepository = getShaclSail(testCase);
1077+
SailRepository shaclRepository;
1078+
try {
1079+
shaclRepository = getShaclSail(testCase);
1080+
} catch (Exception e) {
1081+
System.err.println(testCase.getTestCasePath() + "shacl.trig");
1082+
throw e;
1083+
}
10711084
try {
10721085

10731086
List<ContextWithShape> shapes = ((ShaclSail) shaclRepository.getSail()).getCachedShapes()

core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/Utils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
package org.eclipse.rdf4j.sail.shacl;
1313

1414
import java.io.BufferedInputStream;
15+
import java.io.File;
1516
import java.io.IOException;
1617
import java.io.InputStream;
1718
import java.net.URL;
@@ -137,7 +138,7 @@ public static void loadInitialData(SailRepository repo, String resourceName) thr
137138

138139
try (RepositoryConnection conn = repo.getConnection()) {
139140
conn.begin(IsolationLevels.NONE, ShaclSail.TransactionSettings.ValidationApproach.Disabled);
140-
conn.add(initialData, "", RDFFormat.TURTLE);
141+
conn.add(initialData, "", RDFFormat.TRIG);
141142
conn.commit();
142143
}
143144
}

core/sail/shacl/src/test/resources/test-cases/class/simple/invalid/case10/initialData.ttl renamed to core/sail/shacl/src/test/resources/test-cases/class/simple/invalid/case10/initialData.trig

File renamed without changes.

core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case10/initialData.ttl renamed to core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case10/initialData.trig

File renamed without changes.

core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case11/initialData.ttl renamed to core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case11/initialData.trig

File renamed without changes.

core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case12/initialData.ttl renamed to core/sail/shacl/src/test/resources/test-cases/class/simpleNested/invalid/case12/initialData.trig

File renamed without changes.

core/sail/shacl/src/test/resources/test-cases/class/subclass/invalid/case7/initialData.ttl renamed to core/sail/shacl/src/test/resources/test-cases/class/subclass/invalid/case7/initialData.trig

File renamed without changes.

core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case5/initialData.ttl renamed to core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case5/initialData.trig

File renamed without changes.

core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case6/initialData.ttl renamed to core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case6/initialData.trig

File renamed without changes.

core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case7/initialData.ttl renamed to core/sail/shacl/src/test/resources/test-cases/hasValue/targetShapeAnd/invalid/case7/initialData.trig

File renamed without changes.

0 commit comments

Comments
 (0)