This is an automated email from the ASF dual-hosted git repository.
hasan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/clerezza.git
The following commit(s) were added to refs/heads/master by this push:
new 67e3772 CLEREZZA-1023: Use JUnit 5 in sparql
67e3772 is described below
commit 67e3772d6d90fb1d41b4d9ae64fa908c2bfca26c
Author: Hasan <[email protected]>
AuthorDate: Tue May 25 16:31:01 2021 +0200
CLEREZZA-1023: Use JUnit 5 in sparql
---
.../QueryParserSerializerCombinationTest.java | 17 ++--
.../apache/clerezza/sparql/QueryParserTest.java | 111 +++++++++++----------
.../clerezza/sparql/QuerySerializerTest.java | 29 +++---
.../clerezza/sparql/SparqlPreParserTest.java | 71 ++++++-------
4 files changed, 121 insertions(+), 107 deletions(-)
diff --git
a/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserSerializerCombinationTest.java
b/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserSerializerCombinationTest.java
index b84c388..f494d08 100644
---
a/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserSerializerCombinationTest.java
+++
b/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserSerializerCombinationTest.java
@@ -19,30 +19,33 @@
package org.apache.clerezza.sparql;
import org.apache.clerezza.sparql.query.Query;
-import org.junit.*;
+import org.junit.jupiter.api.*;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
/**
*
* @author hasan
*/
+@RunWith(JUnitPlatform.class)
public class QueryParserSerializerCombinationTest {
public QueryParserSerializerCombinationTest() {
}
- @BeforeClass
+ @BeforeAll
public static void setUpClass() {
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() {
}
- @Before
+ @BeforeEach
public void setUp() {
}
- @After
+ @AfterEach
public void tearDown() {
}
@@ -75,7 +78,7 @@ public class QueryParserSerializerCombinationTest {
+ "} \n";
Query query = QueryParser.getInstance().parse(queryString);
- Assert.assertEquals(queryString.replaceAll("\\s", "").trim(),
query.toString().replaceAll("\\s", "").trim());
+ Assertions.assertEquals(queryString.replaceAll("\\s", "").trim(),
query.toString().replaceAll("\\s", "").trim());
}
@Test
@@ -130,6 +133,6 @@ public class QueryParserSerializerCombinationTest {
Query query1 = QueryParser.getInstance().parse(queryString);
Thread.sleep(5000l);
Query query2 = QueryParser.getInstance().parse(queryString);
- Assert.assertEquals(query1.toString(), query2.toString());
+ Assertions.assertEquals(query1.toString(), query2.toString());
}
}
diff --git
a/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
b/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
index 4ced6c0..b500eb3 100644
--- a/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
+++ b/sparql/src/test/java/org/apache/clerezza/sparql/QueryParserTest.java
@@ -23,8 +23,10 @@ import org.apache.clerezza.Language;
import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.apache.clerezza.sparql.query.*;
import org.apache.clerezza.sparql.query.impl.SimpleTriplePattern;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
import java.util.HashSet;
import java.util.List;
@@ -34,6 +36,7 @@ import java.util.Set;
*
* @author hasan
*/
+@RunWith(JUnitPlatform.class)
public class QueryParserTest {
@Test
@@ -54,32 +57,34 @@ public class QueryParserTest {
.append(predicate).append("> ?").append(variable).append(" .
}");
Query q = QueryParser.getInstance().parse(queryStrBuf.toString());
- Assert.assertTrue(SelectQuery.class.isAssignableFrom(q.getClass()));
+
Assertions.assertTrue(SelectQuery.class.isAssignableFrom(q.getClass()));
SelectQuery selectQuery = (SelectQuery) q;
- Assert.assertTrue(selectQuery.getSelection().get(0)
+ Assertions.assertTrue(selectQuery.getSelection().get(0)
.equals(new Variable(variable)));
-
Assert.assertTrue(selectQuery.getDataSet().getDefaultGraphs().toArray()[0]
+
Assertions.assertTrue(selectQuery.getDataSet().getDefaultGraphs().toArray()[0]
.equals(new IRI(defaultGraph)));
GraphPattern gp = (GraphPattern) selectQuery.getQueryPattern()
.getGraphPatterns().toArray()[0];
-
Assert.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
+
Assertions.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
BasicGraphPattern bgp = (BasicGraphPattern) gp;
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
- Assert.assertTrue(triplePatterns.size()==1);
+ Assertions.assertTrue(triplePatterns.size()==1);
ResourceOrVariable s = new ResourceOrVariable(new IRI(subject));
UriRefOrVariable p = new UriRefOrVariable(new IRI(predicate));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable));
- Assert.assertTrue(triplePatterns.contains(
+ Assertions.assertTrue(triplePatterns.contains(
new SimpleTriplePattern(s, p, o)));
}
- @Test(expected=ParseException.class)
+ @Test
public void testInvalidQuery() throws ParseException {
- Query q = QueryParser.getInstance().parse("Hello");
+ Assertions.assertThrows(ParseException.class, () -> {
+ Query q = QueryParser.getInstance().parse("Hello");
+ });
}
@Test
@@ -91,8 +96,8 @@ public class QueryParserTest {
Set<Variable> expected = new HashSet<Variable>();
expected.add(new Variable("a"));
expected.add(new Variable("b"));
- Assert.assertEquals(expected, selectionSet);
- Assert.assertFalse(q.isSelectAll());
+ Assertions.assertEquals(expected, selectionSet);
+ Assertions.assertFalse(q.isSelectAll());
}
@@ -106,8 +111,8 @@ public class QueryParserTest {
expected.add(new Variable("a"));
expected.add(new Variable("b"));
expected.add(new Variable("x"));
- Assert.assertEquals(expected, selectionSet);
- Assert.assertTrue(q.isSelectAll());
+ Assertions.assertEquals(expected, selectionSet);
+ Assertions.assertTrue(q.isSelectAll());
}
@@ -118,17 +123,17 @@ public class QueryParserTest {
GraphPattern gp = (GraphPattern) q.getQueryPattern()
.getGraphPatterns().toArray()[0];
-
Assert.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
+
Assertions.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
BasicGraphPattern bgp = (BasicGraphPattern) gp;
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
- Assert.assertTrue(triplePatterns.size()==2);
+ Assertions.assertTrue(triplePatterns.size()==2);
- Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(
+ Assertions.assertTrue(triplePatterns.contains(new SimpleTriplePattern(
new Variable("a"), new Variable("x"),
new PlainLiteralImpl("tiger"))));
- Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(
+ Assertions.assertTrue(triplePatterns.contains(new SimpleTriplePattern(
new Variable("a"), new Variable("x"),
new PlainLiteralImpl("lion", new Language("en")))));
}
@@ -139,10 +144,10 @@ public class QueryParserTest {
"SELECT * WHERE {?a ?x ?b} ORDER BY DESC(?b)");
List<OrderCondition> oc = ((QueryWithSolutionModifier)
q).getOrderConditions();
- Assert.assertTrue(oc.size()==1);
- Assert.assertFalse(oc.get(0).isAscending());
+ Assertions.assertTrue(oc.size()==1);
+ Assertions.assertFalse(oc.get(0).isAscending());
Variable b = new Variable("b");
- Assert.assertEquals(b, oc.get(0).getExpression());
+ Assertions.assertEquals(b, oc.get(0).getExpression());
}
@Test
@@ -165,30 +170,30 @@ public class QueryParserTest {
.append(predicate2).append(">
?").append(variable1).append("}");
Query q = QueryParser.getInstance().parse(queryStrBuf.toString());
- Assert.assertTrue(ConstructQuery.class.isAssignableFrom(q.getClass()));
+
Assertions.assertTrue(ConstructQuery.class.isAssignableFrom(q.getClass()));
ConstructQuery constructQuery = (ConstructQuery) q;
Set<TriplePattern> triplePatterns = constructQuery
.getConstructTemplate();
- Assert.assertTrue(triplePatterns.size()==1);
+ Assertions.assertTrue(triplePatterns.size()==1);
ResourceOrVariable s = new ResourceOrVariable(new IRI(subject1));
UriRefOrVariable p = new UriRefOrVariable(new IRI(predicate1));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable1));
- Assert.assertTrue(triplePatterns.contains(
+ Assertions.assertTrue(triplePatterns.contains(
new SimpleTriplePattern(s, p, o)));
GraphPattern gp = (GraphPattern) constructQuery.getQueryPattern()
.getGraphPatterns().toArray()[0];
-
Assert.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
+
Assertions.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
BasicGraphPattern bgp = (BasicGraphPattern) gp;
triplePatterns = bgp.getTriplePatterns();
- Assert.assertTrue(triplePatterns.size()==1);
+ Assertions.assertTrue(triplePatterns.size()==1);
s = new ResourceOrVariable(new Variable(variable2));
p = new UriRefOrVariable(new IRI(predicate2));
- Assert.assertTrue(triplePatterns.contains(
+ Assertions.assertTrue(triplePatterns.contains(
new SimpleTriplePattern(s, p, o)));
}
@@ -203,9 +208,9 @@ public class QueryParserTest {
queryStrBuf.append("DESCRIBE <").append(resource).append(">");
Query q = QueryParser.getInstance().parse(queryStrBuf.toString());
- Assert.assertTrue(DescribeQuery.class.isAssignableFrom(q.getClass()));
+
Assertions.assertTrue(DescribeQuery.class.isAssignableFrom(q.getClass()));
DescribeQuery describeQuery = (DescribeQuery) q;
- Assert.assertTrue(describeQuery.getResourcesToDescribe().get(0)
+ Assertions.assertTrue(describeQuery.getResourcesToDescribe().get(0)
.getResource().equals(new IRI(resource)));
}
@@ -223,18 +228,18 @@ public class QueryParserTest {
.append(predicate).append("> \"").append(object).append("\"
}");
Query q = QueryParser.getInstance().parse(queryStrBuf.toString());
- Assert.assertTrue(AskQuery.class.isAssignableFrom(q.getClass()));
+ Assertions.assertTrue(AskQuery.class.isAssignableFrom(q.getClass()));
AskQuery askQuery = (AskQuery) q;
GraphPattern gp = (GraphPattern) askQuery.getQueryPattern()
.getGraphPatterns().toArray()[0];
-
Assert.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
+
Assertions.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
BasicGraphPattern bgp = (BasicGraphPattern) gp;
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
- Assert.assertTrue(triplePatterns.size()==1);
+ Assertions.assertTrue(triplePatterns.size()==1);
- Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(new
Variable(variable),
+ Assertions.assertTrue(triplePatterns.contains(new
SimpleTriplePattern(new Variable(variable),
new IRI(predicate), new PlainLiteralImpl(object))));
}
@@ -263,24 +268,24 @@ public class QueryParserTest {
.append(variable).append(" }");
Query q = QueryParser.getInstance().parse(queryStrBuf.toString());
- Assert.assertTrue(SelectQuery.class.isAssignableFrom(q.getClass()));
+
Assertions.assertTrue(SelectQuery.class.isAssignableFrom(q.getClass()));
SelectQuery selectQuery = (SelectQuery) q;
- Assert.assertTrue(selectQuery.getSelection().get(0)
+ Assertions.assertTrue(selectQuery.getSelection().get(0)
.equals(new Variable(variable)));
GraphPattern gp = (GraphPattern) selectQuery.getQueryPattern()
.getGraphPatterns().toArray()[0];
-
Assert.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
+
Assertions.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp.getClass()));
BasicGraphPattern bgp = (BasicGraphPattern) gp;
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
- Assert.assertTrue(triplePatterns.size()==1);
+ Assertions.assertTrue(triplePatterns.size()==1);
ResourceOrVariable s = new ResourceOrVariable(new IRI(base+subject));
UriRefOrVariable p = new UriRefOrVariable(new
IRI(prefixUri+predicate));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable));
- Assert.assertTrue(triplePatterns.contains(
+ Assertions.assertTrue(triplePatterns.contains(
new SimpleTriplePattern(s, p, o)));
}
@@ -319,49 +324,49 @@ public class QueryParserTest {
.append(" .} FILTER ( ! bound(?").append(variable3).append(")
) }");
Query q = QueryParser.getInstance().parse(queryStrBuf.toString());
- Assert.assertTrue(SelectQuery.class.isAssignableFrom(q.getClass()));
+
Assertions.assertTrue(SelectQuery.class.isAssignableFrom(q.getClass()));
SelectQuery selectQuery = (SelectQuery) q;
- Assert.assertTrue(selectQuery.getSelection().size() == 2);
+ Assertions.assertTrue(selectQuery.getSelection().size() == 2);
Set<Variable> vars = new HashSet<Variable>(2);
Variable var1 = new Variable(variable1);
Variable var2 = new Variable(variable2);
vars.add(var1);
vars.add(var2);
- Assert.assertTrue(selectQuery.getSelection().containsAll(vars));
+ Assertions.assertTrue(selectQuery.getSelection().containsAll(vars));
GroupGraphPattern ggp = selectQuery.getQueryPattern();
List<Expression> constraints = ggp.getFilter();
- Assert.assertTrue(UnaryOperation.class.isAssignableFrom(constraints
+ Assertions.assertTrue(UnaryOperation.class.isAssignableFrom(constraints
.get(0).getClass()));
UnaryOperation uop = (UnaryOperation) constraints.get(0);
- Assert.assertTrue(uop.getOperatorString().equals("!"));
- Assert.assertTrue(BuiltInCall.class.isAssignableFrom(uop.getOperand()
+ Assertions.assertTrue(uop.getOperatorString().equals("!"));
+
Assertions.assertTrue(BuiltInCall.class.isAssignableFrom(uop.getOperand()
.getClass()));
BuiltInCall bic = (BuiltInCall) uop.getOperand();
- Assert.assertTrue(bic.getName().equals("BOUND"));
+ Assertions.assertTrue(bic.getName().equals("BOUND"));
Variable var3 = new Variable(variable3);
- Assert.assertTrue(bic.getArguements().get(0).equals(var3));
+ Assertions.assertTrue(bic.getArguements().get(0).equals(var3));
GraphPattern gp = (GraphPattern) ggp.getGraphPatterns().toArray()[0];
-
Assert.assertTrue(OptionalGraphPattern.class.isAssignableFrom(gp.getClass()));
+
Assertions.assertTrue(OptionalGraphPattern.class.isAssignableFrom(gp.getClass()));
OptionalGraphPattern ogp = (OptionalGraphPattern) gp;
- Assert.assertTrue(BasicGraphPattern.class.isAssignableFrom(
+ Assertions.assertTrue(BasicGraphPattern.class.isAssignableFrom(
ogp.getMainGraphPattern().getClass()));
BasicGraphPattern bgp = (BasicGraphPattern) ogp.getMainGraphPattern();
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
- Assert.assertTrue(triplePatterns.size() == 1);
- Assert.assertTrue(triplePatterns.contains(new
SimpleTriplePattern(var1, new IRI(prefix1Uri + predicate1),
+ Assertions.assertTrue(triplePatterns.size() == 1);
+ Assertions.assertTrue(triplePatterns.contains(new
SimpleTriplePattern(var1, new IRI(prefix1Uri + predicate1),
var2)));
GraphPattern gp2 = (GraphPattern) ogp.getOptionalGraphPattern()
.getGraphPatterns().toArray()[0];
-
Assert.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp2.getClass()));
+
Assertions.assertTrue(BasicGraphPattern.class.isAssignableFrom(gp2.getClass()));
bgp = (BasicGraphPattern) gp2;
triplePatterns = bgp.getTriplePatterns();
- Assert.assertTrue(triplePatterns.size() == 1);
- Assert.assertTrue(triplePatterns.contains(new
SimpleTriplePattern(var1, new IRI(prefix2Uri + predicate2),
+ Assertions.assertTrue(triplePatterns.size() == 1);
+ Assertions.assertTrue(triplePatterns.contains(new
SimpleTriplePattern(var1, new IRI(prefix2Uri + predicate2),
var3)));
}
}
diff --git
a/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
b/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
index b178637..d410355 100644
--- a/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
+++ b/sparql/src/test/java/org/apache/clerezza/sparql/QuerySerializerTest.java
@@ -22,9 +22,11 @@ import org.apache.clerezza.IRI;
import org.apache.clerezza.implementation.literal.LiteralFactory;
import org.apache.clerezza.sparql.query.*;
import org.apache.clerezza.sparql.query.impl.*;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.HashSet;
@@ -35,6 +37,7 @@ import java.util.Set;
*
* @author hasan
*/
+@RunWith(JUnitPlatform.class)
public class QuerySerializerTest {
@Test
@@ -63,7 +66,7 @@ public class QuerySerializerTest {
queryPattern.addGraphPattern(bgp);
selectQuery.setQueryPattern(queryPattern);
- Assert.assertTrue(selectQuery.toString()
+ Assertions.assertTrue(selectQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
@@ -93,7 +96,7 @@ public class QuerySerializerTest {
queryPattern.addGraphPattern(bgp);
constructQuery.setQueryPattern(queryPattern);
- Assert.assertTrue(constructQuery.toString()
+ Assertions.assertTrue(constructQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
@@ -106,7 +109,7 @@ public class QuerySerializerTest {
describeQuery.addResourceToDescribe(new ResourceOrVariable(
new IRI("http://example.org/book/book1";)));
- Assert.assertTrue(describeQuery.toString()
+ Assertions.assertTrue(describeQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
@@ -131,7 +134,7 @@ public class QuerySerializerTest {
queryPattern.addGraphPattern(bgp);
askQuery.setQueryPattern(queryPattern);
- Assert.assertTrue(askQuery.toString()
+ Assertions.assertTrue(askQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
@@ -139,7 +142,7 @@ public class QuerySerializerTest {
* Ignoring: given that triplePatterns is a Set I don't see what is
supposed
* to guarantee the expected ordering.
*/
- @Ignore
+ @Disabled
@Test
public void testFilter() {
@@ -170,7 +173,7 @@ public class QuerySerializerTest {
queryPattern.addConstraint(constraint);
selectQuery.setQueryPattern(queryPattern);
- Assert.assertTrue(selectQuery.toString()
+ Assertions.assertTrue(selectQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
@@ -199,7 +202,7 @@ public class QuerySerializerTest {
queryPattern.addConstraint(constraint);
selectQuery.setQueryPattern(queryPattern);
- Assert.assertTrue(selectQuery.toString()
+ Assertions.assertTrue(selectQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
@@ -225,7 +228,7 @@ public class QuerySerializerTest {
selectQuery.setQueryPattern(queryPattern);
selectQuery.addOrderCondition(new SimpleOrderCondition(c, false));
- Assert.assertTrue(selectQuery.toString()
+ Assertions.assertTrue(selectQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
@@ -266,7 +269,7 @@ public class QuerySerializerTest {
queryPattern.addGraphPattern(ogp);
selectQuery.setQueryPattern(queryPattern);
- Assert.assertTrue(selectQuery.toString()
+ Assertions.assertTrue(selectQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
@@ -297,7 +300,7 @@ public class QuerySerializerTest {
BuiltInCall constraint = new BuiltInCall("REGEX", arguments);
queryPattern.addConstraint(constraint);
selectQuery.setQueryPattern(queryPattern);
- Assert.assertTrue(selectQuery.toString()
+ Assertions.assertTrue(selectQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
}
}
diff --git
a/sparql/src/test/java/org/apache/clerezza/sparql/SparqlPreParserTest.java
b/sparql/src/test/java/org/apache/clerezza/sparql/SparqlPreParserTest.java
index d94101b..8de9c0c 100644
--- a/sparql/src/test/java/org/apache/clerezza/sparql/SparqlPreParserTest.java
+++ b/sparql/src/test/java/org/apache/clerezza/sparql/SparqlPreParserTest.java
@@ -19,8 +19,10 @@
package org.apache.clerezza.sparql;
import org.apache.clerezza.IRI;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
import java.util.Collections;
import java.util.HashSet;
@@ -30,6 +32,7 @@ import java.util.Set;
*
* @author hasan
*/
+@RunWith(JUnitPlatform.class)
public class SparqlPreParserTest {
private final static IRI STORED_NAME_GRAPH = new
IRI("http://example.org/named.graph";);
@@ -72,7 +75,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs =
parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -84,7 +87,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs =
parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs == null);
+ Assertions.assertTrue(referredGraphs == null);
}
@Test
@@ -102,7 +105,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs =
parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
+ Assertions.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@Test
@@ -113,7 +116,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -127,7 +130,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(DEFAULT_GRAPH);
expected.add(new IRI("http://example.org/mydata";));
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -141,7 +144,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(TEST_GRAPH);
expected.add(new IRI("http://example.org/mydata";));
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -152,7 +155,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -163,7 +166,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.contains(STORED_NAME_GRAPH));
+ Assertions.assertTrue(referredGraphs.contains(STORED_NAME_GRAPH));
}
@Test
@@ -174,7 +177,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
+ Assertions.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@Test
@@ -185,7 +188,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -196,7 +199,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.contains(STORED_NAME_GRAPH));
+ Assertions.assertTrue(referredGraphs.contains(STORED_NAME_GRAPH));
}
@Test
@@ -207,7 +210,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
+ Assertions.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@Test
@@ -218,7 +221,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
+ Assertions.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@Test
@@ -232,7 +235,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -246,7 +249,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -260,7 +263,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -274,7 +277,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -288,7 +291,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -302,7 +305,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -314,7 +317,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -325,7 +328,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
+ Assertions.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@Test
@@ -337,7 +340,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -348,7 +351,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
+ Assertions.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@Test
@@ -364,7 +367,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -377,7 +380,7 @@ public class SparqlPreParserTest {
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -394,7 +397,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(new IRI("http://example.com/names";));
expected.add(new IRI("http://example.com/addresses";));
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -409,7 +412,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(TEST_GRAPH);
expected.add(DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -421,7 +424,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -438,7 +441,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(new IRI("http://example/bookStore2";));
expected.add(new IRI("http://example/bookStore";));
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -472,7 +475,7 @@ public class SparqlPreParserTest {
Set<IRI> expected = new HashSet<>();
expected.add(new IRI("http://example/bookStore2";));
expected.add(new IRI("http://example/bookStore";));
- Assert.assertTrue(referredGraphs.containsAll(expected));
+ Assertions.assertTrue(referredGraphs.containsAll(expected));
}
@Test
@@ -489,7 +492,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@Test
@@ -506,6 +509,6 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(this.graphStore);
Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr,
DEFAULT_GRAPH);
- Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
+
Assertions.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
}
