diff --git a/build.gradle.kts b/build.gradle.kts index 2fb049c24..bc4e0ea73 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,6 @@ +import java.time.LocalDate +import java.time.format.DateTimeFormatter + plugins { // Core Gradle plugins `java-library` // For creating reusable Java libraries @@ -17,9 +20,6 @@ plugins { // SonarQube configuration -import java.time.LocalDate -import java.time.format.DateTimeFormatter - val currentDate: String = LocalDate.now().format(DateTimeFormatter.ISO_DATE) sonar { @@ -125,7 +125,9 @@ dependencies { implementation("com.typesafe:config:1.4.3") // Typesafe config // === For tests === - testImplementation("junit:junit:4.13.2") // Unit testing framework + testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.0") // Use the latest stable version + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.0") // Use the latest stable version + testImplementation("org.junit.vintage:junit-vintage-engine:5.12.0") // Use the latest stable version // === For viewing logs during development (DO NOT include in production) === runtimeOnly("org.slf4j:slf4j-simple:2.0.9") // Simple SLF4J implementation for logging diff --git a/src/test/java/fr/inria/corese/core/compiler/eval/HashTest.java b/src/test/java/fr/inria/corese/core/compiler/eval/HashTest.java index 67876e8ad..8e3f3b535 100644 --- a/src/test/java/fr/inria/corese/core/compiler/eval/HashTest.java +++ b/src/test/java/fr/inria/corese/core/compiler/eval/HashTest.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.compiler.eval; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class HashTest { - @org.junit.Test + @org.junit.jupiter.api.Test public void test1() { Hash hash = new Hash( "abc" ); diff --git a/src/test/java/fr/inria/corese/core/datatype/CoreseDateTest.java b/src/test/java/fr/inria/corese/core/datatype/CoreseDateTest.java index 33fdc013d..6f120a876 100644 --- a/src/test/java/fr/inria/corese/core/datatype/CoreseDateTest.java +++ b/src/test/java/fr/inria/corese/core/datatype/CoreseDateTest.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.datatype; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import javax.xml.datatype.DatatypeConfigurationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.CoreseDate; diff --git a/src/test/java/fr/inria/corese/core/datatype/CoreseDecimalTest.java b/src/test/java/fr/inria/corese/core/datatype/CoreseDecimalTest.java index 7eec1724f..9c06efc51 100644 --- a/src/test/java/fr/inria/corese/core/datatype/CoreseDecimalTest.java +++ b/src/test/java/fr/inria/corese/core/datatype/CoreseDecimalTest.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.datatype; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.math.BigDecimal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.CoreseDecimal; diff --git a/src/test/java/fr/inria/corese/core/engine/TestQuery1.java b/src/test/java/fr/inria/corese/core/engine/TestQuery1.java index 2105471dd..6bca2361b 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestQuery1.java +++ b/src/test/java/fr/inria/corese/core/engine/TestQuery1.java @@ -2,11 +2,9 @@ import static fr.inria.corese.core.util.Property.Value.LOAD_IN_DEFAULT_GRAPH; import static fr.inria.corese.core.util.Property.Value.SPARQL_COMPLIANT; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import java.io.File; -import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; @@ -15,10 +13,10 @@ import javax.xml.parsers.ParserConfigurationException; -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.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import fr.inria.corese.core.Graph; @@ -87,7 +85,7 @@ public class TestQuery1 { private static final String localRDF = data + "rdf.2014.ttl"; private static final String localRDFS = data + "rdfs.2014.ttl"; - @BeforeClass + @BeforeAll static public void init() { // Query.STD_PLAN = Query.PLAN_RULE_BASED; // Property.set(GRAPH_NODE_AS_DATATYPE, true); @@ -118,7 +116,7 @@ static public void init() { // QueryProcess.setVisitorable(true); } - @AfterClass + @AfterAll static public void finish() { // after2(); } @@ -2443,7 +2441,7 @@ public void testBindIndex7() throws EngineException, LoadException { Mappings map = exec.query(q); //// System.out.println(map); - Assert.assertEquals(0, map.size()); + Assertions.assertEquals(0, map.size()); } @Test @@ -2465,8 +2463,7 @@ public void testBindIndex6() throws EngineException, LoadException { + "}"; Mappings map = exec.query(q); - // System.out.println(map); - Assert.assertEquals(1, map.size()); + Assertions.assertEquals(1, map.size()); } @Test @@ -2486,8 +2483,7 @@ public void testBindIndex5() throws EngineException, LoadException { + "}"; Mappings map = exec.query(q); - // System.out.println(map); - Assert.assertEquals(2, getValue(map, "?t").intValue()); + Assertions.assertEquals(2, getValue(map, "?t").intValue()); } @Test @@ -2501,9 +2497,8 @@ public void testBindIndex4() throws EngineException, LoadException { + " where {}"; Mappings map = exec.query(q); - // System.out.println(map); - Assert.assertEquals(true, getValue(map, "?t1").booleanValue()); - Assert.assertEquals(3, getValue(map, "?t2").intValue()); + Assertions.assertEquals(true, getValue(map, "?t1").booleanValue()); + Assertions.assertEquals(3, getValue(map, "?t2").intValue()); } @Test @@ -2525,8 +2520,7 @@ public void testBindIndex3() throws EngineException, LoadException { + "}"; Mappings map = exec.query(q); - // System.out.println(map); - Assert.assertEquals(true, getValue(map, "?t").booleanValue()); + Assertions.assertEquals(true, getValue(map, "?t").booleanValue()); } @Test @@ -2543,8 +2537,7 @@ public void testBindIndex2() throws EngineException, LoadException { + "}"; Mappings map = exec.query(q); - // System.out.println(map); - Assert.assertEquals(false, getValue(map, "?t").booleanValue()); + Assertions.assertEquals(false, getValue(map, "?t").booleanValue()); } @Test @@ -2563,7 +2556,6 @@ public void testBindIndex() throws EngineException, LoadException { + "}"; Mappings map = exec.query(q); - // System.out.println(map); assertEquals(16, getValue(map, "?t").intValue()); } @@ -2583,7 +2575,6 @@ public void testrecfun() throws EngineException { Graph g = createGraph(); QueryProcess exec = QueryProcess.create(g); Mappings map = exec.query(q); - // System.out.println(map.getQuery().getAST()); IDatatype dt = map.getValue("?t"); assertEquals(120, dt.intValue()); } @@ -2752,7 +2743,6 @@ public void testExtFun14() throws EngineException { exec.query(q); Mappings map = exec.query(q2); IDatatype dt = map.getValue("?t"); - // System.out.println(dt); for (IDatatype pair : dt.getValueList()) { assertEquals(true, pair.getValueList().get(0).equals(pair.getValueList().get(1))); } @@ -2808,7 +2798,6 @@ public void testExtFun11() throws EngineException { exec.query(init); Mappings map = exec.query(q); IDatatype dt = map.getValue("?sum"); - // System.out.println(map); assertEquals(1, dt.intValue()); } @@ -3468,7 +3457,7 @@ public void testGenAgg() throws EngineException { QueryProcess exec = QueryProcess.create(g); Mappings map = exec.query(q); IDatatype dt = map.getValue("?y"); - assertEquals("test", dt.doubleValue(), 1.5497, 10e-5); + assertEquals(1.5497, dt.doubleValue(), 10e-5, "test" ); } public void testGenAggOld() throws EngineException { @@ -3484,7 +3473,7 @@ public void testGenAggOld() throws EngineException { QueryProcess exec = QueryProcess.create(g); Mappings map = exec.query(q); IDatatype dt = map.getValue("?y"); - assertEquals("test", dt.doubleValue(), 1.5497, 10e-5); + assertEquals(1.5497, dt.doubleValue(), 10e-5, "test" ); } @Test @@ -5889,7 +5878,7 @@ public void testPPSPIN() throws EngineException, LoadException { Mappings map = exec.query(t1); int size = map.getTemplateResult().getLabel().length(); - assertTrue("Result not big enough: size = " + size, 3000 <= size); + assertTrue(3000 <= size, () -> "Result not big enough: size = " + size); } @@ -5960,10 +5949,9 @@ public void testJoinDistinct() { exec.query(init); Mappings map = exec.query(query); //// System.out.println(map); - assertEquals("Result", 1, map.size()); - + assertTrue(1 <= map.size(), () -> "Result " + map.size()); } catch (EngineException e) { - assertEquals("Result", true, e); + assertEquals(true, e, "Result"); } } @@ -5999,7 +5987,7 @@ public void testLoadJSONLD() throws LoadException { try { Mappings map = exec.query(init); IDatatype dt = map.getValue("?c"); - assertEquals("Result", 18, dt.intValue()); + assertEquals(18, dt.intValue(), "Result"); //// System.out.println(g.display()); } catch (EngineException e) { @@ -6118,7 +6106,7 @@ public void testRDFa() throws LoadException { try { Mappings map = exec.query(init); IDatatype dt = map.getValue("?c"); - assertEquals("Result", 11, dt.intValue()); + assertEquals(11, dt.intValue(), "Result"); } catch (EngineException e) { e.printStackTrace(); @@ -6240,7 +6228,8 @@ public void testLoc2() throws EngineException, LoadException { exec.query(init); Mappings map = exec.query(q); - assertEquals("result", 1, map.size()); + assertEquals(1, map.size(), "result"); + } @Test @@ -6270,8 +6259,7 @@ public void testLoc() throws EngineException, LoadException { exec.query(init); Mappings map = exec.query(q1); - assertEquals("result", 1, map.size()); - + assertEquals(1, map.size(), "result"); String q2 = "select *" + "where {" + "graph kg:system { ?x ?p ?y }" @@ -6280,8 +6268,8 @@ public void testLoc() throws EngineException, LoadException { exec.query(init); map = exec.query(q2); - assertEquals("result", 3, map.size()); + assertEquals(3, map.size(), "result"); } @Test @@ -6298,10 +6286,11 @@ public void testTurtle() throws EngineException { exec.query(init); Mappings map = exec.query(temp); Node node = map.getTemplateResult(); - assertEquals("result", node == null, false); + assertNotNull(node, "result"); + if (node != null) { - assertEquals("result", node.getLabel().contains("John"), true); - assertEquals("result", node.getLabel().contains("Property"), false); + assertTrue(node.getLabel().contains("John"), "result"); + assertFalse(node.getLabel().contains("Property"), "result"); } } @@ -6319,10 +6308,11 @@ public void testTurtle2() throws EngineException { exec.query(init); Mappings map = exec.query(temp); Node node = map.getTemplateResult(); - assertEquals("result", node == null, false); + assertNotNull(node, "result"); + if (node != null) { - assertEquals("result", node.getLabel().contains("John"), true); - assertEquals("result", node.getLabel().contains("Property"), true); + assertTrue(node.getLabel().contains("John"), "result"); + assertTrue(node.getLabel().contains("Property"), "result"); } } @@ -6419,8 +6409,7 @@ public void testSPIN() { Mappings map = exec.query(str); //// System.out.println(map); //// System.out.println(map.getQuery().getAST()); - assertEquals("result", 2, map.size()); - + assertEquals(2, map.size(), "result"); } catch (EngineException ex) { } @@ -6447,8 +6436,7 @@ public void testDistType() { try { e2.query(init); Mappings map = e1.query(query); - //// System.out.println(map); - assertEquals("result", 1, map.size()); + assertEquals(1, map.size(), "result"); } catch (EngineException ex) { } @@ -6456,10 +6444,11 @@ public void testDistType() { // @Test public void testPPLib() { - assertEquals("result", true, test("owl.rul") != null); - assertEquals("result", true, test("spin.rul") != null); - assertEquals("result", true, test("sql.rul") != null); - assertEquals("result", true, test("turtle.rul") != null); + assertNotNull(test("owl.rul"), "result - test(\"owl.rul\") should not return null"); + assertNotNull(test("spin.rul"), "result - test(\"spin.rul\") should not return null"); + assertNotNull(test("sql.rul"), "result - test(\"sql.rul\") should not return null"); + assertNotNull(test("turtle.rul"), "result - test(\"turtle.rul\") should not return null"); + } InputStream test(String pp) { @@ -6519,18 +6508,15 @@ public void testDataset() { sparql.query(init); Mappings map = sparql.sparql(query, ds); - assertEquals("result", 0, map.size()); + assertEquals(0, map.size(), "result"); QueryProcess exec = QueryProcess.create(g); Mappings map2 = exec.query(query, ds); - assertEquals("result", 2, map2.size()); - + assertEquals(2, map2.size(), "result"); map = sparql.sparql(query2, ds); - assertEquals("result", 0, map.size()); - + assertEquals(0, map.size(), "result"); map2 = exec.query(query2, ds); - assertEquals("result", 2, map2.size()); - + assertEquals(2, map2.size(), "result"); } catch (EngineException ex) { //// System.out.println(ex); } @@ -6601,18 +6587,22 @@ public void testValues() { exec.query(init); Mappings map = exec.query(query); //// System.out.println(map); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "result"); map = exec.query(query2); //// System.out.println(map); - assertEquals("Result", 1, map.size()); + assertEquals(1, map.size(), "result"); + map = exec.query(query3); // System.out.println(map); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "result"); } catch (EngineException e) { - assertEquals("Result", 2, e); + e.printStackTrace(); + org.junit.jupiter.api.Assertions.fail("EngineException occurred: " + e.getMessage()); + + } } @@ -6643,10 +6633,11 @@ public void testValues2() { exec.query(init); Mappings map = exec.query(query); //// System.out.println(map); - assertEquals("Result", 3, map.size()); - + assertEquals(3, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", 2, e); + + assertEquals(2, e, "Result"); + } } @@ -6674,8 +6665,7 @@ public void testMath() { //// System.out.println(node.getLabel()); - assertEquals("result", true, node.getLabel().length() > 10); - + assertTrue(node.getLabel().length() > 10, "result"); } catch (EngineException e) { e.printStackTrace(); } @@ -6708,8 +6698,8 @@ public void testGC() { Mappings map = exec.query(query2); IDatatype dt = map.getValue("?t"); - assertEquals("Results", 70, dt.getLabel().length()); + assertEquals(70, dt.getLabel().length(), "Results"); } catch (EngineException e) { e.printStackTrace(); } @@ -6727,9 +6717,9 @@ public void test1() { QueryProcess exec = QueryProcess.create(graph); try { exec.query(query); - assertEquals("Result", true, true); + assertTrue(true, "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -6746,13 +6736,13 @@ public void test2() { try { Mappings map = exec.query(query); IDatatype dt = getValue(map, "?sim"); - assertEquals("Result", true, dt != null); - if (dt != null) { - double sim = dt.doubleValue(); - assertEquals("Result", .84, sim, 1e-2); - } + + assertNotNull(dt, "Result"); + + double sim = dt.doubleValue(); + assertEquals(0.84, sim, 0.01, "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -6769,9 +6759,10 @@ public void test2b() { try { Mappings map = exec.query(query); - assertEquals("Result", 9, map.size()); + assertEquals(9, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -6784,30 +6775,30 @@ public void test2c() { Mappings map = exec.query(query); IDatatype dt = getValue(map, "?sim"); double sim = dt.doubleValue(); - - assertEquals("Result", sim, .16, 1e-2); + assertEquals(0.16, sim, 0.01, "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @Test public void test4() { Load ld = Load.create(Graph.create()); - try { - ld.parse("gogo.rdf"); - assertEquals("Result", false, true); - } catch (LoadException e) { - //// System.out.println(e); - assertEquals("Result", e, e); - } - try { - ld.parse(data + "comma/fail.rdf"); - assertEquals("Result", false, true); - } catch (LoadException e) { - //// System.out.println(e); - assertEquals("Result", e, e); - } + + LoadException e1 = assertThrows(LoadException.class, + () -> ld.parse("gogo.rdf"), + "Result"); + + // Optional: Add assertions about the exception + assertNotNull(e1.getMessage(), "Exception should have a message"); + String filePath = data + "comma/fail.rdf"; + + LoadException e2 = assertThrows(LoadException.class, + () -> ld.parse(filePath), + "Parsing " + filePath + "Result"); + + // Optional: Verify specific message content + assertNotNull(e2.getMessage(), "Exception should have a message"); } @Test @@ -6832,9 +6823,10 @@ public void test5() { exec.query(update); Mappings map = exec.query(query); - assertEquals("Result", 1, map.size()); + assertEquals(1, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -6863,9 +6855,10 @@ public void test6() { exec.query(drop); Mappings map = exec.query(query); - assertEquals("Result", 0, map.size()); + assertEquals(0, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -6896,9 +6889,10 @@ public void test7() { exec.query(create); Mappings map = exec.query(query); - assertEquals("Result", 1, map.size()); + assertEquals(1, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -6917,12 +6911,14 @@ public void test8() { try { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); - assertEquals("Result", 3, map.size()); + + assertEquals(3, map.size(), "Result"); + Mapping m = map.get(0); - assertEquals("Result", 2, m.getMappings().size()); + assertEquals(2, m.getMappings().size(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -6947,10 +6943,10 @@ public void test9() { e2.query("prefix c: " + "insert data { c:name 'John'}"); Mappings map = exec.query(query); - assertEquals("Result", 1, map.size()); + assertEquals(1, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7066,14 +7062,14 @@ public void test111() { exec.query(query); Mappings map = exec.query(query2); - assertEquals("Result", 3, map.size()); + assertEquals(3, map.size(), "Result"); IDatatype dt = getValue(map, "?v"); - assertEquals("Result", 2, dt.intValue()); + assertEquals(2, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7090,10 +7086,10 @@ public void test12() { Mappings map = exec.query(query); QueryProcess.setSort(false); - assertEquals("Result", 22, map.size()); + assertEquals(22, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7109,11 +7105,11 @@ public void test13() { StatListener el = StatListener.create(); exec.addEventListener(el); Mappings map = exec.query(query); - ////// System.out.println(el); - assertEquals("Result", 22, map.size()); + assertEquals(22, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7139,10 +7135,11 @@ public void test14() { QueryProcess exec = QueryProcess.create(g); Mappings map = exec.query(query); - assertEquals("Result", 68, map.size()); + assertEquals(68, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7159,10 +7156,11 @@ public void test15() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); IDatatype dt = getValue(map, "?max"); - assertEquals("Result", 14, dt.intValue()); + + assertEquals(14, dt.intValue(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7181,10 +7179,11 @@ public void test16() { Mappings map = exec.query(query); Mapping m = map.get(map.size() - 1); IDatatype dt = datatype(m.getNode("?num")); - //// System.out.println(map); - assertEquals("Result", map.size(), dt.intValue()); + + assertEquals(dt.intValue(), map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7203,7 +7202,7 @@ public void test17() throws LoadException { Mappings map = exec.query(query); IDatatype dt = getValue(map, "?sim"); - assertEquals("Result", true, dt.doubleValue() < 0.5); + assertTrue(dt.doubleValue() < 0.5, "Result"); String update = "prefix c: " + "insert data {c:Human rdfs:subClassOf c:Person}"; @@ -7214,10 +7213,11 @@ public void test17() throws LoadException { map = exec.query(query); IDatatype sim = getValue(map, "?sim"); - assertEquals("Result", dt, sim); + assertEquals(dt, sim, "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7234,9 +7234,12 @@ public void test18() { try { Mappings map = exec.query(query); - assertEquals("Result", 31, map.size()); + + assertEquals(31, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", 31, e); + fail("Result: " + e.getMessage(), e); + } } @@ -7255,17 +7258,20 @@ public void test19() { try { Mappings map = exec.query(query); - assertEquals("Result", 99, map.size()); + + assertEquals(99, map.size(), "Result"); for (Mapping mm : map) { IDatatype ldt = getValue(mm, "?l"); IDatatype lc = getValue(mm, "?c"); - assertEquals("Result", ldt, lc); + + assertEquals(ldt, lc, "Result"); } } catch (EngineException e) { - assertEquals("Result", 99, e); + fail("Result: " + e.getMessage(), e); + } } @@ -7291,7 +7297,7 @@ public void test20() { try { Mappings map = exec.query(query); - assertEquals("Result", 23, map.size()); + assertEquals(23, map.size(), "Result"); for (Mapping mm : map) { IDatatype dt1 = getValue(mm, "?fn"); @@ -7302,7 +7308,8 @@ public void test20() { } } catch (EngineException e) { - assertEquals("Result", 23, e); + fail("Result: " + e.getMessage(), e); + } } @@ -7321,10 +7328,11 @@ public void test21() { try { Mappings map = exec.query(query); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", 2, e); + fail("Result: " + e.getMessage(), e); + } } @@ -7344,10 +7352,11 @@ public void test22() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); getValue(map, "?max"); - assertEquals("Result", 64, map.size()); + assertEquals(64, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); + } } @@ -7367,10 +7376,12 @@ public void test23() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); getValue(map, "?max"); - assertEquals("Result", 17, map.size()); + assertEquals(17, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); + + } } @@ -7390,10 +7401,11 @@ public void test24() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); getValue(map, "?max"); - assertEquals("Result", 17, map.size()); + assertEquals(17, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7413,10 +7425,11 @@ public void test25() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); getValue(map, "?max"); - assertEquals("Result", 0, map.size()); + assertEquals(0, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7436,10 +7449,11 @@ public void test26() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); getValue(map, "?max"); - assertEquals("Result", 17, map.size()); + assertEquals(17, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7458,10 +7472,11 @@ public void test27() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); - assertEquals("Result", 17, map.size()); + assertEquals(17, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7481,10 +7496,11 @@ public void test28() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); - assertEquals("Result", 119, map.size()); + assertEquals(119, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7504,10 +7520,10 @@ public void test30() { QueryProcess exec = QueryProcess.create(graph); Mappings map = exec.query(query); IDatatype dt = getValue(map, "?max"); - assertEquals("Result", 13, dt.intValue()); + assertEquals(13, dt.intValue(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7527,12 +7543,12 @@ public void test31() { IDatatype dt2 = getValue(map, "?c2"); IDatatype dt3 = getValue(map, "?c3"); - assertEquals("Result", 1406, dt1.intValue()); - assertEquals("Result", 1367, dt2.intValue()); - assertEquals("Result", 1367, dt3.intValue()); + assertEquals(1406, dt1.size(), "Result"); + assertEquals(1367, dt2.size(), "Result"); + assertEquals(1367, dt3.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7556,11 +7572,11 @@ public void test33() { exec.query(update); Mappings map = exec.query(query); - //// System.out.println(map); - assertEquals("Result", 3, map.size()); + assertEquals(3, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7584,11 +7600,11 @@ public void test34() { exec.query(update); Mappings map = exec.query(query); - //// System.out.println(map); - assertEquals("Result", 3, map.size()); + assertEquals(3, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7613,11 +7629,11 @@ public void test35() { exec.query(update); Mappings map = exec.query(query); - //// System.out.println(map); - assertEquals("Result", 3, map.size()); + assertEquals(3, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); } } @@ -7642,11 +7658,13 @@ public void test36() { exec.query(update); Mappings map = exec.query(query); - ////// System.out.println(map); - assertEquals("Result", 0, map.size()); + + assertEquals(0, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); + } } @@ -7663,23 +7681,21 @@ public void test37() { g.init(); // RDFFormat f = RDFFormat.create(g); - // ////System.out.println(f); - assertEquals("Result", 3, g.size()); + assertEquals(3, g.size(), "Result"); String query = "select * where {?p rdf:type rdf:Property}"; Mappings res = exec.query(query); - // ////System.out.println("** Res: " ); - // ////System.out.println(res); - assertEquals("Result", 2, res.size()); + + assertEquals(2, res.size(), "Result"); String update = "delete {?x ?p ?y} where {?x ?p ?y}"; exec.query(update); String qq = "select * where {?x ?p ?y}"; res = exec.query(qq); - assertEquals("Result", 0, res.size()); + assertEquals(0, res.size(), "Result"); } catch (EngineException e) { e.printStackTrace(); @@ -7705,8 +7721,10 @@ public void test38() { try { exec.query(init); Mappings res = exec.query(query); - assertEquals("Result", 1, res.size()); - assertEquals("Result", 30, getValue(res, "?s").intValue()); + assertEquals(1, res.size(), "Result"); + + assertEquals(30, getValue(res, "?s").intValue(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -7738,11 +7756,12 @@ public void test39() { try { exec.query(init); Mappings res = exec.query(query); - assertEquals("Result", 2, res.size()); + assertEquals(2, res.size(), "Result"); exec.setPathLoop(false); res = exec.query(query); - assertEquals("Result", 2, res.size()); + assertEquals(2, res.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -7774,7 +7793,8 @@ public void test41() { try { exec.query(init); Mappings map = exec.query(query); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -7806,7 +7826,8 @@ public void test42() { try { exec.query(init); Mappings map = exec.query(query); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -7839,7 +7860,8 @@ public void test43() { try { exec.query(init); Mappings map = exec.query(query); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -7885,8 +7907,8 @@ public void test47() { try { Mappings map = exec.query(init); map = exec.query(query); - // System.out.println(map); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -7937,12 +7959,13 @@ public void test49() { map = exec.query(query); // System.out.println(map); ResultFormat.create(map); - // System.out.println(f); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); - assertEquals("Result", 2, null); + fail("Result: " + e.getMessage(), e); + } } @@ -7967,8 +7990,8 @@ public void test50() { try { Mappings map = exec.query(init); map = exec.query(query); - //// System.out.println(map); - assertEquals("Result", 3, map.size()); + assertEquals(3, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -7996,7 +8019,8 @@ public void test51() { try { Mappings map = exec.query(init); map = exec.query(query); - assertEquals("Result", 3, map.size()); + assertEquals(3, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -8027,7 +8051,8 @@ public void test52() { try { Mappings map = exec.query(init); map = exec.query(query); - assertEquals("Result", 2, map.size()); + assertEquals(2, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -8047,12 +8072,13 @@ public void test53() { QueryProcess exec = QueryProcess.create(graph); try { Mappings map = exec.query(query); - //// System.out.println(map); - assertEquals("Result", 7, map.size()); + assertEquals(7, map.size(), "Result"); + } catch (EngineException e) { - assertEquals("Result", true, e); + fail("Result: " + e.getMessage(), e); + } } @@ -8078,12 +8104,12 @@ public void test54() { try { Mappings map = exec.query(query); - //// System.out.println(map); + assertEquals(1, map.size(), "Result"); - assertEquals("Result", 1, map.size()); - } catch (EngineException ee) { - assertEquals("Result", true, ee); + } catch (EngineException e) { + fail("Result: " + e.getMessage(), e); + } } @@ -8140,8 +8166,8 @@ public void test55() { // exec.query(o2); Mappings map = exec.query(query); - assertEquals("Result", 2, map.size()); - //// System.out.println(map); + assertEquals(2, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -8167,7 +8193,8 @@ public void test56() { try { exec.query(init); Mappings map = exec.query(query); - assertEquals("Result", 3, map.size()); + assertEquals(3, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -8195,7 +8222,8 @@ public void test58() { Mappings map = exec.query(init); map = exec.query(query); ResultFormat.create(map); - assertEquals("Result", 3, map.size()); + assertEquals(3, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -8226,9 +8254,8 @@ public void test59() { XMLResult xml = XMLResult.create(exec.getProducer()); xml.parseString(f.toString()); - //// System.out.println(m); + assertEquals(5, map.size(), "Result"); - assertEquals("Result", 5, map.size()); } catch (EngineException e) { e.printStackTrace(); @@ -8298,8 +8325,8 @@ public void test63() { try { Mappings map = exec.query(init); map = exec.query(query); - //// System.out.println(map); - assertEquals("Result", 5, map.size()); + assertEquals(5, map.size(), "Result"); + IDatatype dt0 = map.get(0).getNode("?x").getValue(); IDatatype dt1 = map.get(1).getNode("?x").getValue(); @@ -8377,8 +8404,9 @@ public void test65() { try { Mappings map = exec.query(query); - //// System.out.println(map); - assertEquals("Result", 4, map.size()); + + assertEquals(4, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -8415,8 +8443,9 @@ public void testRelax() { try { exec.query(init); Mappings map = exec.query(query); - //// System.out.println(map); - assertEquals("Result", 2, map.size()); + + assertEquals(2, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -8450,9 +8479,9 @@ public void testOption() { exec.query(init); Mappings map = exec.query(query); - // System.out.println(map); - assertEquals("Results", 9, map.size()); + assertEquals(9, map.size(), "Result"); + } catch (EngineException e) { e.printStackTrace(); @@ -8489,14 +8518,12 @@ public void testWF() { ////// System.out.println("query"); Mappings map = exec.query(query); - // ////System.out.println(map); - // - // System.out.println("*****************"); - // System.out.println(map); - assertEquals("Result", 2, map.size()); + + assertEquals(2, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", true, false); + fail("Result: " + e.getMessage(), e); + } } @@ -8523,8 +8550,9 @@ public void testCompile() throws EngineException { Mappings map = exec.query(query); Query q = map.getQuery(); System.out.println(q); - // System.out.println("NB Procesor: " + Processor.count); - assertEquals("Result", 17, q.nbNodes()); + + assertEquals(17, q.nbNodes(), "Result"); + } IDatatype getValue(Mapping map, String name) { diff --git a/src/test/java/fr/inria/corese/core/engine/TestQuery2.java b/src/test/java/fr/inria/corese/core/engine/TestQuery2.java index e33d6ff37..e0d5ebb47 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestQuery2.java +++ b/src/test/java/fr/inria/corese/core/engine/TestQuery2.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.engine; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import fr.inria.corese.core.Graph; import fr.inria.corese.core.query.QueryProcess; diff --git a/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java b/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java index 50fbf7fca..631232e6f 100644 --- a/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java +++ b/src/test/java/fr/inria/corese/core/engine/TestRuleEngine.java @@ -1,16 +1,15 @@ package fr.inria.corese.core.engine; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.util.Date; -import org.junit.AfterClass; -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 fr.inria.corese.core.compiler.eval.QuerySolver; -import fr.inria.corese.core.EdgeFactory; import fr.inria.corese.core.Graph; import fr.inria.corese.core.GraphStore; import fr.inria.corese.core.api.Engine; @@ -36,7 +35,7 @@ public class TestRuleEngine { static Engine rengine; static RuleEngine fengine; - @BeforeClass + @BeforeAll public static void init() throws EngineException { QuerySolver.definePrefix("c", "http://www.inria.fr/acacia/comma#"); @@ -59,7 +58,7 @@ public static void init() throws EngineException { QueryProcess.create(graph); } - @AfterClass + @AfterAll static public void finish() { } @@ -124,8 +123,7 @@ public void test57() { re.process(); Mappings map = exec.query(query); - assertEquals("Result", 1, map.size()); - + assertEquals(1, map.size(), "Result"); } catch (EngineException e) { e.printStackTrace(); } @@ -410,9 +408,9 @@ public void test4() throws EngineException { Mappings map; try { map = exec.query(query); - assertEquals("Result", 4, map.size()); + assertEquals(4, map.size(), "Result"); } catch (EngineException e) { - assertEquals("Result", 4, e); + assertEquals("Result", e.getMessage()); } } @@ -431,13 +429,11 @@ public void test44() throws EngineException { Mappings map; try { map = exec.query(query); - assertEquals("Result", 4, map.size()); - + assertEquals(4, map.size(), "Result"); map = exec.query(ent); - // System.out.println(map); } catch (EngineException e) { - assertEquals("Result", 4, e); + assertEquals("Result", e.getMessage()); } } @@ -452,7 +448,8 @@ public void test8() throws EngineException { qe.process(); - assertEquals("Result", 1, g.size()); + assertEquals(1, g.size(), "Result"); + } @Test @@ -471,13 +468,11 @@ public void testWF() { Mappings map; try { map = exec.query(query); - assertEquals("Result", 4, map.size()); - + assertEquals(4, map.size(), "Result"); map = exec.query(ent); - // System.out.println(map); } catch (EngineException e) { - assertEquals("Result", 4, e); + assertEquals("Result", e.getMessage()); } } diff --git a/src/test/java/fr/inria/corese/core/load/OwlImportTest.java b/src/test/java/fr/inria/corese/core/load/OwlImportTest.java index 5b4fa7789..a27405173 100644 --- a/src/test/java/fr/inria/corese/core/load/OwlImportTest.java +++ b/src/test/java/fr/inria/corese/core/load/OwlImportTest.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.load; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import fr.inria.corese.core.Graph; import fr.inria.corese.core.util.Property; @@ -19,7 +19,7 @@ public class OwlImportTest { private static final String RESOURCE_FOLDER = OwlImportTest.class.getResource("/data-test/owl_imports/").getPath(); - @Before + @BeforeEach public void setUp() { // Ensure OWL auto-import is disabled before starting tests Property.set(Value.OWL_AUTO_IMPORT, false); diff --git a/src/test/java/fr/inria/corese/core/load/ServiceTest.java b/src/test/java/fr/inria/corese/core/load/ServiceTest.java index 666a6d7cf..afeaf3442 100644 --- a/src/test/java/fr/inria/corese/core/load/ServiceTest.java +++ b/src/test/java/fr/inria/corese/core/load/ServiceTest.java @@ -3,17 +3,17 @@ import fr.inria.corese.core.kgram.core.Mappings; import fr.inria.corese.core.sparql.exceptions.EngineException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ServiceTest { private final Logger logger = LoggerFactory.getLogger(ServiceTest.class); private Service service; - @Before + @BeforeEach public void setUp() { service = new Service("https://dbpedia.org/sparql"); } diff --git a/src/test/java/fr/inria/corese/core/next/api/IRITest.java b/src/test/java/fr/inria/corese/core/next/api/IRITest.java index ffe126704..375fba1df 100644 --- a/src/test/java/fr/inria/corese/core/next/api/IRITest.java +++ b/src/test/java/fr/inria/corese/core/next/api/IRITest.java @@ -1,10 +1,10 @@ package fr.inria.corese.core.next.api; import fr.inria.corese.core.next.api.IRI; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class IRITest { diff --git a/src/test/java/fr/inria/corese/core/next/api/ValueFactoryTest.java b/src/test/java/fr/inria/corese/core/next/api/ValueFactoryTest.java index 7b50d645d..40fa3b633 100644 --- a/src/test/java/fr/inria/corese/core/next/api/ValueFactoryTest.java +++ b/src/test/java/fr/inria/corese/core/next/api/ValueFactoryTest.java @@ -3,8 +3,8 @@ import fr.inria.corese.core.next.impl.common.BasicIRI; import fr.inria.corese.core.next.impl.common.literal.XSD; import fr.inria.corese.core.next.impl.exception.IncorrectFormatException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; @@ -20,13 +20,13 @@ import java.time.temporal.TemporalAccessor; import java.util.Date; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class ValueFactoryTest { protected ValueFactory valueFactory; - @Before + @BeforeEach public abstract void setUp(); @Test diff --git a/src/test/java/fr/inria/corese/core/next/api/model/ValueFactoryTest.java b/src/test/java/fr/inria/corese/core/next/api/model/ValueFactoryTest.java index 79fa4ab3d..511eb82d6 100644 --- a/src/test/java/fr/inria/corese/core/next/api/model/ValueFactoryTest.java +++ b/src/test/java/fr/inria/corese/core/next/api/model/ValueFactoryTest.java @@ -5,8 +5,8 @@ import fr.inria.corese.core.next.impl.common.BasicIRI; import fr.inria.corese.core.next.impl.common.literal.XSD; import fr.inria.corese.core.next.impl.exception.IncorrectFormatException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; @@ -20,13 +20,13 @@ import java.time.temporal.TemporalAccessor; import java.util.Date; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class ValueFactoryTest { protected ValueFactory valueFactory; - @Before + @BeforeEach public abstract void setUp(); @Test diff --git a/src/test/java/fr/inria/corese/core/next/api/model/base/CoreDatatypeHelperTest.java b/src/test/java/fr/inria/corese/core/next/api/model/base/CoreDatatypeHelperTest.java index 4b045ae9d..8ca0628fd 100644 --- a/src/test/java/fr/inria/corese/core/next/api/model/base/CoreDatatypeHelperTest.java +++ b/src/test/java/fr/inria/corese/core/next/api/model/base/CoreDatatypeHelperTest.java @@ -6,9 +6,9 @@ import fr.inria.corese.core.next.impl.common.util.literal.CoreDatatypeHelper; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.impl.common.BasicIRI; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CoreDatatypeHelperTest { diff --git a/src/test/java/fr/inria/corese/core/next/impl/common/BasicIRITest.java b/src/test/java/fr/inria/corese/core/next/impl/common/BasicIRITest.java index 16102411c..e05833368 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/common/BasicIRITest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/common/BasicIRITest.java @@ -3,8 +3,8 @@ import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.api.IRITest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BasicIRITest extends IRITest { @Override diff --git a/src/test/java/fr/inria/corese/core/next/impl/common/literal/BasicDurationTest.java b/src/test/java/fr/inria/corese/core/next/impl/common/literal/BasicDurationTest.java index ac29f504f..2149617b4 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/common/literal/BasicDurationTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/common/literal/BasicDurationTest.java @@ -2,7 +2,7 @@ import fr.inria.corese.core.next.impl.exception.IncorrectFormatException; import fr.inria.corese.core.next.impl.exception.IncorrectOperationException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +11,7 @@ import java.time.Period; import java.util.Optional; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BasicDurationTest { diff --git a/src/test/java/fr/inria/corese/core/next/impl/common/util/IRIUtilsTest.java b/src/test/java/fr/inria/corese/core/next/impl/common/util/IRIUtilsTest.java index fc8676473..6782aa497 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/common/util/IRIUtilsTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/common/util/IRIUtilsTest.java @@ -1,9 +1,9 @@ package fr.inria.corese.core.next.impl.common.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class IRIUtilsTest { private static final Logger logger = org.slf4j.LoggerFactory.getLogger(IRIUtilsTest.class); diff --git a/src/test/java/fr/inria/corese/core/next/impl/config/CoreConfigTest.java b/src/test/java/fr/inria/corese/core/next/impl/config/CoreConfigTest.java index 61ea52e52..1f2f12985 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/config/CoreConfigTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/config/CoreConfigTest.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.next.impl.config; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; public class CoreConfigTest { @Test public void instantiationTest(){ - Assert.assertEquals("INFO", CoreConfig.getInstance().getLogLevel()); + assertEquals("INFO", CoreConfig.getInstance().getLogLevel()); } } diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseAdaptedValueFactoryTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseAdaptedValueFactoryTest.java index a8461a7ad..00f0a4298 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseAdaptedValueFactoryTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseAdaptedValueFactoryTest.java @@ -9,12 +9,12 @@ import fr.inria.corese.core.next.impl.temp.CoreseAdaptedValueFactory; import fr.inria.corese.core.next.impl.temp.literal.CoreseLanguageTaggedStringLiteral; import fr.inria.corese.core.next.impl.temp.literal.CoreseTyped; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.time.Duration; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CoreseAdaptedValueFactoryTest extends ValueFactoryTest { @@ -25,7 +25,7 @@ public class CoreseAdaptedValueFactoryTest extends ValueFactoryTest { private IRI predicate; private Resource context; - @Before + @BeforeEach @Override public void setUp() { this.valueFactory = new CoreseAdaptedValueFactory(); diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseIRITest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseIRITest.java index aa0087b11..3ccb7745b 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseIRITest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/CoreseIRITest.java @@ -4,10 +4,10 @@ import fr.inria.corese.core.next.impl.exception.IncorrectFormatException; import fr.inria.corese.core.next.api.IRI; import fr.inria.corese.core.next.impl.temp.CoreseIRI; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class CoreseIRITest extends IRITest { diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumberTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumberTest.java index d240b40b5..c8e3cca0e 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumberTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/AbstractCoreseNumberTest.java @@ -1,11 +1,11 @@ package fr.inria.corese.core.next.impl.temp.literal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.BigInteger; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class AbstractCoreseNumberTest { diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBooleanTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBooleanTest.java index 6ae4a57c2..7f28c38c1 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBooleanTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseBooleanTest.java @@ -2,9 +2,9 @@ import fr.inria.corese.core.next.impl.common.literal.XSD; import fr.inria.corese.core.sparql.api.IDatatype; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CoreseBooleanTest { diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDateTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDateTest.java index 5dd2bed80..34c6a1fb4 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDateTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDateTest.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.next.impl.temp.literal; import fr.inria.corese.core.next.impl.common.literal.XSD; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class CoreseDateTest { diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetimeTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetimeTest.java index 69ac9d82a..e7860bc0b 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetimeTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDatetimeTest.java @@ -1,12 +1,12 @@ package fr.inria.corese.core.next.impl.temp.literal; import fr.inria.corese.core.next.impl.common.literal.XSD; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class CoreseDatetimeTest { diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDecimalTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDecimalTest.java index 1c4997ef0..22f14385b 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDecimalTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseDecimalTest.java @@ -2,11 +2,11 @@ import fr.inria.corese.core.next.impl.common.literal.XSD; import fr.inria.corese.core.sparql.datatype.CoreseNumber; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CoreseDecimalTest extends AbstractCoreseNumberTest { @Override diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseIntegerTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseIntegerTest.java index 30caa886a..8e2f4e2d1 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseIntegerTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseIntegerTest.java @@ -2,12 +2,12 @@ import fr.inria.corese.core.next.impl.common.literal.XSD; import fr.inria.corese.core.sparql.datatype.CoreseNumber; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.BigInteger; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CoreseIntegerTest extends AbstractCoreseNumberTest { diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringTest.java index 4e8976ee6..a53605803 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseLanguageTaggedStringTest.java @@ -3,16 +3,16 @@ import fr.inria.corese.core.next.impl.common.literal.RDF; import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.CoreseLiteral; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; public class CoreseLanguageTaggedStringTest { private String testValue; private String testLanguage; - @Before + @BeforeEach public void setUp() { testValue = "Hello"; testLanguage = "en"; diff --git a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTypeTest.java b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTypeTest.java index bf62d4d10..24dba5a3a 100644 --- a/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTypeTest.java +++ b/src/test/java/fr/inria/corese/core/next/impl/temp/literal/CoreseTypeTest.java @@ -9,17 +9,17 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.datatype.CoreseLiteral; import fr.inria.corese.core.sparql.datatype.CoreseString; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CoreseTypeTest { private String testValue; private IRI testDatatypeIRI; private CoreDatatype testCoreDatatype; - @Before + @BeforeEach public void setUp() { testValue = "Test String"; testDatatypeIRI = XSD.STRING.getIRI(); diff --git a/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java b/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java index edd1d4ed2..665d3c407 100644 --- a/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java +++ b/src/test/java/fr/inria/corese/core/sparql/EmptyResultFormatTest.java @@ -1,8 +1,8 @@ package fr.inria.corese.core.sparql; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import fr.inria.corese.core.Graph; import fr.inria.corese.core.kgram.core.Mappings; diff --git a/src/test/java/fr/inria/corese/sparql/ParsingTest.java b/src/test/java/fr/inria/corese/sparql/ParsingTest.java index a1e5a2d7b..4c15016d5 100644 --- a/src/test/java/fr/inria/corese/sparql/ParsingTest.java +++ b/src/test/java/fr/inria/corese/sparql/ParsingTest.java @@ -8,12 +8,11 @@ import fr.inria.corese.core.sparql.exceptions.QuerySyntaxException; import fr.inria.corese.core.sparql.triple.parser.ASTQuery; import fr.inria.corese.core.sparql.triple.parser.ParserSparql1; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @@ -24,19 +23,19 @@ public class ParsingTest { public ParsingTest() { } - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { } - @AfterClass + @AfterAll public static void tearDownClass() throws Exception { } - @Before + @BeforeEach public void setUp() { } - @After + @AfterEach public void tearDown() { } // TODO add test methods here. diff --git a/src/test/java/fr/inria/corese/test/MyTest.java b/src/test/java/fr/inria/corese/test/MyTest.java index fc7f74eb7..763eb51af 100644 --- a/src/test/java/fr/inria/corese/test/MyTest.java +++ b/src/test/java/fr/inria/corese/test/MyTest.java @@ -8,7 +8,7 @@ import fr.inria.corese.core.sparql.api.IDatatype; import fr.inria.corese.core.sparql.exceptions.EngineException; import java.util.Date; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** *