Skip to content

Commit 166890e

Browse files
GH-4592 Reduce code duplication and difference to the develop branch.
Signed-off-by: Jerven Bolleman <[email protected]>
1 parent 723be75 commit 166890e

19 files changed

+2137
-2385
lines changed

testsuites/sparql/src/main/java/org/eclipse/rdf4j/testsuite/sparql/AbstractComplianceTest.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.eclipse.rdf4j.testsuite.sparql.vocabulary.EX;
5050
import org.junit.jupiter.api.DynamicTest;
5151
import org.junit.jupiter.api.function.Executable;
52+
import org.junit.jupiter.api.function.ThrowingConsumer;
5253
import org.slf4j.Logger;
5354
import org.slf4j.LoggerFactory;
5455

@@ -59,10 +60,17 @@
5960
*/
6061
public abstract class AbstractComplianceTest {
6162

62-
protected DynamicTest makeTest(String name, Executable x) {
63-
return DynamicTest.dynamicTest(name, () -> {
64-
x.execute();
65-
});
63+
protected DynamicTest makeTest(String name, ThrowingConsumer<RepositoryConnection> x) {
64+
Executable e = () -> {
65+
Repository repo = openRepository();
66+
try (RepositoryConnection conn = repo.getConnection();) {
67+
x.accept(conn);
68+
} finally {
69+
closeRepository(repo);
70+
}
71+
};
72+
return DynamicTest.dynamicTest(name, e);
73+
6674
}
6775

6876
protected Repository openRepository() {

testsuites/sparql/src/main/java/org/eclipse/rdf4j/testsuite/sparql/tests/AggregateTest.java

Lines changed: 267 additions & 361 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)