From d95f112538c880ffa07c2b08ebefcf98a74c88f6 Mon Sep 17 00:00:00 2001 From: Jerven Bolleman Date: Mon, 22 May 2023 08:20:29 +0200 Subject: [PATCH] GH-4544 core/model java test cases changed Signed-off-by: Jerven Bolleman --- .../model/datatypes/XMLDatatypeUtilTest.java | 12 ++-- .../model/impl/ContextStatementTest.java | 4 +- .../rdf4j/model/util/ModelBuilderTest.java | 6 +- .../rdf4j/model/util/ModelCollectorTest.java | 6 +- .../eclipse/rdf4j/model/util/ModelsTest.java | 58 +++++++++---------- .../rdf4j/model/util/NamespacesTest.java | 14 ++--- .../rdf4j/model/util/RDFCollectionsTest.java | 8 +-- .../rdf4j/model/util/RDFContainersTest.java | 6 +- .../rdf4j/model/util/StatementsTest.java | 24 ++++---- .../eclipse/rdf4j/model/util/URIUtilTest.java | 54 ++++++++--------- .../eclipse/rdf4j/model/util/ValuesTest.java | 4 +- .../rdf4j/model/util/VocabulariesTest.java | 2 +- 12 files changed, 99 insertions(+), 99 deletions(-) diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/datatypes/XMLDatatypeUtilTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/datatypes/XMLDatatypeUtilTest.java index c4e48dd4df2..5322b7a6935 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/datatypes/XMLDatatypeUtilTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/datatypes/XMLDatatypeUtilTest.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.rdf4j.model.datatypes; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.base.CoreDatatype; @@ -260,15 +260,15 @@ public void testParseFloat() { public void testCompareDateTimeStamp() { int sameOffset = XMLDatatypeUtil.compare("2019-12-06T00:00:00Z", "2019-12-06T00:00:00+00:00", XSD.DATETIMESTAMP); - assertTrue("Not the same", sameOffset == 0); + assertTrue(sameOffset == 0, "Not the same"); int offset1 = XMLDatatypeUtil.compare("2019-12-06T14:00:00+02:00", "2019-12-06T13:00:00+02:00", XSD.DATETIMESTAMP); - assertTrue("Wrong order", offset1 > 0); + assertTrue(offset1 > 0, "Wrong order"); int offset2 = XMLDatatypeUtil.compare("2019-12-06T12:00:00+02:00", "2019-12-06T13:00:00-04:00", XSD.DATETIMESTAMP); - assertTrue("Wrong order", offset2 < 0); + assertTrue(offset2 < 0, "Wrong order"); } @Test diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/impl/ContextStatementTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/impl/ContextStatementTest.java index d674859ec47..7ab45abd033 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/impl/ContextStatementTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/impl/ContextStatementTest.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.rdf4j.model.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.HashSet; import java.util.Set; diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelBuilderTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelBuilderTest.java index f5eee9f2f95..6977aa495d3 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelBuilderTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelBuilderTest.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.rdf4j.model.util; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.impl.LinkedHashModel; diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelCollectorTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelCollectorTest.java index dab6b7a2fbb..18a32c8d2e6 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelCollectorTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelCollectorTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.rdf4j.model.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.HashSet; import java.util.Set; @@ -41,12 +41,12 @@ public void setUp() throws Exception { @Test public void testCollector() { Model m = stmts.stream().collect(ModelCollector.toModel()); - assertEquals("Number of statements does not match", m.size(), nrStmts); + assertEquals(m.size(), nrStmts, "Number of statements does not match"); } @Test public void testCollectorParallel() { Model m = stmts.parallelStream().collect(ModelCollector.toModel()); - assertEquals("Number of statements does not match", m.size(), nrStmts); + assertEquals(m.size(), nrStmts, "Number of statements does not match"); } } diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelsTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelsTest.java index 0e48d4daa87..a8812134055 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelsTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/ModelsTest.java @@ -11,10 +11,10 @@ package org.eclipse.rdf4j.model.util; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import java.util.Optional; @@ -81,7 +81,7 @@ public void testModelsIsomorphic() { // add same statement again model2.add(foo, RDF.TYPE, bar); - assertTrue("Duplicate statement should not be considered", Models.isomorphic(model1, model2)); + assertTrue(Models.isomorphic(model1, model2), "Duplicate statement should not be considered"); // two identical statements with bnodes added. model1.add(foo, RDF.TYPE, VF.createBNode()); @@ -461,22 +461,22 @@ public void testConvertReificationToRDFStar() { Model referenceRDFStarModel = RDFStarTestHelper.createRDFStarModel(); Model rdfStarModel1 = Models.convertReificationToRDFStar(VF, reificationModel); - assertTrue("RDF reification conversion to RDF-star with explicit VF, model-to-model", - Models.isomorphic(rdfStarModel1, referenceRDFStarModel)); + assertTrue(Models.isomorphic(rdfStarModel1, referenceRDFStarModel), + "RDF reification conversion to RDF-star with explicit VF, model-to-model"); Model rdfStarModel2 = Models.convertReificationToRDFStar(reificationModel); - assertTrue("RDF reification conversion to RDF-star with implicit VF, model-to-model", - Models.isomorphic(rdfStarModel2, referenceRDFStarModel)); + assertTrue(Models.isomorphic(rdfStarModel2, referenceRDFStarModel), + "RDF reification conversion to RDF-star with implicit VF, model-to-model"); Model rdfStarModel3 = new TreeModel(); Models.convertReificationToRDFStar(VF, reificationModel, (Consumer) rdfStarModel3::add); - assertTrue("RDF reification conversion to RDF-star with explicit VF, model-to-consumer", - Models.isomorphic(rdfStarModel3, referenceRDFStarModel)); + assertTrue(Models.isomorphic(rdfStarModel3, referenceRDFStarModel), + "RDF reification conversion to RDF-star with explicit VF, model-to-consumer"); Model rdfStarModel4 = new TreeModel(); Models.convertReificationToRDFStar(reificationModel, rdfStarModel4::add); - assertTrue("RDF reification conversion to RDF-star with implicit VF, model-to-consumer", - Models.isomorphic(rdfStarModel4, referenceRDFStarModel)); + assertTrue(Models.isomorphic(rdfStarModel4, referenceRDFStarModel), + "RDF reification conversion to RDF-star with implicit VF, model-to-consumer"); } @Test @@ -486,22 +486,22 @@ public void testConvertIncompleteReificationToRDFStar() { Model incompleteReificationModel = RDFStarTestHelper.createIncompleteRDFReificationModel(); Model rdfStarModel1 = Models.convertReificationToRDFStar(VF, incompleteReificationModel); - assertTrue("Incomplete RDF reification conversion to RDF-star with explicit VF, model-to-model", - Models.isomorphic(rdfStarModel1, incompleteReificationModel)); + assertTrue(Models.isomorphic(rdfStarModel1, incompleteReificationModel), + "Incomplete RDF reification conversion to RDF-star with explicit VF, model-to-model"); Model rdfStarModel2 = Models.convertReificationToRDFStar(incompleteReificationModel); - assertTrue("Incomplete RDF reification conversion to RDF-star with implicit VF, model-to-model", - Models.isomorphic(rdfStarModel2, incompleteReificationModel)); + assertTrue(Models.isomorphic(rdfStarModel2, incompleteReificationModel), + "Incomplete RDF reification conversion to RDF-star with implicit VF, model-to-model"); Model rdfStarModel3 = new TreeModel(); Models.convertReificationToRDFStar(VF, incompleteReificationModel, (Consumer) rdfStarModel3::add); - assertTrue("Incomplete RDF reification conversion to RDF-star with explicit VF, model-to-consumer", - Models.isomorphic(rdfStarModel3, incompleteReificationModel)); + assertTrue(Models.isomorphic(rdfStarModel3, incompleteReificationModel), + "Incomplete RDF reification conversion to RDF-star with explicit VF, model-to-consumer"); Model rdfStarModel4 = new TreeModel(); Models.convertReificationToRDFStar(incompleteReificationModel, rdfStarModel4::add); - assertTrue("Incomplete RDF reification conversion to RDF-star with implicit VF, model-to-consumer", - Models.isomorphic(rdfStarModel4, incompleteReificationModel)); + assertTrue(Models.isomorphic(rdfStarModel4, incompleteReificationModel), + "Incomplete RDF reification conversion to RDF-star with implicit VF, model-to-consumer"); } @Test @@ -510,22 +510,22 @@ public void testConvertRDFStarToReification() { Model referenceModel = RDFStarTestHelper.createRDFReificationModel(); Model reificationModel1 = Models.convertRDFStarToReification(VF, rdfStarModel); - assertTrue("RDF-star conversion to reification with explicit VF, model-to-model", - Models.isomorphic(reificationModel1, referenceModel)); + assertTrue(Models.isomorphic(reificationModel1, referenceModel), + "RDF-star conversion to reification with explicit VF, model-to-model"); Model reificationModel2 = Models.convertRDFStarToReification(rdfStarModel); - assertTrue("RDF-star conversion to reification with implicit VF, model-to-model", - Models.isomorphic(reificationModel2, referenceModel)); + assertTrue(Models.isomorphic(reificationModel2, referenceModel), + "RDF-star conversion to reification with implicit VF, model-to-model"); Model reificationModel3 = new TreeModel(); Models.convertRDFStarToReification(VF, rdfStarModel, (Consumer) reificationModel3::add); - assertTrue("RDF-star conversion to reification with explicit VF, model-to-consumer", - Models.isomorphic(reificationModel3, referenceModel)); + assertTrue(Models.isomorphic(reificationModel3, referenceModel), + "RDF-star conversion to reification with explicit VF, model-to-consumer"); Model reificationModel4 = new TreeModel(); Models.convertRDFStarToReification(rdfStarModel, reificationModel4::add); - assertTrue("RDF-star conversion to reification with explicit VF, model-to-consumer", - Models.isomorphic(reificationModel4, referenceModel)); + assertTrue(Models.isomorphic(reificationModel4, referenceModel), + "RDF-star conversion to reification with explicit VF, model-to-consumer"); } } diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/NamespacesTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/NamespacesTest.java index 5dc2fcb40cc..3e95d627b1f 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/NamespacesTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/NamespacesTest.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.rdf4j.model.util; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collection; import java.util.Collections; @@ -269,7 +269,7 @@ public final void testWrapPut() throws Exception { Map testMap = Namespaces.wrap(testSet); String put1 = testMap.put(testPrefix1, testName1); - assertNull("Should have returned null from put on an empty backing set", put1); + assertNull(put1, "Should have returned null from put on an empty backing set"); assertEquals(1, testSet.size()); assertTrue(testSet.contains(new SimpleNamespace(testPrefix1, testName1))); assertTrue(testMap.containsKey(testPrefix1)); @@ -293,7 +293,7 @@ public final void testWrapPut() throws Exception { assertFalse(testMap.containsValue(testName2)); String put3 = testMap.put(testPrefix1, testName1); - assertNull("Should have returned null from put on an empty backing set", put3); + assertNull(put3, "Should have returned null from put on an empty backing set"); assertEquals(1, testSet.size()); assertTrue(testSet.contains(new SimpleNamespace(testPrefix1, testName1))); assertTrue(testMap.containsKey(testPrefix1)); diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/RDFCollectionsTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/RDFCollectionsTest.java index 8dc4bd940f0..316798af314 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/RDFCollectionsTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/RDFCollectionsTest.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.rdf4j.model.util; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/RDFContainersTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/RDFContainersTest.java index b3db876c6b0..81edfe27dfe 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/RDFContainersTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/RDFContainersTest.java @@ -11,9 +11,9 @@ package org.eclipse.rdf4j.model.util; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/StatementsTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/StatementsTest.java index 53281bd9aab..8b83e70545d 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/StatementsTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/StatementsTest.java @@ -12,10 +12,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.eclipse.rdf4j.model.Model; import org.eclipse.rdf4j.model.Resource; @@ -92,19 +92,19 @@ public void testRDFStarReification() { Model convertedModel1 = new LinkedHashModel(); rdfStarModel.forEach((s) -> Statements.convertRDFStarToReification(s, convertedModel1::add)); - assertTrue("RDF-star conversion to reification with implicit VF", - Models.isomorphic(reifiedModel, convertedModel1)); + assertTrue(Models.isomorphic(reifiedModel, convertedModel1), + "RDF-star conversion to reification with implicit VF"); Model convertedModel2 = new LinkedHashModel(); rdfStarModel.forEach((s) -> Statements.convertRDFStarToReification(vf, s, convertedModel2::add)); - assertTrue("RDF-star conversion to reification with explicit VF", - Models.isomorphic(reifiedModel, convertedModel2)); + assertTrue(Models.isomorphic(reifiedModel, convertedModel2), + "RDF-star conversion to reification with explicit VF"); Model convertedModel3 = new LinkedHashModel(); rdfStarModel.forEach((s) -> Statements.convertRDFStarToReification(vf, (t) -> vf.createBNode(t.stringValue()), s, convertedModel3::add)); - assertTrue("RDF-star conversion to reification with explicit VF and custom BNode mapping", - Models.isomorphic(reifiedModel, convertedModel3)); + assertTrue(Models.isomorphic(reifiedModel, convertedModel3), + "RDF-star conversion to reification with explicit VF and custom BNode mapping"); } @Test @@ -113,8 +113,8 @@ public void testTripleToResourceMapper() { vf.createLiteral("data")); Triple t2 = vf.createTriple(vf.createIRI("http://example.com/1"), vf.createIRI("http://example.com/2"), vf.createLiteral("data")); - assertEquals("Identical triples must produce the same blank node", - Statements.TRIPLE_BNODE_MAPPER.apply(t1), Statements.TRIPLE_BNODE_MAPPER.apply(t2)); + assertEquals(Statements.TRIPLE_BNODE_MAPPER.apply(t1), Statements.TRIPLE_BNODE_MAPPER.apply(t2), + "Identical triples must produce the same blank node"); } @Test diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/URIUtilTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/URIUtilTest.java index f4c0c25507c..e4f9c620c75 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/URIUtilTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/URIUtilTest.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.rdf4j.model.util; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; @@ -48,35 +48,35 @@ public void testIsCorrectURISplit() throws Exception { @Test public void testIsValidURIReference() throws Exception { assertTrue(URIUtil.isValidURIReference("http://example.org/foo/bar/")); - assertTrue("whitespace should be allowed", - URIUtil.isValidURIReference("http://example.org/foo/bar with a lot of space/")); - assertTrue("unwise chars should be allowed", - URIUtil.isValidURIReference("http://example.org/foo/bar/unwise{}")); - assertTrue("query params in single quotes should be allowed", - URIUtil.isValidURIReference("http://example.org/foo/bar?query='blah'")); - assertTrue("query params in double quotes should be allowed", - URIUtil.isValidURIReference("http://example.org/foo/bar?query=\"blah\"&foo=bar")); - assertTrue("short simple urns should be allowed", URIUtil.isValidURIReference("urn:p1")); - assertTrue("Escaped special char should be allowed", - URIUtil.isValidURIReference("http://example.org/foo\\u00ea/bar/")); - assertTrue("fragment identifier should be allowed", - URIUtil.isValidURIReference("http://example.org/foo/bar#fragment1")); - assertTrue("Unescaped special char should be allowed", - URIUtil.isValidURIReference("http://example.org/foo®/bar/")); - assertFalse("control char should not be allowed", - URIUtil.isValidURIReference("http://example.org/foo\u0001/bar/")); - assertFalse("relative uri should fail", URIUtil.isValidURIReference("foo/bar/")); - assertFalse("single column is not a valid uri", URIUtil.isValidURIReference(":")); - assertTrue("reserved char is allowed in non-conflicting spot", - URIUtil.isValidURIReference("http://foo.com/b!ar/")); - assertFalse("reserved char should not be allowed in conflicting spot", - URIUtil.isValidURIReference("http;://foo.com/bar/")); + assertTrue(URIUtil.isValidURIReference("http://example.org/foo/bar with a lot of space/"), + "whitespace should be allowed"); + assertTrue(URIUtil.isValidURIReference("http://example.org/foo/bar/unwise{}"), + "unwise chars should be allowed"); + assertTrue(URIUtil.isValidURIReference("http://example.org/foo/bar?query='blah'"), + "query params in single quotes should be allowed"); + assertTrue(URIUtil.isValidURIReference("http://example.org/foo/bar?query=\"blah\"&foo=bar"), + "query params in double quotes should be allowed"); + assertTrue(URIUtil.isValidURIReference("urn:p1"), "short simple urns should be allowed"); + assertTrue(URIUtil.isValidURIReference("http://example.org/foo\\u00ea/bar/"), + "Escaped special char should be allowed"); + assertTrue(URIUtil.isValidURIReference("http://example.org/foo/bar#fragment1"), + "fragment identifier should be allowed"); + assertTrue(URIUtil.isValidURIReference("http://example.org/foo®/bar/"), + "Unescaped special char should be allowed"); + assertFalse(URIUtil.isValidURIReference("http://example.org/foo\u0001/bar/"), + "control char should not be allowed"); + assertFalse(URIUtil.isValidURIReference("foo/bar/"), "relative uri should fail"); + assertFalse(URIUtil.isValidURIReference(":"), "single column is not a valid uri"); + assertTrue(URIUtil.isValidURIReference("http://foo.com/b!ar/"), + "reserved char is allowed in non-conflicting spot"); + assertFalse(URIUtil.isValidURIReference("http;://foo.com/bar/"), + "reserved char should not be allowed in conflicting spot"); } @Test public void controlCharacterInURI() { - assertFalse("URI containing Unicode control char should be invalid", - URIUtil.isValidURIReference("http://example.org/foo\u001F/bar/")); + assertFalse(URIUtil.isValidURIReference("http://example.org/foo\u001F/bar/"), + "URI containing Unicode control char should be invalid"); } @Test diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/ValuesTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/ValuesTest.java index 0914743a420..d33e4530acf 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/ValuesTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/ValuesTest.java @@ -17,8 +17,8 @@ import static org.eclipse.rdf4j.model.util.Values.literal; import static org.eclipse.rdf4j.model.util.Values.namespace; import static org.eclipse.rdf4j.model.util.Values.triple; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/core/model/src/test/java/org/eclipse/rdf4j/model/util/VocabulariesTest.java b/core/model/src/test/java/org/eclipse/rdf4j/model/util/VocabulariesTest.java index 42bd44cadee..fefd2f73983 100644 --- a/core/model/src/test/java/org/eclipse/rdf4j/model/util/VocabulariesTest.java +++ b/core/model/src/test/java/org/eclipse/rdf4j/model/util/VocabulariesTest.java @@ -11,7 +11,7 @@ package org.eclipse.rdf4j.model.util; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.HashSet;