From f1ccfe49bca7fc96e616a631beff0c7a8dff2f24 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Wed, 22 Nov 2017 14:01:18 -0500 Subject: [PATCH] CLEREZZA-1023 Upgrade rdf-core to JUnit 5 --- api/pom.xml | 12 ++-- impl.sparql/pom.xml | 13 +++- .../rdf/impl/sparql/BNodeCircleTest.java | 41 +++++++----- .../commons/rdf/impl/sparql/BNodeTest.java | 46 +++++++------ .../commons/rdf/impl/sparql/Dadmin2Test.java | 19 ++++-- .../commons/rdf/impl/sparql/DadminTest.java | 19 ++++-- .../rdf/impl/sparql/SimilarBNodes.java | 30 +++++---- .../rdf/impl/sparql/SparqlClientTest.java | 24 ++++--- .../rdf/impl/sparql/SparqlGraphTest.java | 37 ++++++----- impl.utils/pom.xml | 11 +++- .../utils/graphmatching/GraphMatcherTest.java | 65 ++++++++++--------- .../utils/graphmatching/HashMatchingTest.java | 14 ++-- .../PermutationIteratorTest.java | 19 ++++-- .../utils/simple/PlainLiteralImplTest.java | 31 +++++---- .../impl/utils/simple/SimpleGraphTest.java | 42 +++++++----- .../rdf/impl/utils/simple/TripleImplTest.java | 29 ++++----- 16 files changed, 269 insertions(+), 183 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index a58ef72..e2d3085 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -56,10 +56,14 @@ - junit - junit - test + org.junit.jupiter + junit-jupiter-engine + 5.0.2 + + + org.junit.platform + junit-platform-runner + 1.0.2 - diff --git a/impl.sparql/pom.xml b/impl.sparql/pom.xml index dcf81fc..939a810 100644 --- a/impl.sparql/pom.xml +++ b/impl.sparql/pom.xml @@ -92,8 +92,15 @@ 0.2 - junit - junit + org.junit.jupiter + junit-jupiter-engine + 5.0.2 + test + + + org.junit.platform + junit-platform-runner + 1.0.2 test @@ -120,4 +127,4 @@ test - \ No newline at end of file + diff --git a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/BNodeCircleTest.java b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/BNodeCircleTest.java index 3bf063d..379cf91 100644 --- a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/BNodeCircleTest.java +++ b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/BNodeCircleTest.java @@ -15,6 +15,10 @@ */ package org.apache.clerezza.commons.rdf.impl.sparql; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.hp.hpl.jena.query.DatasetAccessor; import com.hp.hpl.jena.query.DatasetAccessorFactory; import java.io.IOException; @@ -30,21 +34,24 @@ import org.apache.clerezza.commons.rdf.IRI; import org.apache.clerezza.commons.rdf.RDFTerm; import org.apache.clerezza.commons.rdf.Triple; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * * @author reto */ +@RunWith(JUnitPlatform.class) public class BNodeCircleTest { final static int serverPort = findFreePort(); static EmbeddedFusekiServer server; - @BeforeClass + @BeforeAll public static void prepare() throws IOException { final String serviceURI = "http://localhost:" + serverPort + "/ds/data"; final DatasetAccessor accessor = DatasetAccessorFactory.createHTTP(serviceURI); @@ -58,7 +65,7 @@ public static void prepare() throws IOException { accessor.putModel(m); } - @AfterClass + @AfterAll public static void cleanup() { server.stop(); } @@ -66,7 +73,7 @@ public static void cleanup() { @Test public void graphSize() { final Graph graph = new SparqlGraph("http://localhost:" + serverPort + "/ds/query"); - Assert.assertEquals("Graph not of the exepected size", 2, graph.size()); + assertEquals(2, graph.size(), "Graph not of the exepected size"); } @@ -75,14 +82,14 @@ public void graphSize() { public void nullFilter() { final Graph graph = new SparqlGraph("http://localhost:" + serverPort + "/ds/query"); final Iterator iter = graph.filter(null, null, null); - Assert.assertTrue(iter.hasNext()); + assertTrue(iter.hasNext()); final Triple triple1 = iter.next(); final BlankNodeOrIRI subject = triple1.getSubject(); final RDFTerm object = triple1.getObject(); - Assert.assertTrue(subject instanceof BlankNode); - Assert.assertTrue(object instanceof BlankNode); - Assert.assertNotEquals(subject, object); - Assert.assertTrue(iter.hasNext()); + assertTrue(subject instanceof BlankNode); + assertTrue(object instanceof BlankNode); + assertNotEquals(subject, object); + assertTrue(iter.hasNext()); } @Test @@ -92,14 +99,14 @@ public void foafKnowsFilter() { final IRI foafKnows = new IRI("http://xmlns.com/foaf/0.1/knows"); final Iterator iter = graph.filter(null, foafKnows, null); - Assert.assertTrue(iter.hasNext()); + assertTrue(iter.hasNext()); final Triple triple1 = iter.next(); final BlankNodeOrIRI subject = triple1.getSubject(); final RDFTerm object = triple1.getObject(); - Assert.assertTrue(subject instanceof BlankNode); - Assert.assertTrue(object instanceof BlankNode); - Assert.assertNotEquals(subject, object); - Assert.assertTrue(iter.hasNext()); + assertTrue(subject instanceof BlankNode); + assertTrue(object instanceof BlankNode); + assertNotEquals(subject, object); + assertTrue(iter.hasNext()); } diff --git a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/BNodeTest.java b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/BNodeTest.java index 168ef74..585bd06 100644 --- a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/BNodeTest.java +++ b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/BNodeTest.java @@ -15,6 +15,10 @@ */ package org.apache.clerezza.commons.rdf.impl.sparql; +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 com.hp.hpl.jena.query.DatasetAccessor; import com.hp.hpl.jena.query.DatasetAccessorFactory; import java.io.IOException; @@ -30,10 +34,12 @@ import org.apache.clerezza.commons.rdf.IRI; import org.apache.clerezza.commons.rdf.RDFTerm; import org.apache.clerezza.commons.rdf.Triple; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * @@ -44,7 +50,7 @@ public class BNodeTest { final static int serverPort = findFreePort(); static EmbeddedFusekiServer server; - @BeforeClass + @BeforeAll public static void prepare() throws IOException { final String serviceURI = "http://localhost:" + serverPort + "/ds/data"; final DatasetAccessor accessor = DatasetAccessorFactory.createHTTP(serviceURI); @@ -58,7 +64,7 @@ public static void prepare() throws IOException { accessor.putModel(m); } - @AfterClass + @AfterAll public static void cleanup() { server.stop(); } @@ -66,7 +72,7 @@ public static void cleanup() { @Test public void graphSize() { final Graph graph = new SparqlGraph("http://localhost:" + serverPort + "/ds/query"); - Assert.assertEquals("Graph not of the expected size", 3, graph.size()); + assertEquals(3, graph.size(), "Graph not of the expected size"); } /* Filtering with a Bode that cannot be in graph @@ -77,7 +83,7 @@ public void filterAlienBNode() { final BlankNode blankNode = new BlankNode(); final Iterator iter = graph.filter(blankNode, null, null); - Assert.assertFalse(iter.hasNext()); + assertFalse(iter.hasNext()); } @Test @@ -90,22 +96,22 @@ public void bNodeIdentity() { final IRI rdfType = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"); final Iterator iter = graph.filter(null, foafName, null); - Assert.assertTrue(iter.hasNext()); + assertTrue(iter.hasNext()); final BlankNodeOrIRI namedThing = iter.next().getSubject(); - Assert.assertTrue(namedThing instanceof BlankNode); + assertTrue(namedThing instanceof BlankNode); final Iterator iter2 = graph.filter(null, rdfType, foafPerson); - Assert.assertTrue(iter2.hasNext()); + assertTrue(iter2.hasNext()); final BlankNodeOrIRI person = iter2.next().getSubject(); - Assert.assertTrue(person instanceof BlankNode); - Assert.assertEquals(namedThing, person); + assertTrue(person instanceof BlankNode); + assertEquals(namedThing, person); final Iterator iter3 = graph.filter(null, foafKnows, null); - Assert.assertTrue(iter3.hasNext()); + assertTrue(iter3.hasNext()); final RDFTerm knownThing = iter3.next().getObject(); - Assert.assertTrue(knownThing instanceof BlankNode); - Assert.assertEquals(knownThing, person); - Assert.assertEquals(namedThing, knownThing); + assertTrue(knownThing instanceof BlankNode); + assertEquals(knownThing, person); + assertEquals(namedThing, knownThing); } @Test @@ -117,12 +123,12 @@ public void filter1() { final IRI rdfType = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"); final Iterator iter = graph.filter(null, foafName, null); - Assert.assertTrue(iter.hasNext()); + assertTrue(iter.hasNext()); final BlankNodeOrIRI person = iter.next().getSubject(); - Assert.assertTrue(person instanceof BlankNode); + assertTrue(person instanceof BlankNode); final Iterator iter2 = graph.filter(person, rdfType, null); - Assert.assertTrue(iter2.hasNext()); + assertTrue(iter2.hasNext()); } diff --git a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/Dadmin2Test.java b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/Dadmin2Test.java index 5b954c6..d3e0014 100644 --- a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/Dadmin2Test.java +++ b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/Dadmin2Test.java @@ -15,6 +15,8 @@ */ package org.apache.clerezza.commons.rdf.impl.sparql; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.hp.hpl.jena.query.DatasetAccessor; import com.hp.hpl.jena.query.DatasetAccessorFactory; import java.io.IOException; @@ -35,21 +37,24 @@ import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * * @author reto */ +@RunWith(JUnitPlatform.class) public class Dadmin2Test { final static int serverPort = findFreePort(); static EmbeddedFusekiServer server; - @BeforeClass + @BeforeAll public static void prepare() throws IOException { final String serviceURI = "http://localhost:" + serverPort + "/ds/data"; final DatasetAccessor accessor = DatasetAccessorFactory.createHTTP(serviceURI); @@ -63,7 +68,7 @@ public static void prepare() throws IOException { accessor.putModel(m); } - @AfterClass + @AfterAll public static void cleanup() { server.stop(); } @@ -71,7 +76,7 @@ public static void cleanup() { @Test public void graphSize() { final Graph graph = new SparqlGraph("http://localhost:" + serverPort + "/ds/query"); - Assert.assertEquals("Graph not of the exepected size", 12, graph.size()); + assertEquals(12, graph.size(), "Graph not of the exepected size"); } @Test diff --git a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/DadminTest.java b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/DadminTest.java index d65a327..aeb63b8 100644 --- a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/DadminTest.java +++ b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/DadminTest.java @@ -15,6 +15,8 @@ */ package org.apache.clerezza.commons.rdf.impl.sparql; +import static org.junit.jupiter.api.Assertions.assertEquals; + import com.hp.hpl.jena.query.DatasetAccessor; import com.hp.hpl.jena.query.DatasetAccessorFactory; import java.io.IOException; @@ -35,21 +37,24 @@ import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * * @author reto */ +@RunWith(JUnitPlatform.class) public class DadminTest { final static int serverPort = findFreePort(); static EmbeddedFusekiServer server; - @BeforeClass + @BeforeAll public static void prepare() throws IOException { final String serviceURI = "http://localhost:" + serverPort + "/ds/data"; final DatasetAccessor accessor = DatasetAccessorFactory.createHTTP(serviceURI); @@ -63,7 +68,7 @@ public static void prepare() throws IOException { accessor.putModel(m); } - @AfterClass + @AfterAll public static void cleanup() { server.stop(); } @@ -71,7 +76,7 @@ public static void cleanup() { @Test public void graphSize() { final Graph graph = new SparqlGraph("http://localhost:" + serverPort + "/ds/query"); - Assert.assertEquals("Graph not of the exepected size", 1, graph.size()); + assertEquals(1, graph.size(), "Graph not of the exepected size"); } @Test diff --git a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SimilarBNodes.java b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SimilarBNodes.java index 975084f..2e2bc3d 100644 --- a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SimilarBNodes.java +++ b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SimilarBNodes.java @@ -15,6 +15,10 @@ */ package org.apache.clerezza.commons.rdf.impl.sparql; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.hp.hpl.jena.query.DatasetAccessor; import com.hp.hpl.jena.query.DatasetAccessorFactory; import java.io.IOException; @@ -29,10 +33,12 @@ import org.apache.clerezza.commons.rdf.Graph; import org.apache.clerezza.commons.rdf.IRI; import org.apache.clerezza.commons.rdf.Triple; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * @@ -43,7 +49,7 @@ public class SimilarBNodes { final static int serverPort = findFreePort(); static EmbeddedFusekiServer server; - @BeforeClass + @BeforeAll public static void prepare() throws IOException { final String serviceURI = "http://localhost:" + serverPort + "/ds/data"; final DatasetAccessor accessor = DatasetAccessorFactory.createHTTP(serviceURI); @@ -57,7 +63,7 @@ public static void prepare() throws IOException { accessor.putModel(m); } - @AfterClass + @AfterAll public static void cleanup() { server.stop(); } @@ -65,7 +71,7 @@ public static void cleanup() { @Test public void graphSize() { final Graph graph = new SparqlGraph("http://localhost:" + serverPort + "/ds/query"); - Assert.assertEquals("Graph not of the exepected size", 2, graph.size()); + assertEquals(2, graph.size(), "Graph not of the exepected size"); } @@ -77,15 +83,15 @@ public void foafKnowsFilter() { final IRI foafKnows = new IRI("http://xmlns.com/foaf/0.1/knows"); final Iterator iter = graph.filter(null, foafKnows, null); - Assert.assertTrue(iter.hasNext()); + assertTrue(iter.hasNext()); final Triple triple1 = iter.next(); final BlankNodeOrIRI subject1 = triple1.getSubject(); - Assert.assertTrue(subject1 instanceof BlankNode); - Assert.assertTrue(iter.hasNext()); + assertTrue(subject1 instanceof BlankNode); + assertTrue(iter.hasNext()); final Triple triple2 = iter.next(); final BlankNodeOrIRI subject2 = triple2.getSubject(); - Assert.assertTrue(subject2 instanceof BlankNode); - Assert.assertNotEquals(subject1, subject2); + assertTrue(subject2 instanceof BlankNode); + assertNotEquals(subject1, subject2); } diff --git a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SparqlClientTest.java b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SparqlClientTest.java index ff1d794..5092c3d 100644 --- a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SparqlClientTest.java +++ b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SparqlClientTest.java @@ -15,6 +15,9 @@ */ package org.apache.clerezza.commons.rdf.impl.sparql; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.hp.hpl.jena.query.DatasetAccessor; import com.hp.hpl.jena.query.DatasetAccessorFactory; import java.io.IOException; @@ -27,21 +30,24 @@ import java.util.Map; import org.apache.clerezza.commons.rdf.Graph; import org.apache.clerezza.commons.rdf.RDFTerm; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * * @author reto */ +@RunWith(JUnitPlatform.class) public class SparqlClientTest { final static int serverPort = findFreePort(); static EmbeddedFusekiServer server; - @BeforeClass + @BeforeAll public static void prepare() throws IOException { final String serviceURI = "http://localhost:" + serverPort + "/ds/data"; final DatasetAccessor accessor = DatasetAccessorFactory.createHTTP(serviceURI); @@ -55,7 +61,7 @@ public static void prepare() throws IOException { accessor.putModel(m); } - @AfterClass + @AfterAll public static void cleanup() { server.stop(); } @@ -68,7 +74,7 @@ public void select() throws IOException { "SELECT ?name WHERE { " + " " + " ?name}"); - Assert.assertEquals("There should be two names", 2, result.size()); + assertEquals(2, result.size(), "There should be two names"); } @Test @@ -79,7 +85,7 @@ public void ask() throws IOException { "ASK { " + " " + " ?name}"); - Assert.assertEquals("ASK should result to true", Boolean.TRUE, result); + assertEquals(Boolean.TRUE, result, "ASK should result to true"); } @Test @@ -88,7 +94,7 @@ public void desribe() throws IOException { "http://localhost:" + serverPort + "/ds/query"); Object result = sparqlClient.queryResult( "DESCRIBE "); - Assert.assertTrue("DESCRIBE should return a graph", result instanceof Graph); + assertTrue(result instanceof Graph, "DESCRIBE should return a graph"); } public static int findFreePort() { diff --git a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SparqlGraphTest.java b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SparqlGraphTest.java index 0461f3e..5c3926e 100644 --- a/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SparqlGraphTest.java +++ b/impl.sparql/src/test/java/org/apache/clerezza/commons/rdf/impl/sparql/SparqlGraphTest.java @@ -15,6 +15,10 @@ */ package org.apache.clerezza.commons.rdf.impl.sparql; +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 com.hp.hpl.jena.query.DatasetAccessor; import com.hp.hpl.jena.query.DatasetAccessorFactory; import java.io.IOException; @@ -33,21 +37,24 @@ import org.apache.clerezza.commons.rdf.RDFTerm; import org.apache.clerezza.commons.rdf.Triple; import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * * @author reto */ +@RunWith(JUnitPlatform.class) public class SparqlGraphTest { final static int serverPort = findFreePort(); static EmbeddedFusekiServer server; - @BeforeClass + @BeforeAll public static void prepare() throws IOException { final String serviceURI = "http://localhost:" + serverPort + "/ds/data"; final DatasetAccessor accessor = DatasetAccessorFactory.createHTTP(serviceURI); @@ -61,7 +68,7 @@ public static void prepare() throws IOException { accessor.putModel(m); } - @AfterClass + @AfterAll public static void cleanup() { server.stop(); } @@ -69,7 +76,7 @@ public static void cleanup() { @Test public void graphSize() { final Graph graph = new SparqlGraph("http://localhost:" + serverPort + "/ds/query"); - Assert.assertEquals("Graph not of the exepected size", 8, graph.size()); + assertEquals(8, graph.size(), "Graph not of the exepected size"); } @Test @@ -81,22 +88,22 @@ public void filter1() { final IRI foafName = new IRI("http://xmlns.com/foaf/0.1/name"); { final Iterator iter = graph.filter(spiderman, null, greenGoblin); - Assert.assertTrue(iter.hasNext()); - Assert.assertEquals(enemyOf, iter.next().getPredicate()); - Assert.assertFalse(iter.hasNext()); + assertTrue(iter.hasNext()); + assertEquals(enemyOf, iter.next().getPredicate()); + assertFalse(iter.hasNext()); } { final Iterator iter = graph.filter(spiderman, foafName, null); Set names = new HashSet<>(); for (int i = 0; i < 2; i++) { - Assert.assertTrue(iter.hasNext()); + assertTrue(iter.hasNext()); RDFTerm name = iter.next().getObject(); - Assert.assertTrue(name instanceof Literal); + assertTrue(name instanceof Literal); names.add((Literal)name); } - Assert.assertFalse(iter.hasNext()); - Assert.assertTrue(names.contains(new PlainLiteralImpl("Spiderman"))); - Assert.assertTrue(names.contains(new PlainLiteralImpl("Человек-паук", new Language("ru")))); + assertFalse(iter.hasNext()); + assertTrue(names.contains(new PlainLiteralImpl("Spiderman"))); + assertTrue(names.contains(new PlainLiteralImpl("Человек-паук", new Language("ru")))); } } diff --git a/impl.utils/pom.xml b/impl.utils/pom.xml index b217d7e..9f696e6 100644 --- a/impl.utils/pom.xml +++ b/impl.utils/pom.xml @@ -76,8 +76,15 @@ 0.3-SNAPSHOT - junit - junit + org.junit.jupiter + junit-jupiter-engine + 5.0.2 + test + + + org.junit.platform + junit-platform-runner + 1.0.2 test diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcherTest.java b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcherTest.java index 24b92c5..64e0506 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcherTest.java +++ b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/GraphMatcherTest.java @@ -18,6 +18,10 @@ */ package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +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 org.apache.clerezza.commons.rdf.impl.utils.graphmatching.GraphMatcher; import java.util.Map; import org.apache.clerezza.commons.rdf.BlankNode; @@ -29,13 +33,16 @@ import org.apache.clerezza.commons.rdf.IRI; import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph; import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; -import org.junit.Assert; -import org.junit.Test; + +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * * @author reto */ +@RunWith(JUnitPlatform.class) public class GraphMatcherTest { final static IRI u1 = new IRI("http://example.org/u1"); @@ -45,8 +52,8 @@ public void testEmpty() { Graph tc1 = new SimpleMGraph(); Graph tc2 = new SimpleMGraph(); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); - Assert.assertEquals(0, mapping.size()); + assertNotNull(mapping); + assertEquals(0, mapping.size()); } @Test @@ -55,7 +62,7 @@ public void test2() { tc1.add(new TripleImpl(u1, u1, u1)); Graph tc2 = new SimpleMGraph(); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNull(mapping); + assertNull(mapping); } @Test @@ -65,8 +72,8 @@ public void test3() { Graph tc2 = new SimpleMGraph(); tc2.add(new TripleImpl(u1, u1, u1)); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); - Assert.assertEquals(0, mapping.size()); + assertNotNull(mapping); + assertEquals(0, mapping.size()); } @Test @@ -76,8 +83,8 @@ public void test4() { Graph tc2 = new SimpleMGraph(); tc2.add(new TripleImpl(u1, u1, new BlankNode())); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); - Assert.assertEquals(1, mapping.size()); + assertNotNull(mapping); + assertEquals(1, mapping.size()); } @Test @@ -87,8 +94,8 @@ public void test5() { Graph tc2 = new SimpleMGraph(); tc2.add(new TripleImpl(new BlankNode(), u1, new BlankNode())); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); - Assert.assertEquals(2, mapping.size()); + assertNotNull(mapping); + assertEquals(2, mapping.size()); } @Test @@ -100,7 +107,7 @@ public void test6() { Graph tc2 = new SimpleMGraph(); tc2.add(new TripleImpl(new BlankNode(), u1, new BlankNode())); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNull(mapping); + assertNull(mapping); } private Graph generateCircle(int size) { @@ -127,8 +134,8 @@ public void test7() { Graph tc1 = generateCircle(2); Graph tc2 = generateCircle(2); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); - Assert.assertEquals(2, mapping.size()); + assertNotNull(mapping); + assertEquals(2, mapping.size()); } @Test @@ -136,8 +143,8 @@ public void test8() { Graph tc1 = generateCircle(5); Graph tc2 = generateCircle(5); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); - Assert.assertEquals(5, mapping.size()); + assertNotNull(mapping); + assertEquals(5, mapping.size()); } @Test @@ -147,11 +154,11 @@ public void test9() { tc1.addAll(generateCircle(3,crossing)); Graph tc2 = generateCircle(2,crossing); tc2.addAll(generateCircle(3,crossing)); - Assert.assertEquals(5, tc1.size()); + assertEquals(5, tc1.size()); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); + assertNotNull(mapping); //a circle of 2 with 1 bnode and one of 2 bnodes - Assert.assertEquals(3, mapping.size()); + assertEquals(3, mapping.size()); } @Test @@ -162,11 +169,11 @@ public void test10() { BlankNodeOrIRI crossing2 = new BlankNode(); Graph tc2 = generateCircle(2,crossing2); tc2.addAll(generateCircle(3,crossing2)); - Assert.assertEquals(5, tc1.size()); + assertEquals(5, tc1.size()); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); + assertNotNull(mapping); //a circle of 2 and one of 3 with one common node - Assert.assertEquals(4, mapping.size()); + assertEquals(4, mapping.size()); } @Test @@ -177,9 +184,9 @@ public void test11() { BlankNodeOrIRI crossing2 = new BlankNode(); Graph tc2 = generateCircle(3,crossing2); tc2.addAll(generateCircle(3,crossing2)); - Assert.assertEquals(6, tc1.size()); + assertEquals(6, tc1.size()); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNull(mapping); + assertNull(mapping); } @Test @@ -190,10 +197,10 @@ public void test12() { BlankNodeOrIRI start2 = new BlankNode(); Graph tc2 = Utils4Testing.generateLine(5,start2); tc2.addAll(Utils4Testing.generateLine(4,start2)); - Assert.assertEquals(9, tc1.size()); + assertEquals(9, tc1.size()); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNotNull(mapping); - Assert.assertEquals(10, mapping.size()); + assertNotNull(mapping); + assertEquals(10, mapping.size()); } @Test @@ -204,8 +211,8 @@ public void test13() { BlankNodeOrIRI start2 = new BlankNode(); Graph tc2 = Utils4Testing.generateLine(3,start2); tc2.addAll(Utils4Testing.generateLine(3,start2)); - Assert.assertEquals(9, tc1.size()); + assertEquals(9, tc1.size()); final Map mapping = GraphMatcher.getValidMapping(tc1, tc2); - Assert.assertNull(mapping); + assertNull(mapping); } } diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatchingTest.java b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatchingTest.java index 8acbce5..8c7a780 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatchingTest.java +++ b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/HashMatchingTest.java @@ -19,14 +19,18 @@ package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.Map; import org.apache.clerezza.commons.rdf.BlankNode; import org.apache.clerezza.commons.rdf.Graph; import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; -import org.junit.Assert; -import org.junit.Test; + +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * @@ -42,10 +46,10 @@ public void twoLine() throws GraphNotIsomorphicException { BlankNodeOrIRI start2 = new BlankNode(); Graph tc2 = Utils4Testing.generateLine(5,start2); tc2.addAll(Utils4Testing.generateLine(4,start2)); - Assert.assertEquals(9, tc1.size()); + assertEquals(9, tc1.size()); final Map mapping = new HashMatching(tc1, tc2).getMatchings(); - Assert.assertNotNull(mapping); - Assert.assertEquals(10, mapping.size()); + assertNotNull(mapping); + assertEquals(10, mapping.size()); } } diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIteratorTest.java b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIteratorTest.java index 3f61508..9b1cb27 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIteratorTest.java +++ b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/graphmatching/PermutationIteratorTest.java @@ -19,25 +19,32 @@ package org.apache.clerezza.commons.rdf.impl.utils.graphmatching; +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.apache.clerezza.commons.rdf.impl.utils.graphmatching.PermutationIterator; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.junit.Assert; -import org.junit.Test; + +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; /** * * @author reto */ +@RunWith(JUnitPlatform.class) public class PermutationIteratorTest { @Test public void simple() { List list = new ArrayList(); PermutationIterator pi = new PermutationIterator(list); - Assert.assertFalse(pi.hasNext()); + assertFalse(pi.hasNext()); } @Test @@ -45,7 +52,7 @@ public void lessSimple() { List list = new ArrayList(); list.add("Hasan"); PermutationIterator pi = new PermutationIterator(list); - Assert.assertTrue(pi.hasNext()); + assertTrue(pi.hasNext()); } @Test @@ -58,7 +65,7 @@ public void regular() { while (pi.hasNext()) { permutations.add(pi.next()); } - Assert.assertEquals(2, permutations.size()); + assertEquals(2, permutations.size()); } @Test @@ -72,7 +79,7 @@ public void extended() { while (pi.hasNext()) { permutations.add(pi.next()); } - Assert.assertEquals(6, permutations.size()); + assertEquals(6, permutations.size()); } } diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/PlainLiteralImplTest.java b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/PlainLiteralImplTest.java index 538a16d..127bf55 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/PlainLiteralImplTest.java +++ b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/PlainLiteralImplTest.java @@ -18,18 +18,23 @@ */ package org.apache.clerezza.commons.rdf.impl.utils.simple; -import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; import org.apache.clerezza.commons.rdf.Language; import org.apache.clerezza.commons.rdf.Literal; -import org.junit.Assert; + +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; + /** * * @author reto * */ - +@RunWith(JUnitPlatform.class) public class PlainLiteralImplTest { @@ -37,10 +42,10 @@ public class PlainLiteralImplTest { String stringValue = "some text"; Literal literal1 = new PlainLiteralImpl(stringValue); Literal literal2 = new PlainLiteralImpl(stringValue); - Assert.assertEquals(literal1, literal2); - Assert.assertEquals(literal1.hashCode(), literal2.hashCode()); + assertEquals(literal1, literal2); + assertEquals(literal1.hashCode(), literal2.hashCode()); Literal literal3 = new PlainLiteralImpl("something else"); - Assert.assertFalse(literal1.equals(literal3)); + assertFalse(literal1.equals(literal3)); } @Test public void languageLiteralEquality() { @@ -48,14 +53,14 @@ public class PlainLiteralImplTest { Language lang = new Language("en-ca"); Literal literal1 = new PlainLiteralImpl(stringValue, lang); Literal literal2 = new PlainLiteralImpl(stringValue, lang); - Assert.assertEquals(literal1, literal2); - Assert.assertEquals(literal1.hashCode(), literal2.hashCode()); + assertEquals(literal1, literal2); + assertEquals(literal1.hashCode(), literal2.hashCode()); Language lang2 = new Language("de"); Literal literal3 = new PlainLiteralImpl(stringValue, lang2); - Assert.assertFalse(literal1.equals(literal3)); + assertFalse(literal1.equals(literal3)); Literal literal4 = new PlainLiteralImpl(stringValue, null); - Assert.assertFalse(literal3.equals(literal4)); - Assert.assertFalse(literal4.equals(literal3)); + assertFalse(literal3.equals(literal4)); + assertFalse(literal4.equals(literal3)); } /** @@ -65,7 +70,7 @@ public class PlainLiteralImplTest { String stringValue = "some text"; Language language = new Language("en"); Literal literal = new PlainLiteralImpl(stringValue, language); - Assert.assertEquals(literal.getDataType().hashCode() + stringValue.hashCode() + language.hashCode(), literal.hashCode()); + assertEquals(literal.getDataType().hashCode() + stringValue.hashCode() + language.hashCode(), literal.hashCode()); } } diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraphTest.java b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraphTest.java index 9c94a8d..03c43b5 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraphTest.java +++ b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/SimpleGraphTest.java @@ -18,19 +18,26 @@ */ package org.apache.clerezza.commons.rdf.impl.utils.simple; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; import java.util.ConcurrentModificationException; import java.util.Iterator; -import org.junit.Assert; -import org.junit.Test; + import org.apache.clerezza.commons.rdf.Triple; import org.apache.clerezza.commons.rdf.IRI; import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph; +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; + /** * * @author mir */ +@RunWith(JUnitPlatform.class) public class SimpleGraphTest { private IRI uriRef1 = new IRI("http://example.org/foo"); @@ -55,7 +62,7 @@ public void iteratorRemove() { Triple triple = iter.next(); iter.remove(); } - Assert.assertEquals(0, stc.size()); + assertEquals(0, stc.size()); } @Test @@ -71,7 +78,7 @@ public void removeAll() { stc2.add(triple3); stc2.add(triple5); stc.removeAll(stc2); - Assert.assertEquals(2, stc.size()); + assertEquals(2, stc.size()); } @Test @@ -87,23 +94,24 @@ public void filterIteratorRemove() { Triple triple = iter.next(); iter.remove(); } - Assert.assertEquals(3, stc.size()); + assertEquals(3, stc.size()); } - @Test(expected=ConcurrentModificationException.class) + @Test public void remove() { SimpleGraph stc = new SimpleGraph(); stc.setCheckConcurrency(true); - stc.add(triple1); - stc.add(triple2); - stc.add(triple3); - stc.add(triple4); - stc.add(triple5); - Iterator iter = stc.filter(uriRef1, null, null); - while (iter.hasNext()) { - Triple triple = iter.next(); - stc.remove(triple); - } - Assert.assertEquals(3, stc.size()); + assertThrows(ConcurrentModificationException.class, () -> { + stc.add(triple1); + stc.add(triple2); + stc.add(triple3); + stc.add(triple4); + stc.add(triple5); + Iterator iter = stc.filter(uriRef1, null, null); + while (iter.hasNext()) { + Triple triple = iter.next(); + stc.remove(triple); + } + }); } } diff --git a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TripleImplTest.java b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TripleImplTest.java index b064a60..ee54cb4 100644 --- a/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TripleImplTest.java +++ b/impl.utils/src/test/java/org/apache/clerezza/commons/rdf/impl/utils/simple/TripleImplTest.java @@ -1,11 +1,4 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - -package org.apache.clerezza.commons.rdf.impl.utils.simple; -/* - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -22,12 +15,10 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * -*/ - + */ +package org.apache.clerezza.commons.rdf.impl.utils.simple; -import org.junit.Test; -import junit.framework.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.clerezza.commons.rdf.BlankNodeOrIRI; import org.apache.clerezza.commons.rdf.RDFTerm; @@ -35,23 +26,27 @@ import org.apache.clerezza.commons.rdf.IRI; import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; + +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; + /** * * @author reto * */ - +@RunWith(JUnitPlatform.class) public class TripleImplTest { - - + @Test public void tripleEquality() { BlankNodeOrIRI subject = new IRI("http://example.org/"); IRI predicate = new IRI("http://example.org/property"); RDFTerm object = new PlainLiteralImpl("property value"); Triple triple1 = new TripleImpl(subject, predicate, object); Triple triple2 = new TripleImpl(subject, predicate, object); - Assert.assertEquals(triple1.hashCode(), triple2.hashCode()); - Assert.assertEquals(triple1, triple2); + assertEquals(triple1.hashCode(), triple2.hashCode()); + assertEquals(triple1, triple2); } }