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 b21c8994c9 Convert jena-querybuiler to JUnit6
b21c8994c9 is described below
commit b21c8994c9132d80199c3bbd193df825aa77ed92
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat Dec 6 16:19:48 2025 +0000
Convert jena-querybuiler to JUnit6
---
jena-extras/jena-querybuilder/pom.xml | 10 +++++--
.../apache/jena/arq/AbstractRegexpBasedTest.java | 2 +-
.../arq/querybuilder/AbstractQueryBuilderTest.java | 13 ++++----
.../jena/arq/querybuilder/AskBuilderTest.java | 10 +++----
.../arq/querybuilder/ConstructBuilderTest.java | 10 +++----
.../jena/arq/querybuilder/ConvertersTest.java | 18 +++++------
.../jena/arq/querybuilder/ExprFactoryTest.java | 14 +++++----
.../jena/arq/querybuilder/SelectBuilderTest.java | 12 ++++----
.../querybuilder/UpdateBuilderExampleTests.java | 11 +++----
.../jena/arq/querybuilder/UpdateBuilderTest.java | 7 +++--
.../jena/arq/querybuilder/WhereBuilderTest.java | 5 ++--
.../querybuilder/handlers/AbstractHandlerTest.java | 12 ++++----
.../handlers/ConstructHandlerTest.java | 11 +++----
.../querybuilder/handlers/DatasetHandlerTest.java | 15 +++++-----
.../querybuilder/handlers/PrologHandlerTest.java | 11 +++----
.../querybuilder/handlers/SelectHandlerTest.java | 35 +++++++++++-----------
.../handlers/SolutionModifierHandlerTest.java | 25 +++++++++-------
.../querybuilder/handlers/ValuesHandlerTest.java | 23 +++++---------
.../querybuilder/handlers/WhereHandlerTest.java | 12 ++++----
.../rewriters/NodeValueRewriterTest.java | 5 ++--
.../updatebuilder/CollectionQuadHolderTest.java | 10 +++++--
.../updatebuilder/ModelQuadHolderTest.java | 25 +++++++---------
.../updatebuilder/QBQuadHolderTest.java | 9 +++---
.../updatebuilder/SingleQuadHolderTest.java | 9 +++---
.../updatebuilder/WhereQuadHolderTest.java | 9 +++---
25 files changed, 169 insertions(+), 154 deletions(-)
diff --git a/jena-extras/jena-querybuilder/pom.xml
b/jena-extras/jena-querybuilder/pom.xml
index b75bcd9079..60c5b8246d 100644
--- a/jena-extras/jena-querybuilder/pom.xml
+++ b/jena-extras/jena-querybuilder/pom.xml
@@ -53,8 +53,14 @@
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.platform</groupId>
+ <artifactId>junit-platform-suite</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
index 24da7d5b63..829b3d4731 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/AbstractRegexpBasedTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.jena.arq;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.Arrays;
import java.util.regex.Pattern;
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
index 9e6305d373..029018c04c 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilderTest.java
@@ -18,14 +18,17 @@
package org.apache.jena.arq.querybuilder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.arq.querybuilder.handlers.HandlerBlock;
import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.graph.Node;
@@ -34,14 +37,12 @@ import org.apache.jena.graph.Triple;
import org.apache.jena.sparql.core.TriplePath;
import org.apache.jena.sparql.core.Var;
import org.apache.jena.vocabulary.RDF;
-import org.junit.Before;
-import org.junit.Test;
public class AbstractQueryBuilderTest {
private AbstractQueryBuilder<?> builder;
- @Before
+ @BeforeEach
public void setup() {
builder = new TestBuilder();
}
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
index 9081d9d7d3..7f3c879ee0 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/AskBuilderTest.java
@@ -18,11 +18,11 @@
package org.apache.jena.arq.querybuilder;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.jena.arq.AbstractRegexpBasedTest;
import org.apache.jena.vocabulary.RDF;
@@ -31,7 +31,7 @@ public class AskBuilderTest extends AbstractRegexpBasedTest {
private AskBuilder builder;
- @Before
+ @BeforeEach
public void setup() {
builder = new AskBuilder();
}
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
index 2fe52bc82c..227363a9a9 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConstructBuilderTest.java
@@ -18,11 +18,11 @@
package org.apache.jena.arq.querybuilder;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.jena.arq.AbstractRegexpBasedTest;
import org.apache.jena.graph.Triple;
@@ -32,7 +32,7 @@ public class ConstructBuilderTest extends
AbstractRegexpBasedTest {
private ConstructBuilder builder;
- @Before
+ @BeforeEach
public void setup() {
builder = new ConstructBuilder();
}
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
index 3a8ad411bd..4e70db7973 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
@@ -18,7 +18,7 @@
package org.apache.jena.arq.querybuilder;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.net.URI;
import java.net.URL;
@@ -27,8 +27,8 @@ import java.util.Collection;
import java.util.List;
import java.util.UUID;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.apache.jena.datatypes.BaseDatatype;
import org.apache.jena.datatypes.DatatypeFormatException;
@@ -50,7 +50,7 @@ import org.apache.jena.vocabulary.RDF;
public class ConvertersTest {
- @After
+ @AfterEach
public void cleanup() {
TypeMapper.reset();
}
@@ -374,17 +374,17 @@ public class ConvertersTest {
private void assertTriplePath(TriplePath expected, Object actual) {
String errMsg = String.format("Expected '%s', actual '%s'", expected,
actual);
if (expected.isTriple()) {
- assertTrue(errMsg, expected.asTriple().matches(asTriple(actual)));
+ assertTrue(expected.asTriple().matches(asTriple(actual)), errMsg);
} else {
- assertTrue(errMsg,
expected.getSubject().matches(asTriplePath(actual).getSubject()));
- assertTrue(errMsg,
expected.getObject().matches(asTriplePath(actual).getObject()));
- assertTrue(errMsg,
expected.getPath().equalTo(asTriplePath(actual).getPath(), new
NodeIsomorphismMap()));
+
assertTrue(expected.getSubject().matches(asTriplePath(actual).getSubject()),
errMsg);
+
assertTrue(expected.getObject().matches(asTriplePath(actual).getObject()),
errMsg);
+
assertTrue(expected.getPath().equalTo(asTriplePath(actual).getPath(), new
NodeIsomorphismMap()), errMsg);
}
}
private void assertTriplePath(Triple expected, Object actual) {
String errMsg = String.format("Expected '%s', actual '%s'", expected,
actual);
- assertTrue(errMsg, expected.matches(asTriple(actual)));
+ assertTrue(expected.matches(asTriple(actual)), errMsg);
}
@Test
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
index 4972157211..c987bf527d 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
@@ -1,4 +1,3 @@
-package org.apache.jena.arq.querybuilder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,13 +16,17 @@ package org.apache.jena.arq.querybuilder;
* limitations under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+package org.apache.jena.arq.querybuilder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.arq.querybuilder.clauses.WhereClause;
import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
import org.apache.jena.graph.Node;
@@ -35,7 +38,6 @@ import org.apache.jena.sparql.expr.*;
import org.apache.jena.sparql.expr.nodevalue.NodeValueInteger;
import org.apache.jena.sparql.expr.nodevalue.NodeValueNode;
import org.apache.jena.sparql.expr.nodevalue.NodeValueString;
-import org.junit.Test;
public class ExprFactoryTest {
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
index c7859c9211..875f555512 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/SelectBuilderTest.java
@@ -18,12 +18,12 @@
package org.apache.jena.arq.querybuilder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.jena.arq.AbstractRegexpBasedTest;
import org.apache.jena.query.*;
@@ -38,7 +38,7 @@ public class SelectBuilderTest extends
AbstractRegexpBasedTest {
private SelectBuilder builder;
- @Before
+ @BeforeEach
public void setup() {
builder = new SelectBuilder();
}
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java
index 3a27d1bd76..0d4b15636a 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderExampleTests.java
@@ -17,11 +17,14 @@
*/
package org.apache.jena.arq.querybuilder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
@@ -35,8 +38,6 @@ import org.apache.jena.vocabulary.DCTypes;
import org.apache.jena.vocabulary.DC_11;
import org.apache.jena.vocabulary.RDF;
import org.apache.jena.vocabulary.XSD;
-import org.junit.Before;
-import org.junit.Test;
/**
* Tests based on https://www.w3.org/TR/sparql11-update examples
@@ -54,7 +55,7 @@ public class UpdateBuilderExampleTests {
m = ModelFactory.createDefaultModel();
}
- @Before
+ @BeforeEach
public void setup() {
m.clearNsPrefixMap();
}
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
index a8be017a99..5e86ac3c2f 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
@@ -17,13 +17,15 @@
*/
package org.apache.jena.arq.querybuilder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
@@ -41,7 +43,6 @@ import org.apache.jena.sparql.syntax.ElementPathBlock;
import org.apache.jena.update.Update;
import org.apache.jena.update.UpdateAction;
import org.apache.jena.vocabulary.DC_11;
-import org.junit.Test;
public class UpdateBuilderTest {
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java
index 4fdb534e38..4b8554ca27 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereBuilderTest.java
@@ -17,14 +17,15 @@
*/
package org.apache.jena.arq.querybuilder;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.HashMap;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
-import org.junit.Test;
public class WhereBuilderTest {
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java
index 3866f6de9f..4e164a19fb 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/AbstractHandlerTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,8 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.List;
@@ -33,12 +33,12 @@ public abstract class AbstractHandlerTest extends
AbstractRegexpBasedTest {
protected final static void assertContains(String expected, String[] lst) {
List<String> s = Arrays.asList(lst);
- assertTrue(String.format("%s not found in %s", expected, s),
s.contains(expected));
+ assertTrue(s.contains(expected), String.format("%s not found in %s",
expected, s));
}
protected final static void assertNotContains(String expected, String[]
lst) {
List<String> s = Arrays.asList(lst);
- assertFalse(String.format("%s found in %s", expected, s),
s.contains(expected));
+ assertFalse(s.contains(expected), String.format("%s found in %s",
expected, s));
}
}
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java
index 4e440e2387..e5827f63b6 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java
@@ -17,27 +17,28 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
import org.apache.jena.query.Query;
import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.syntax.Template;
-import org.junit.Before;
-import org.junit.Test;
public class ConstructHandlerTest extends AbstractHandlerTest {
private Query query;
private ConstructHandler handler;
- @Before
+ @BeforeEach
public void setup() {
query = new Query();
handler = new ConstructHandler(query);
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java
index a9acd65ee2..a52eaf6180 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,8 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.net.URI;
import java.net.URISyntaxException;
@@ -27,19 +27,20 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.query.Query;
import org.apache.jena.rdf.model.ResourceFactory;
import org.apache.jena.sparql.core.Var;
-import org.junit.Before;
-import org.junit.Test;
public class DatasetHandlerTest extends AbstractHandlerTest {
private Query query;
private DatasetHandler handler;
- @Before
+ @BeforeEach
public void setup() {
query = new Query();
handler = new DatasetHandler(query);
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
index 3f626eeff1..933688cc96 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,16 +20,17 @@ package org.apache.jena.arq.querybuilder.handlers;
import java.util.HashMap;
import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.query.Query;
-import org.junit.Before;
-import org.junit.Test;
public class PrologHandlerTest extends AbstractHandlerTest {
private PrologHandler handler;
private Query query;
- @Before
+ @BeforeEach
public void setup() {
query = new Query();
handler = new PrologHandler(query);
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
index 7ad375c71b..4bc97b4670 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SelectHandlerTest.java
@@ -17,10 +17,13 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.jena.query.Query;
import org.apache.jena.sparql.core.Var;
@@ -31,15 +34,13 @@ import org.apache.jena.sparql.expr.ExprAggregator;
import org.apache.jena.sparql.expr.aggregate.AggCount;
import org.apache.jena.sparql.expr.aggregate.AggSum;
import org.apache.jena.sparql.syntax.ElementGroup;
-import org.junit.Before;
-import org.junit.Test;
public class SelectHandlerTest extends AbstractHandlerTest {
private SelectHandler handler;
private Query query;
- @Before
+ @BeforeEach
public void setup() {
query = new Query();
AggregationHandler aggHandler = new AggregationHandler(query);
@@ -70,8 +71,8 @@ public class SelectHandlerTest extends AbstractHandlerTest {
VarExprList expr = query.getProject();
assertEquals(1, expr.size());
Expr e = expr.getExpr(Var.alloc("foo"));
- assertNotNull("expression should not be null", e);
- assertTrue("Should be an E_Random", e instanceof E_Random);
+ assertNotNull(e, "expression should not be null");
+ assertTrue(e instanceof E_Random, "Should be an E_Random");
}
@Test
@@ -82,9 +83,9 @@ public class SelectHandlerTest extends AbstractHandlerTest {
VarExprList expr = query.getProject();
assertEquals(1, expr.size());
Expr e = expr.getExpr(Var.alloc("foo"));
- assertNotNull("expression should not be null", e);
- assertTrue("Should be an ExprAggregator", e instanceof ExprAggregator);
- assertTrue("Should contain an AggSum", ((ExprAggregator)
e).getAggregator() instanceof AggSum);
+ assertNotNull(e, "expression should not be null");
+ assertTrue(e instanceof ExprAggregator, "Should be an ExprAggregator");
+ assertTrue(((ExprAggregator) e).getAggregator() instanceof AggSum,
"Should contain an AggSum");
}
@Test
@@ -94,9 +95,9 @@ public class SelectHandlerTest extends AbstractHandlerTest {
VarExprList expr = query.getProject();
assertEquals(1, expr.size());
Expr e = expr.getExpr(Var.alloc("foo"));
- assertNotNull("expression should not be null", e);
- assertTrue("Should be an ExprAggregator", e instanceof ExprAggregator);
- assertTrue("Should be AggCount", ((ExprAggregator) e).getAggregator()
instanceof AggCount);
+ assertNotNull(e, "expression should not be null");
+ assertTrue(e instanceof ExprAggregator, "Should be an ExprAggregator");
+ assertTrue(((ExprAggregator) e).getAggregator() instanceof AggCount,
"Should be AggCount");
}
@Test
@@ -106,8 +107,8 @@ public class SelectHandlerTest extends AbstractHandlerTest {
VarExprList expr = query.getProject();
assertEquals(1, expr.size());
Expr e = expr.getExpr(Var.alloc("foo"));
- assertNotNull("expression should not be null", e);
- assertTrue("Should be an E_Random", e instanceof E_Random);
+ assertNotNull(e, "expression should not be null");
+ assertTrue(e instanceof E_Random, "Should be an E_Random");
}
@Test
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
index 4b2d82ab4f..4f84fd2bd1 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,26 +17,27 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Node;
import org.apache.jena.query.Query;
import org.apache.jena.query.SortCondition;
import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.expr.E_Random;
-import org.junit.Before;
-import org.junit.Test;
public class SolutionModifierHandlerTest extends AbstractHandlerTest {
private Query query;
private SolutionModifierHandler solutionModifier;
- @Before
+ @BeforeEach
public void setup() {
query = new Query();
solutionModifier = new SolutionModifierHandler(query);
@@ -79,18 +80,20 @@ public class SolutionModifierHandlerTest extends
AbstractHandlerTest {
}
+ //static void assertEquals(Object expected, Object actual, String x) {}
+
@Test
public void testAddOrderBy() {
solutionModifier.addOrderBy(Var.alloc("orderBy"));
List<SortCondition> sc = query.getOrderBy();
- assertEquals("Wrong number of conditions", 1, sc.size());
- assertEquals("Wrong value", sc.get(0).expression.asVar(),
Var.alloc("orderBy"));
+ assertEquals(1, sc.size(), "Wrong number of conditions");
+ assertEquals(sc.get(0).expression.asVar(), Var.alloc("orderBy"),
"Wrong value");
solutionModifier.addOrderBy(Var.alloc("orderBy2"));
sc = query.getOrderBy();
- assertEquals("Wrong number of conditions", 2, sc.size());
- assertEquals("Wrong value", sc.get(0).expression.asVar(),
Var.alloc("orderBy"));
- assertEquals("Wrong value", sc.get(1).expression.asVar(),
Var.alloc("orderBy2"));
+ assertEquals(2, sc.size(), "Wrong number of conditions");
+ assertEquals(sc.get(0).expression.asVar(), Var.alloc("orderBy"),
"Wrong value");
+ assertEquals(sc.get(1).expression.asVar(), Var.alloc("orderBy2"),
"Wrong value");
}
@Test
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java
index b588629202..b666d5e5cf 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ValuesHandlerTest.java
@@ -17,19 +17,12 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.*;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.jena.arq.querybuilder.WhereValidator;
import org.apache.jena.graph.Node;
@@ -40,15 +33,13 @@ import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.engine.binding.Binding;
import org.apache.jena.sparql.engine.binding.BindingFactory;
import org.apache.jena.sparql.syntax.ElementData;
-import org.junit.Before;
-import org.junit.Test;
public class ValuesHandlerTest extends AbstractHandlerTest {
private Query query;
private ValuesHandler handler;
- @Before
+ @BeforeEach
public void setup() {
query = new Query();
handler = new ValuesHandler(query);
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
index 1aa766f923..7f7f57c34c 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
@@ -17,15 +17,15 @@
*/
package org.apache.jena.arq.querybuilder.handlers;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.math.BigInteger;
import java.util.*;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.jena.arq.querybuilder.*;
import org.apache.jena.graph.Node;
@@ -55,7 +55,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
private Query query;
private WhereHandler handler;
- @Before
+ @BeforeEach
public void setup() {
query = new Query();
handler = new WhereHandler(query);
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java
index 3a3dfd32e9..3bdc08942c 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriterTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.jena.arq.querybuilder.rewriters;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -28,6 +28,8 @@ import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.Duration;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.datatypes.xsd.XSDDatatype;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
@@ -36,7 +38,6 @@ import org.apache.jena.sparql.expr.NodeValue;
import org.apache.jena.sparql.expr.nodevalue.*;
import org.apache.jena.sparql.graph.NodeConst;
import org.apache.jena.sparql.util.XSDNumUtils;
-import org.junit.Test;
public class NodeValueRewriterTest {
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java
index 4102ffe8ae..b43b738d98 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/CollectionQuadHolderTest.java
@@ -17,16 +17,20 @@
*/
package org.apache.jena.arq.querybuilder.updatebuilder;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
import org.apache.jena.sparql.core.Quad;
import org.apache.jena.sparql.core.Var;
-import org.junit.Test;
public class CollectionQuadHolderTest {
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java
index cbc55e1101..20fc65eaac 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/ModelQuadHolderTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,22 +17,19 @@
*/
package org.apache.jena.arq.querybuilder.updatebuilder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.List;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
+import org.apache.jena.rdf.model.*;
import org.apache.jena.sparql.core.Quad;
-import org.junit.Test;
public class ModelQuadHolderTest {
@@ -61,10 +58,10 @@ public class ModelQuadHolderTest {
List<Quad> lst = holder.getQuads().toList();
assertEquals(2, lst.size());
Quad q = new Quad(Quad.defaultGraphNodeGenerated, tLst.get(0));
- assertTrue("missing " + q, lst.contains(q));
+ assertTrue(lst.contains(q), "missing " + q);
q = new Quad(Quad.defaultGraphNodeGenerated, tLst.get(1));
- assertTrue("missing " + q, lst.contains(q));
+ assertTrue(lst.contains(q), "missing " + q);
}
@Test
@@ -90,9 +87,9 @@ public class ModelQuadHolderTest {
List<Quad> lst = holder.getQuads().toList();
assertEquals(2, lst.size());
Quad q = new Quad(g, tLst.get(0));
- assertTrue("missing " + q, lst.contains(q));
+ assertTrue(lst.contains(q), "missing " + q);
q = new Quad(g, tLst.get(1));
- assertTrue("missing " + q, lst.contains(q));
+ assertTrue(lst.contains(q), "missing " + q);
}
}
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java
index 6ee5c4e804..138bee41af 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/QBQuadHolderTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,20 +17,21 @@
*/
package org.apache.jena.arq.querybuilder.updatebuilder;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.arq.querybuilder.WhereBuilder;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
import org.apache.jena.sparql.core.Quad;
import org.apache.jena.sparql.core.Var;
-import org.junit.Test;
public class QBQuadHolderTest {
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java
index 8a32d65368..248dca25c5 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/SingleQuadHolderTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,18 +17,19 @@
*/
package org.apache.jena.arq.querybuilder.updatebuilder;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
import org.apache.jena.graph.Triple;
import org.apache.jena.sparql.core.Quad;
import org.apache.jena.sparql.core.Var;
-import org.junit.Test;
public class SingleQuadHolderTest {
diff --git
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java
index efa2ab8f8e..f7142e32bb 100644
---
a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java
+++
b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolderTest.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,13 +17,15 @@
*/
package org.apache.jena.arq.querybuilder.updatebuilder;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.arq.querybuilder.handlers.WhereHandler;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.NodeFactory;
@@ -32,7 +34,6 @@ import org.apache.jena.sparql.core.Quad;
import org.apache.jena.sparql.core.TriplePath;
import org.apache.jena.sparql.core.Var;
import org.apache.jena.sparql.path.P_Link;
-import org.junit.Test;
public class WhereQuadHolderTest {
