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 26226f3 CLEREZZA-1023: Use JUnit 5 in api.utils
26226f3 is described below
commit 26226f303f9a077b9b6f22881e1baea823e5ec06
Author: Hasan <[email protected]>
AuthorDate: Tue Feb 8 17:45:19 2022 +0100
CLEREZZA-1023: Use JUnit 5 in api.utils
---
api.utils/pom.xml | 8 ++-
.../clerezza/scala/utils/CollectedIter.scala | 12 ++--
.../clerezza/scala/utils/RichGraphNode.scala | 5 +-
.../org/apache/clerezza/utils/GraphUtilsTest.java | 26 +++++---
.../org/apache/clerezza/utils/IfpSmushTest.java | 16 ++---
.../org/apache/clerezza/utils/RdfListTest.java | 35 ++++++-----
.../org/apache/clerezza/utils/SameAsSmushTest.java | 25 ++++----
.../org/apache/clerezza/utils/TestGraphNode.java | 71 +++++++++++----------
.../org/apache/clerezza/utils/UnionGraphTest.java | 23 ++++---
.../clerezza/utils/smushing/SameAsSmushTest.java | 27 ++++----
.../apache/clerezza/scala/utils/EzMGraphTest.scala | 26 ++++----
.../clerezza/scala/utils/RichGraphNodeTest.scala | 72 +++++++++++-----------
.../clerezza/scala/utils/TypeConversionTest.scala | 21 ++++---
13 files changed, 200 insertions(+), 167 deletions(-)
diff --git a/api.utils/pom.xml b/api.utils/pom.xml
index feb6549..dcc35fd 100644
--- a/api.utils/pom.xml
+++ b/api.utils/pom.xml
@@ -31,6 +31,11 @@
<name>Clerezza - API Utilities</name>
<description>Utility classes to work with Clerezza API</description>
+ <properties>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -66,6 +71,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
+ <version>2.13.5</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -105,7 +111,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
- <version>4.2.0</version>
+ <version>4.5.1</version>
</plugin>
</plugins>
</pluginManagement>
diff --git
a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/CollectedIter.scala
b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/CollectedIter.scala
index 01c5c36..e87c3b4 100644
---
a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/CollectedIter.scala
+++
b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/CollectedIter.scala
@@ -18,11 +18,12 @@
package org.apache.clerezza.scala.utils
import java.util.concurrent.locks.Lock
-import java.util.{ConcurrentModificationException, Iterator}
+import java.util.{ConcurrentModificationException, Iterator, List}
-import _root_.scala.collection.JavaConversions._
+//import _root_.scala.collection.JavaConverters._
import scala.collection.immutable
import scala.collection.mutable._
+import _root_.scala.jdk.CollectionConverters._;
/**
*
@@ -35,7 +36,7 @@ import scala.collection.mutable._
*/
class CollectedIter[T](iterCreator: () => Iterator[T], readLock: Lock) extends
immutable.Seq[T] {
- def this(jList: java.util.List[T], readLock: Lock) = this(() =>
jList.iterator(), readLock)
+ def this(jList: List[T], readLock: Lock) = this(() => jList.iterator(),
readLock)
def this() = this(() => java.util.Collections.emptyList[T].iterator(),
null)
@@ -56,11 +57,10 @@ class CollectedIter[T](iterCreator: () => Iterator[T],
readLock: Lock) extends i
/**
* returns a new fully expanded and sorted CollectediterCreator
*/
- def sort(lt: (T, T) => Boolean) = {
+ def sort(lt: (T, T) => Boolean, readLock: Lock) = {
val sortedElems = iterator.toList.sortWith(lt)
//TODO this re-expands everything, return sorted-list directly
- new CollectedIter[T](sortedElems, readLock)
-
+ new CollectedIter[T](() => sortedElems.iterator.asJava, readLock)
}
/**
diff --git
a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
index 800dda4..3277817 100644
---
a/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
+++
b/api.utils/src/main/scala/org/apache/clerezza/scala/utils/RichGraphNode.scala
@@ -28,8 +28,9 @@ import
org.apache.clerezza.implementation.literal.LiteralFactory
import org.apache.clerezza.ontologies.RDF
import org.apache.clerezza.utils.{GraphNode, UnionGraph}
-import _root_.scala.collection.JavaConversions._
+//import _root_.scala.collection.JavaConversions._
import _root_.scala.reflect.Manifest
+import _root_.scala.jdk.CollectionConverters._;
/**
* A RichGraphNode decorates A GraphNode with additional method to be part on
a DSL-style scala library.
@@ -73,7 +74,7 @@ class RichGraphNode(resource: RDFTerm, graph: Graph) extends
GraphNode(resource,
*
* @return a List with the elements of the rdf:List represented by this
node
*/
- def !! = (for (listElem <- asList) yield {
+ def !! = (for (listElem <- asList.asScala) yield {
new RichGraphNode(new GraphNode(listElem, getGraph))
}).toList
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
index 8dcb20c..afb00e4 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/GraphUtilsTest.java
@@ -22,12 +22,15 @@ import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
import org.apache.clerezza.implementation.TripleImpl;
import org.apache.clerezza.implementation.in_memory.SimpleGraph;
-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;
/**
* @author reto
*/
+@RunWith(JUnitPlatform.class)
public class GraphUtilsTest {
final IRI u1 = new IRI("http://ex.org/1";);
@@ -47,7 +50,7 @@ public class GraphUtilsTest {
subGraph.add(new TripleImpl(bNode2, u2, bNode1));
}
GraphUtils.removeSubGraph(baseGraph, subGraph);
- Assert.assertEquals(1, baseGraph.size());
+ Assertions.assertEquals(1, baseGraph.size());
}
private Graph createBaseGraph() {
@@ -64,11 +67,11 @@ public class GraphUtilsTest {
}
/**
- * It is required that the subgraph comprises the whole context of the
Bnodes it ioncludes
+ * It is required that the subgraph comprises the whole context of the
BNodes it includes
*
* @throws org.apache.clerezza.utils.GraphUtils.NoSuchSubGraphException
*/
- @Test(expected = GraphUtils.NoSuchSubGraphException.class)
+ @Test
public void removeIncompleteSubGraph() throws
GraphUtils.NoSuchSubGraphException {
Graph baseGraph = createBaseGraph();
@@ -79,10 +82,13 @@ public class GraphUtilsTest {
subGraph.add(new TripleImpl(u1, u2, bNode2));
subGraph.add(new TripleImpl(bNode2, u2, bNode2));
}
- GraphUtils.removeSubGraph(baseGraph, subGraph);
+ Assertions.assertThrows(
+ GraphUtils.NoSuchSubGraphException.class,
+ () -> GraphUtils.removeSubGraph(baseGraph, subGraph)
+ );
}
- @Test(expected = GraphUtils.NoSuchSubGraphException.class)
+ @Test
public void removeInvalidSubGraph() throws
GraphUtils.NoSuchSubGraphException {
Graph baseGraph = createBaseGraph();
@@ -95,7 +101,9 @@ public class GraphUtilsTest {
baseGraph.add(new TripleImpl(bNode2, u2, bNode1));
baseGraph.add(new TripleImpl(bNode2, u2, new BlankNode()));
}
- GraphUtils.removeSubGraph(baseGraph, subGraph);
+ Assertions.assertThrows(
+ GraphUtils.NoSuchSubGraphException.class,
+ () -> GraphUtils.removeSubGraph(baseGraph, subGraph)
+ );
}
}
-
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
index 8f210d9..c4e9bf4 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/IfpSmushTest.java
@@ -27,12 +27,15 @@ import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
import org.apache.clerezza.ontologies.RDF;
import org.apache.clerezza.ontologies.RDFS;
-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;
/**
* @author reto
*/
+@RunWith(JUnitPlatform.class)
public class IfpSmushTest {
private Graph ontology = new SimpleGraph();
@@ -54,7 +57,7 @@ public class IfpSmushTest {
mGraph.add(new TripleImpl(bNode2, RDFS.comment,
new PlainLiteralImpl("another comment")));
Smusher.smush(mGraph, ontology);
- Assert.assertEquals(3, mGraph.size());
+ Assertions.assertEquals(3, mGraph.size());
}
@Test
@@ -76,7 +79,7 @@ public class IfpSmushTest {
mGraph.add(new TripleImpl(bNode3, RDFS.comment,
new PlainLiteralImpl("yet another comment")));
Smusher.smush(mGraph, ontology);
- Assert.assertEquals(5, mGraph.size());
+ Assertions.assertEquals(5, mGraph.size());
}
@Test
@@ -92,7 +95,7 @@ public class IfpSmushTest {
mGraph.add(new TripleImpl(bNode2, RDFS.comment,
new PlainLiteralImpl("another comment")));
Smusher.smush(mGraph, ontology);
- Assert.assertEquals(3, mGraph.size());
+ Assertions.assertEquals(3, mGraph.size());
}
@Test
@@ -108,7 +111,6 @@ public class IfpSmushTest {
mGraph.add(new TripleImpl(resource2, RDFS.comment,
new PlainLiteralImpl("another comment")));
Smusher.smush(mGraph, ontology);
- Assert.assertEquals(4, mGraph.size());
+ Assertions.assertEquals(4, mGraph.size());
}
-
}
diff --git a/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
index f6f31d1..d1a7e2d 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/RdfListTest.java
@@ -17,23 +17,26 @@
*/
package org.apache.clerezza.utils;
-import junit.framework.Assert;
-import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.BlankNode;
import org.apache.clerezza.Graph;
import org.apache.clerezza.IRI;
+import org.apache.clerezza.RDFTerm;
import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author rbn
*/
+@RunWith(JUnitPlatform.class)
public class RdfListTest {
@Test
@@ -132,7 +135,7 @@ public class RdfListTest {
list.add(new PlainLiteralImpl("hello"));
list.add(new PlainLiteralImpl("world"));
list.remove(1);
- Assert.assertEquals(2, tc.size());
+ assertEquals(2, tc.size());
}
@@ -160,24 +163,24 @@ public class RdfListTest {
Set<GraphNode> containingListNodes = RdfList.findContainingListNodes(
new GraphNode(element3, tc));
- Assert.assertEquals(1, containingListNodes.size());
- Assert.assertTrue(containingListNodes.contains(listA));
+ assertEquals(1, containingListNodes.size());
+ assertTrue(containingListNodes.contains(listA));
Set<RdfList> containingLists = RdfList.findContainingLists(
new GraphNode(element3, tc));
- Assert.assertEquals(1, containingLists.size());
- Assert.assertTrue(containingLists.contains(rdfListA));
+ assertEquals(1, containingLists.size());
+ assertTrue(containingLists.contains(rdfListA));
containingListNodes = RdfList.findContainingListNodes(
new GraphNode(element4, tc));
- Assert.assertEquals(2, containingListNodes.size());
- Assert.assertTrue(containingListNodes.contains(listA));
- Assert.assertTrue(containingListNodes.contains(listB));
+ assertEquals(2, containingListNodes.size());
+ assertTrue(containingListNodes.contains(listA));
+ assertTrue(containingListNodes.contains(listB));
containingLists = RdfList.findContainingLists(
new GraphNode(element4, tc));
- Assert.assertEquals(2, containingLists.size());
- Assert.assertTrue(containingLists.contains(rdfListA));
- Assert.assertTrue(containingLists.contains(rdfListB));
+ assertEquals(2, containingLists.size());
+ assertTrue(containingLists.contains(rdfListA));
+ assertTrue(containingLists.contains(rdfListB));
}
-}
\ No newline at end of file
+}
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
index fc14e0a..aabd12c 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/SameAsSmushTest.java
@@ -27,14 +27,17 @@ import
org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
import org.apache.clerezza.ontologies.RDFS;
-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.Iterator;
/**
* @author reto
*/
+@RunWith(JUnitPlatform.class)
public class SameAsSmushTest {
private final IRI uriA = new IRI("http://example.org/A";);
@@ -57,20 +60,20 @@ public class SameAsSmushTest {
@Test
public void simple() {
- Assert.assertEquals(3, dataGraph.size());
+ Assertions.assertEquals(3, dataGraph.size());
Smusher.sameAsSmush(dataGraph, sameAsStatements);
- Assert.assertEquals(3, dataGraph.size());
- Assert.assertTrue(dataGraph.filter(null, OWL.sameAs, null).hasNext());
+ Assertions.assertEquals(3, dataGraph.size());
+ Assertions.assertTrue(dataGraph.filter(null, OWL.sameAs,
null).hasNext());
//exactly one statement with literal
Iterator<Triple> litStmts = dataGraph.filter(null, null, lit);
- Assert.assertTrue(litStmts.hasNext());
+ Assertions.assertTrue(litStmts.hasNext());
Triple litStmt = litStmts.next();
- Assert.assertFalse(litStmts.hasNext());
+ Assertions.assertFalse(litStmts.hasNext());
Iterator<Triple> knowsStmts = dataGraph.filter(null, FOAF.knows, null);
- Assert.assertTrue(knowsStmts.hasNext());
+ Assertions.assertTrue(knowsStmts.hasNext());
Triple knowStmt = knowsStmts.next();
- Assert.assertEquals(knowStmt.getSubject(), knowStmt.getObject());
- Assert.assertEquals(litStmt.getSubject(), knowStmt.getObject());
- Assert.assertEquals(litStmt.getSubject(), dataGraph.filter(null,
OWL.sameAs, null).next().getObject());
+ Assertions.assertEquals(knowStmt.getSubject(), knowStmt.getObject());
+ Assertions.assertEquals(litStmt.getSubject(), knowStmt.getObject());
+ Assertions.assertEquals(litStmt.getSubject(), dataGraph.filter(null,
OWL.sameAs, null).next().getObject());
}
}
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
b/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
index 214954d..273147c 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/TestGraphNode.java
@@ -17,13 +17,15 @@
*/
package org.apache.clerezza.utils;
-import junit.framework.Assert;
import org.apache.clerezza.*;
import org.apache.clerezza.implementation.TripleImpl;
import org.apache.clerezza.implementation.in_memory.SimpleGraph;
import org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.apache.clerezza.test.utils.RandomGraph;
-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.ArrayList;
import java.util.HashSet;
@@ -33,6 +35,7 @@ import java.util.Set;
/**
* @author reto, mir
*/
+@RunWith(JUnitPlatform.class)
public class TestGraphNode {
@Test
@@ -50,10 +53,10 @@ public class TestGraphNode {
g.add(new TripleImpl(property1, property1, bNode2));
g.add(new TripleImpl(property1, property1, new PlainLiteralImpl("bla
bla")));
GraphNode n = new GraphNode(bNode1, g);
- Assert.assertEquals(4, n.getNodeContext().size());
+ Assertions.assertEquals(4, n.getNodeContext().size());
n.deleteNodeContext();
- Assert.assertEquals(1, g.size());
- Assert.assertFalse(n.getObjects(property2).hasNext());
+ Assertions.assertEquals(1, g.size());
+ Assertions.assertFalse(n.getObjects(property2).hasNext());
}
@Test
@@ -66,7 +69,7 @@ public class TestGraphNode {
IRI property1 = new IRI("http://example.org/property1";);
GraphNode n = new GraphNode(bNode1, g);
n.addProperty(property1, bNode2);
- Assert.assertEquals(1, g.size());
+ Assertions.assertEquals(1, g.size());
}
@Test
@@ -82,7 +85,7 @@ public class TestGraphNode {
Iterator<GraphNode> objectNodes =
node.getObjectNodes(property);
while (objectNodes.hasNext()) {
GraphNode graphNode = objectNodes.next();
- Assert.assertTrue(objects.contains(graphNode.getNode()));
+
Assertions.assertTrue(objects.contains(graphNode.getNode()));
}
}
}
@@ -97,7 +100,7 @@ public class TestGraphNode {
Iterator<GraphNode> subjectNodes =
node.getSubjectNodes(property);
while (subjectNodes.hasNext()) {
GraphNode graphNode = subjectNodes.next();
- Assert.assertTrue(subjects.contains(graphNode.getNode()));
+
Assertions.assertTrue(subjects.contains(graphNode.getNode()));
}
}
}
@@ -129,11 +132,11 @@ public class TestGraphNode {
while (properties.hasNext()) {
i++;
IRI prop = properties.next();
- Assert.assertTrue(props.contains(prop));
+ Assertions.assertTrue(props.contains(prop));
props.remove(prop);
}
- Assert.assertEquals(i, 4);
- Assert.assertEquals(props.size(), 0);
+ Assertions.assertEquals(i, 4);
+ Assertions.assertEquals(props.size(), 0);
}
@@ -155,7 +158,7 @@ public class TestGraphNode {
g.add(new TripleImpl(bNode2, property1, new PlainLiteralImpl("bla
bla")));
GraphNode n = new GraphNode(bNode1, g);
n.deleteProperties(property1);
- Assert.assertEquals(3, g.size());
+ Assertions.assertEquals(3, g.size());
}
@Test
@@ -176,7 +179,7 @@ public class TestGraphNode {
g.add(new TripleImpl(bNode2, property1, new PlainLiteralImpl("bla
bla")));
GraphNode n = new GraphNode(bNode1, g);
n.deleteProperty(property1, new PlainLiteralImpl("literal"));
- Assert.assertEquals(4, g.size());
+ Assertions.assertEquals(4, g.size());
}
@Test
@@ -205,21 +208,21 @@ public class TestGraphNode {
new SimpleGraph(initialGraph.iterator()));
node.replaceWith(newIRI, true);
- Assert.assertEquals(5, node.getGraph().size());
+ Assertions.assertEquals(5, node.getGraph().size());
Triple expectedTriple1 = new TripleImpl(bNode1, newIRI, literal1);
Triple expectedTriple2 = new TripleImpl(bNode1, property2, newIRI);
Triple expectedTriple3 = new TripleImpl(newIRI, newIRI, bNode2);
Triple expectedTriple4 = new TripleImpl(newIRI, newIRI, literal2);
- Assert.assertTrue(node.getGraph().contains(expectedTriple1));
- Assert.assertTrue(node.getGraph().contains(expectedTriple2));
- Assert.assertTrue(node.getGraph().contains(expectedTriple3));
- Assert.assertTrue(node.getGraph().contains(expectedTriple4));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple1));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple2));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple3));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple4));
- Assert.assertFalse(node.getGraph().contains(triple1));
- Assert.assertFalse(node.getGraph().contains(triple2));
- Assert.assertFalse(node.getGraph().contains(triple4));
- Assert.assertFalse(node.getGraph().contains(triple5));
+ Assertions.assertFalse(node.getGraph().contains(triple1));
+ Assertions.assertFalse(node.getGraph().contains(triple2));
+ Assertions.assertFalse(node.getGraph().contains(triple4));
+ Assertions.assertFalse(node.getGraph().contains(triple5));
node = new GraphNode(property1, new
SimpleGraph(initialGraph.iterator()));
node.replaceWith(newBnode);
@@ -227,25 +230,25 @@ public class TestGraphNode {
Triple expectedTriple6 = new TripleImpl(newBnode, property1, bNode2);
Triple expectedTriple7 = new TripleImpl(newBnode, property1, literal2);
- Assert.assertTrue(node.getGraph().contains(triple1));
- Assert.assertTrue(node.getGraph().contains(expectedTriple5));
- Assert.assertTrue(node.getGraph().contains(expectedTriple6));
- Assert.assertTrue(node.getGraph().contains(expectedTriple7));
+ Assertions.assertTrue(node.getGraph().contains(triple1));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple5));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple6));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple7));
node = new GraphNode(literal1, new
SimpleGraph(initialGraph.iterator()));
node.replaceWith(newBnode);
Triple expectedTriple8 = new TripleImpl(bNode1, property1, newBnode);
- Assert.assertTrue(node.getGraph().contains(expectedTriple8));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple8));
node = new GraphNode(property1, new
SimpleGraph(initialGraph.iterator()));
node.replaceWith(newIRI);
Triple expectedTriple9 = new TripleImpl(bNode1, property2, newIRI);
Triple expectedTriple10 = new TripleImpl(newIRI, property1, bNode2);
Triple expectedTriple11 = new TripleImpl(newIRI, property1, literal2);
- Assert.assertTrue(node.getGraph().contains(triple1));
- Assert.assertTrue(node.getGraph().contains(expectedTriple9));
- Assert.assertTrue(node.getGraph().contains(expectedTriple10));
- Assert.assertTrue(node.getGraph().contains(expectedTriple11));
+ Assertions.assertTrue(node.getGraph().contains(triple1));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple9));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple10));
+ Assertions.assertTrue(node.getGraph().contains(expectedTriple11));
}
@Test
@@ -258,10 +261,10 @@ public class TestGraphNode {
IRI property1 = new IRI("http://example.org/property1";);
GraphNode n = new GraphNode(bNode1, g);
n.addProperty(property1, bNode2);
- Assert.assertTrue(n.equals(new GraphNode(bNode1, g)));
- Assert.assertFalse(n.equals(new GraphNode(bNode2, g)));
+ Assertions.assertTrue(n.equals(new GraphNode(bNode1, g)));
+ Assertions.assertFalse(n.equals(new GraphNode(bNode2, g)));
GraphNode n2 = null;
- Assert.assertFalse(n.equals(n2));
+ Assertions.assertFalse(n.equals(n2));
}
private Set<RDFTerm> createSet(Iterator<? extends RDFTerm> resources) {
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
index d66e30f..3397fdf 100644
--- a/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
+++ b/api.utils/src/test/java/org/apache/clerezza/utils/UnionGraphTest.java
@@ -23,14 +23,17 @@ import org.apache.clerezza.IRI;
import org.apache.clerezza.Triple;
import org.apache.clerezza.implementation.TripleImpl;
import org.apache.clerezza.implementation.in_memory.SimpleGraph;
-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.Iterator;
/**
* @author hasan
*/
+@RunWith(JUnitPlatform.class)
public class UnionGraphTest {
private final IRI uriRef1 =
@@ -52,12 +55,12 @@ public class UnionGraphTest {
graph2.add(new TripleImpl(bnode, uriRef1, uriRef3));
Graph unionGraph = new UnionGraph(graph, graph2);
Iterator<Triple> unionTriples = unionGraph.iterator();
- Assert.assertTrue(unionTriples.hasNext());
+ Assertions.assertTrue(unionTriples.hasNext());
unionTriples.next();
- Assert.assertTrue(unionTriples.hasNext());
+ Assertions.assertTrue(unionTriples.hasNext());
unionTriples.next();
- Assert.assertFalse(unionTriples.hasNext());
- Assert.assertEquals(2, unionGraph.size());
+ Assertions.assertFalse(unionTriples.hasNext());
+ Assertions.assertEquals(2, unionGraph.size());
}
@Test
@@ -68,10 +71,10 @@ public class UnionGraphTest {
};
graph2.add(new TripleImpl(bnode, uriRef1, uriRef3));
Graph unionGraph = new UnionGraph(graph, graph2);
- Assert.assertEquals(1, unionGraph.size());
+ Assertions.assertEquals(1, unionGraph.size());
unionGraph.add(new TripleImpl(uriRef4, uriRef1, uriRef3));
- Assert.assertEquals(1, graph.size());
- Assert.assertEquals(2, unionGraph.size());
- Assert.assertEquals(1, graph2.size());
+ Assertions.assertEquals(1, graph.size());
+ Assertions.assertEquals(2, unionGraph.size());
+ Assertions.assertEquals(1, graph2.size());
}
}
\ No newline at end of file
diff --git
a/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
b/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
index 722818b..df22703 100644
---
a/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
+++
b/api.utils/src/test/java/org/apache/clerezza/utils/smushing/SameAsSmushTest.java
@@ -27,8 +27,10 @@ import
org.apache.clerezza.implementation.literal.PlainLiteralImpl;
import org.apache.clerezza.ontologies.FOAF;
import org.apache.clerezza.ontologies.OWL;
import org.apache.clerezza.ontologies.RDFS;
-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.Iterator;
import java.util.Set;
@@ -36,6 +38,7 @@ import java.util.Set;
/**
* @author reto
*/
+@RunWith(JUnitPlatform.class)
public class SameAsSmushTest {
private final IRI uriA = new IRI("http://example.org/A";);
@@ -70,21 +73,21 @@ public class SameAsSmushTest {
}
};
- Assert.assertEquals(3, dataGraph.size());
+ Assertions.assertEquals(3, dataGraph.size());
smusher.smush(dataGraph, sameAsStatements, true);
- Assert.assertEquals(4, dataGraph.size());
- Assert.assertTrue(dataGraph.filter(null, OWL.sameAs, null).hasNext());
+ Assertions.assertEquals(4, dataGraph.size());
+ Assertions.assertTrue(dataGraph.filter(null, OWL.sameAs,
null).hasNext());
//exactly one statement with literal
Iterator<Triple> litStmts = dataGraph.filter(null, null, lit);
- Assert.assertTrue(litStmts.hasNext());
+ Assertions.assertTrue(litStmts.hasNext());
Triple litStmt = litStmts.next();
- Assert.assertFalse(litStmts.hasNext());
+ Assertions.assertFalse(litStmts.hasNext());
Iterator<Triple> knowsStmts = dataGraph.filter(null, FOAF.knows, null);
- Assert.assertTrue(knowsStmts.hasNext());
+ Assertions.assertTrue(knowsStmts.hasNext());
Triple knowStmt = knowsStmts.next();
- Assert.assertEquals(knowStmt.getSubject(), knowStmt.getObject());
- Assert.assertEquals(litStmt.getSubject(), knowStmt.getObject());
- Assert.assertEquals(litStmt.getSubject(), dataGraph.filter(null,
OWL.sameAs, null).next().getObject());
- Assert.assertEquals(knowStmt.getSubject(), uriC);
+ Assertions.assertEquals(knowStmt.getSubject(), knowStmt.getObject());
+ Assertions.assertEquals(litStmt.getSubject(), knowStmt.getObject());
+ Assertions.assertEquals(litStmt.getSubject(), dataGraph.filter(null,
OWL.sameAs, null).next().getObject());
+ Assertions.assertEquals(knowStmt.getSubject(), uriC);
}
}
diff --git
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
index f369905..80214b2 100644
---
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
+++
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/EzMGraphTest.scala
@@ -17,20 +17,21 @@
*/
package org.apache.clerezza.scala.utils
-import org.apache.clerezza._
-import org.apache.clerezza.implementation._
-import org.apache.clerezza.implementation.literal._
-import Preamble._
-import org.apache.clerezza.{BlankNode, IRI, ImmutableGraph, Language}
import org.apache.clerezza.implementation.TripleImpl
import org.apache.clerezza.implementation.in_memory.SimpleGraph
import org.apache.clerezza.implementation.literal.{LiteralFactory,
PlainLiteralImpl, TypedLiteralImpl}
import org.apache.clerezza.ontologies._
-import org.junit._
+import org.apache.clerezza.scala.utils.Preamble._
+import org.apache.clerezza.{BlankNode, IRI, ImmutableGraph, Language}
+import org.junit.jupiter.api.Assertions._
+import org.junit.jupiter.api.Test
+import org.junit.platform.runner.JUnitPlatform
+import org.junit.runner.RunWith;
/**
* @author bblfish, reto
*/
+@RunWith(classOf[JUnitPlatform])
class EzGraphTest {
val bblfishModulus =
@@ -100,7 +101,7 @@ class EzGraphTest {
val ez = new EzGraph() {
henryUri.iri -- FOAF.knows --> retoUri.iri
}
- Assert.assertEquals("The two graphs should be equals", expected,
ez.getImmutableGraph)
+ assertEquals(expected, ez.getImmutableGraph, "The two graphs should be
equals")
}
@Test
@@ -113,7 +114,7 @@ class EzGraphTest {
val ez = new EzGraph() {
henryUri.iri <-- FOAF.knows -- retoUri.iri
}
- Assert.assertEquals("The two graphs should be equals", expected,
ez.getImmutableGraph)
+ assertEquals(expected, ez.getImmutableGraph, "The two graphs should be
equals")
}
@Test
@@ -143,8 +144,8 @@ class EzGraphTest {
)
)
}
- Assert.assertEquals("the two graphs should be of same size",
tinyGraph.size, ez.size)
- Assert.assertEquals("Both graphs should contain exactly the same
triples", tinyGraph, ez.getImmutableGraph)
+ assertEquals(tinyGraph.size, ez.size, "the two graphs should be of
same size")
+ assertEquals(tinyGraph, ez.getImmutableGraph, "Both graphs should
contain exactly the same triples")
//We can add triples by creating a new anonymous instance
new EzGraph(ez) {
(
@@ -152,11 +153,10 @@ class EzGraphTest {
-- FOAF.name --> "Bill"
)
}
- Assert.assertEquals("the triple colletion has grown by one",
tinyGraph.size() + 2, ez.size)
+ assertEquals(tinyGraph.size() + 2, ez.size, "the triple colletion has
grown by one")
//or by just importing it
import ez._
ez.b_("danny") -- FOAF.name --> "George"
- Assert.assertEquals("the triple colletion has grown by one",
tinyGraph.size() + 3, ez.size)
+ assertEquals(tinyGraph.size() + 3, ez.size, "the triple colletion has
grown by one")
}
-
}
diff --git
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
index 1d42d60..8fc3a3d 100644
---
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
+++
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/RichGraphNodeTest.scala
@@ -18,19 +18,20 @@
package org.apache.clerezza.scala.utils
import org.apache.clerezza._
-import org.apache.clerezza.implementation._
-import org.apache.clerezza.implementation.graph._
-import org.apache.clerezza.implementation.literal._
-import Preamble._
-import org.apache.clerezza._
-import org.apache.clerezza.utils._
import org.apache.clerezza.implementation.TripleImpl
import org.apache.clerezza.implementation.in_memory.SimpleGraph
import org.apache.clerezza.implementation.literal.{PlainLiteralImpl,
TypedLiteralImpl}
import org.apache.clerezza.ontologies._
+import org.apache.clerezza.scala.utils.Preamble._
import org.apache.clerezza.utils.{GraphNode, RdfList}
-import org.junit._
+import org.junit.jupiter.api.Assertions._
+import org.junit.jupiter.api.{BeforeEach, Test}
+import org.junit.platform.runner.JUnitPlatform
+import org.junit.runner.RunWith
+
+import _root_.scala.language.postfixOps
+@RunWith(classOf[JUnitPlatform])
class RichGraphNodeTest {
private val johnUri = new IRI("http://example.org/john";)
@@ -41,7 +42,7 @@ class RichGraphNodeTest {
private var node: RichGraphNode = null;
private var mGraph = new SimpleGraph()
- @Before
+ @BeforeEach
def prepare() = {
mGraph.add(new TripleImpl(johnUri, FOAF.name, new
PlainLiteralImpl("John")));
mGraph.add(new TripleImpl(johnUri, FOAF.nick, new
PlainLiteralImpl("johny")));
@@ -75,19 +76,19 @@ class RichGraphNodeTest {
def asGn(gn: GraphNode) = gn
val johnUriNode = asGn(johnUri)
- Assert.assertEquals(johnUriNode, node)
+ assertEquals(johnUriNode, node)
}
@Test
def testSlash = {
val rNode = new RichGraphNode(node)
- Assert.assertEquals(new PlainLiteralImpl("johny"), (rNode / FOAF.nick)
(0).getNode)
- Assert.assertEquals(2, (rNode / FOAF.name).length(20))
+ assertEquals(new PlainLiteralImpl("johny"), (rNode / FOAF.nick)
(0).getNode)
+ assertEquals(2, (rNode / FOAF.name).length(20))
val stringNames = (for (name <- (rNode / FOAF.name).iterator) yield {
name.toString
}).toList
- Assert.assertTrue(stringNames.contains("\"Johnathan Guller\""))
- Assert.assertTrue(stringNames.contains("\"John\""))
+ assertTrue(stringNames.contains("\"Johnathan Guller\""))
+ assertTrue(stringNames.contains("\"John\""))
}
@Test
@@ -100,59 +101,59 @@ class RichGraphNodeTest {
node.addProperty(RDF.`type`, PLATFORM.HeadedPage);
node.addProperty(RDF.`type`, RDFS.Class);
val test: CollectedIter[RichGraphNode] = node / DCTERMS.language /
RDF.`type`;
- Assert.assertEquals(1, test.length)
+ assertEquals(1, test.length)
var counter = 0;
for (k <- test) {
counter = counter + 1
}
- Assert.assertEquals(1, counter)
+ assertEquals(1, counter)
}
@Test
def testInverse = {
val rNode = new RichGraphNode(node)
- Assert.assertEquals(1, (rNode /- FOAF.knows).length)
+ assertEquals(1, (rNode /- FOAF.knows).length)
}
@Test
def testMissingProperty = {
val rNode = new RichGraphNode(node)
- Assert.assertEquals(0, (rNode / FOAF.thumbnail).length)
- Assert.assertEquals("", rNode / FOAF.thumbnail *)
+ assertEquals(0, (rNode / FOAF.thumbnail).length)
+ assertEquals("", rNode / FOAF.thumbnail *)
}
@Test
def testInverseImplicit = {
- Assert.assertEquals(1, (node /- FOAF.knows).length)
+ assertEquals(1, (node /- FOAF.knows).length)
}
@Test
def testPath = {
- Assert.assertEquals(1, (node /- FOAF.knows).length)
- Assert.assertEquals(new PlainLiteralImpl("Susanne"), node /-
FOAF.knows % 0 / FOAF.name % 0 !)
- Assert.assertEquals(new PlainLiteralImpl("Susanne"), ((node /-
FOAF.knows) (0) / FOAF.name) (0) !)
- Assert.assertEquals(new PlainLiteralImpl("Susanne"), node /-
FOAF.knows / FOAF.name !)
- Assert.assertEquals(new PlainLiteralImpl("Bill"), node / FOAF.knows /
FOAF.nick !)
- Assert.assertEquals("Bill", (node / FOAF.knows / FOAF.nick) (0) *)
- Assert.assertEquals("Bill", node / FOAF.knows / FOAF.nick *)
+ assertEquals(1, (node /- FOAF.knows).length)
+ assertEquals(new PlainLiteralImpl("Susanne"), node /- FOAF.knows % 0 /
FOAF.name % 0 !)
+ assertEquals(new PlainLiteralImpl("Susanne"), ((node /- FOAF.knows)
(0) / FOAF.name) (0) !)
+ assertEquals(new PlainLiteralImpl("Susanne"), node /- FOAF.knows /
FOAF.name !)
+ assertEquals(new PlainLiteralImpl("Bill"), node / FOAF.knows /
FOAF.nick !)
+ assertEquals("Bill", (node / FOAF.knows / FOAF.nick) (0) *)
+ assertEquals("Bill", node / FOAF.knows / FOAF.nick *)
}
@Test
def testLists = {
- Assert.assertEquals(new PlainLiteralImpl("foo"), (node /
SKOS04.related).asList().get(1))
- Assert.assertEquals(new PlainLiteralImpl("foo"), (node /
SKOS04.related % 0 !!) (1) !)
- Assert.assertEquals(new PlainLiteralImpl("foo"),
+ assertEquals(new PlainLiteralImpl("foo"), (node /
SKOS04.related).asList().get(1))
+ assertEquals(new PlainLiteralImpl("foo"), (node / SKOS04.related % 0
!!) (1) !)
+ assertEquals(new PlainLiteralImpl("foo"),
(for (value <- node / SKOS04.related % 0 !!) yield value
!).toList(1))
- Assert.assertEquals(new PlainLiteralImpl("bar"),
+ assertEquals(new PlainLiteralImpl("bar"),
(for (value <- node / SKOS04.related % 0 !!) yield value
!).toList(2))
- Assert.assertEquals(new PlainLiteralImpl("foo"), node / SKOS04.related
% 0 %!! 1 !)
+ assertEquals(new PlainLiteralImpl("foo"), node / SKOS04.related % 0
%!! 1 !)
}
@Test
def sortProperties = {
- Assert.assertEquals(new PlainLiteralImpl("bar"), (node /
SKOS04.related % 0 !!).sortWith((a, b) => ((a *) < (b *)))(0) !)
- Assert.assertEquals(johnUri, (node / SKOS04.related % 0
!!).sortWith((a, b) => ((a *) > (b *)))(0) !)
+ assertEquals(new PlainLiteralImpl("bar"), (node / SKOS04.related % 0
!!).sortWith((a, b) => ((a *) < (b *)))(0) !)
+ assertEquals(johnUri, (node / SKOS04.related % 0 !!).sortWith((a, b)
=> ((a *) > (b *)))(0) !)
}
@Test
@@ -160,7 +161,7 @@ class RichGraphNodeTest {
val dateLiteral = new TypedLiteralImpl("2009-01-01T01:33:58Z",
new IRI("http://www.w3.org/2001/XMLSchema#dateTime";))
val node = new GraphNode(dateLiteral, new SimpleGraph())
- Assert.assertNotNull(node.as[java.util.Date])
+ assertNotNull(node.as[java.util.Date])
}
@Test
@@ -168,7 +169,6 @@ class RichGraphNodeTest {
node = new GraphNode(greetingsUri, mGraph)
val lang = new Language("en")
val enValue = (node / RDF.value).find(l => (l
!).asInstanceOf[Literal].getLanguage == lang).get
- Assert.assertEquals("hello", enValue *)
+ assertEquals("hello", enValue *)
}
-
}
diff --git
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
index eef9510..52fa48a 100644
---
a/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
+++
b/api.utils/src/test/scala/org/apache/clerezza/scala/utils/TypeConversionTest.scala
@@ -17,14 +17,15 @@
*/
package org.apache.clerezza.scala.utils
-import org.apache.clerezza.{IRI, Language}
-import org.apache.clerezza._
-import org.apache.clerezza.implementation._
-import org.apache.clerezza.implementation.literal._
import org.apache.clerezza.implementation.TripleImpl
import org.apache.clerezza.implementation.literal.{LiteralFactory,
PlainLiteralImpl, TypedLiteralImpl}
-import org.junit._
+import org.apache.clerezza.{IRI, Language}
+import org.junit.jupiter.api.Assertions._
+import org.junit.jupiter.api.Test
+import org.junit.platform.runner.JUnitPlatform
+import org.junit.runner.RunWith
+@RunWith(classOf[JUnitPlatform])
class TypeConversionTest {
private val literalFactory = LiteralFactory.getInstance()
@@ -34,7 +35,7 @@ class TypeConversionTest {
@Test
def useStringAsObject {
val t = new TripleImpl(new IRI(("http://example.org/subject";)), new
IRI(("http://example.org/predicate";)), "a value")
- Assert.assertEquals(literalFactory.createTypedLiteral("a value"),
t.getObject)
+ assertEquals(literalFactory.createTypedLiteral("a value"), t.getObject)
}
/*@Test
@@ -47,27 +48,27 @@ class TypeConversionTest {
def useStringWithLanguageTag {
val lit = new PlainLiteralImpl("a value", new Language("en"))
val t = new TripleImpl(new IRI(("http://example.org/subject";)), new
IRI(("http://example.org/predicate";)), "a value" lang "en")
- Assert.assertEquals(lit, t.getObject)
+ assertEquals(lit, t.getObject)
}
@Test
def useStringWithType {
val typeUri = new IRI("http://example.org/dt";)
val t = new TripleImpl(new IRI(("http://example.org/subject";)), new
IRI(("http://example.org/predicate";)), "a value" ^^ typeUri)
- Assert.assertEquals(new TypedLiteralImpl("a value", typeUri),
t.getObject)
+ assertEquals(new TypedLiteralImpl("a value", typeUri), t.getObject)
}
@Test
def literaToString {
val lit = literalFactory.createTypedLiteral("a value")
val s: String = lit
- Assert.assertEquals("a value", s)
+ assertEquals("a value", s)
}
@Test
def dotUri {
val t = new TripleImpl(new IRI(("http://example.org/subject";)), new
IRI(("http://example.org/predicate";)), "http://example.org".iri)
- Assert.assertEquals(new IRI("http://example.org";), t.getObject)
+ assertEquals(new IRI("http://example.org";), t.getObject)
}
}
