Port all tests to Junit 5.

Author: ghsnd

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Require Java 11+
+- Port all tests to Junit 5
 
 ### Fixed
 - Dropped dependency on Guava

README.md

@@ -155,26 +155,6 @@ which contain the necessary credentials to access the Web API.
 An example can be found in the test cases 
 [src/test/resources/web-of-things](src/test/resources/web-of-things).
 
-#### Accessing Oracle Database
-
-You need to add the Oracle JDBC driver manually to the class path
-if you want to access an Oracle Database.
-The required driver is `ojdbc8`.
-
-- Download `ojdbc8.jar` from [Oracle](https://www.oracle.com/database/technologies/jdbc-ucp-122-downloads.html).
-- Execute the RMLMapper via 
-
-```
-java -cp 'rmlmapper.jar:ojdbc8-12.2.0.1.jar' be.ugent.rml.cli.Main -m rules.rml.ttl
-```
-
-The options do the following:
-
-- `-cp 'rmlmapper.jar:ojdbc8-12.2.0.1.jar'`: Put the jar of the RMLMapper and JDBC driver in the classpath.
-- `be.ugent.rml.cli.Main`: `be.ugent.rml.cli.Main` is the entry point of the RMLMapper.
-- `-m rules.rml.ttl`: Use the RML rules in the file `rules.rml`.ttl.
-The exact same options as the ones mentioned earlier are supported.
-
 ### Library
 
 An example of how you can use the RMLMapper as an external library can be found
@@ -199,9 +179,10 @@ The RMLMapper is executed in the `/data` folder in the Docker container.
 
 ### Including functions
 
-There are two ways to include (new) functions within the RML Mapper
+There are three ways to include (new) functions within the RML Mapper
   * dynamic loading: you add links to java files or jar files, and those files are loaded dynamically at runtime
   * preloading: you register functionality via code, and you need to rebuild the mapper to use that functionality
+  * add as dependency
 
 Registration of functions is done using a Turtle file, which you can find in `src/main/resources/functions.ttl`
 
@@ -253,6 +234,14 @@ This overrides the dynamic loading.
 An example of how you can use Preload a custom function can be found
 at [./src/test/java/be/ugent/rml/readme/ReadmeFunctionTest.java](https://github.com/RMLio/rmlmapper-java/blob/master/src/test/java/be/ugent/rml/readme/ReadmeFunctionTest.java)
 
+#### Adding as dependency
+
+This is most interesting if you use RMLMapper as a library in your own project.
+Just add the dependency to the function library you want to use in your project.
+
+You can also add a function library as a Maven dependency in `pom.xml` or RMLMapper.
+You'll have to rebuild RMLMapper to use it.
+
 ### Generating metadata
 
 Conform to how it is described in the scientific paper [1],

pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <junit.version>5.8.2</junit.version>
+        <junit.version>5.8.2</junit.version> <!-- testcontainers can't handle > 5.8 yet -->
         <maven.compiler.source>10</maven.compiler.source>
         <maven.compiler.target>10</maven.compiler.target>
         <jackson.version>2.14.0</jackson.version>
@@ -272,6 +272,10 @@
                     <groupId>org.apache.jena</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -342,13 +346,8 @@
             <version>1.0-1</version>
             <scope>test</scope>
         </dependency>
+
         <!--< testcontainer dependencies > -->
-        <dependency>
-            <groupId>org.testcontainers</groupId>  <!-- for running tests with dockerized databases -->
-            <artifactId>testcontainers</artifactId>
-            <version>${testcontainers.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>postgresql</artifactId>
@@ -373,7 +372,20 @@
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>jdbc</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
         <!-- < testcontainer dependencies /> -->
+
         <!-- For easy parsing and execution of SQL files -->
         <dependency>
             <groupId>org.mybatis</groupId>

…st/java/be/ugent/rml/Arguments_Test.java …est/java/be/ugent/rml/ArgumentsTest.javasrc/test/java/be/ugent/rml/Arguments_Test.java renamed to src/test/java/be/ugent/rml/ArgumentsTest.java src/test/java/be/ugent/rml/Arguments_Test.java renamed to src/test/java/be/ugent/rml/ArgumentsTest.java

@@ -1,7 +1,7 @@
 package be.ugent.rml;
 
 import be.ugent.rml.cli.Main;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.rdfhdt.hdt.hdt.HDT;
 import org.rdfhdt.hdt.hdt.HDTManager;
 import org.rdfhdt.hdt.triples.IteratorTripleID;
@@ -16,11 +16,9 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class Arguments_Test extends TestCore {
+public class ArgumentsTest extends TestCore {
 
     @Test
     public void withConfigFile() throws Exception {
@@ -31,9 +29,8 @@ public void withConfigFile() throws Exception {
                 false
         );
 
-        File outputFile = null;
         try {
-            outputFile = Utils.getFile("./generated_output.nq");
+            File outputFile = Utils.getFile("./generated_output.nq");
             assertTrue(outputFile.delete());
         } catch (Exception e) {
             e.printStackTrace();
@@ -91,10 +88,8 @@ public void withoutConfigFileWindowsSlashes() throws Exception {
     }
 
     @Test
-    public void nonexistingMappingFile() throws Exception {
-        assertThrows(IllegalArgumentException.class, () -> {
-            Main.run("-m ./argument-config-file-test-cases/I_DONT_EXIST.ttl -o ./generated_output.nq".split(" "));
-        });
+    public void nonexistingMappingFile() {
+        assertThrows(IllegalArgumentException.class, () -> Main.run("-m ./argument-config-file-test-cases/I_DONT_EXIST.ttl -o ./generated_output.nq".split(" ")));
     }
 
     @Test
@@ -119,9 +114,8 @@ public void mappingFileAndRawMappingString() throws Exception {
                 false
         );
 
-        File outputFile = null;
         try {
-            outputFile = Utils.getFile("./generated_output.nq");
+            File outputFile = Utils.getFile("./generated_output.nq");
             assertTrue(outputFile.delete());
         } catch (Exception e) {
             e.printStackTrace();
@@ -139,9 +133,8 @@ public void multipleMappingFiles() throws Exception {
                 false
         );
 
-        File outputFile = null;
         try {
-            outputFile = Utils.getFile("./generated_output.nq");
+            File outputFile = Utils.getFile("./generated_output.nq");
             assertTrue(outputFile.delete());
         } catch (Exception e) {
             e.printStackTrace();
@@ -174,9 +167,9 @@ public void testStdOut() throws Exception {
             System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));   // reset to original System.out
         }
 
-        assertThat(stdout.toString(StandardCharsets.UTF_8.name()), containsString("<http://example.com/10> <http://xmlns.com/foaf/0.1/name> \"Venus\\\"\"."));
-        assertThat(stdout.toString(StandardCharsets.UTF_8.name()), containsString("<http://example.com/10> <http://example.com/id> \"10\"."));
-        assertThat(stdout.toString(StandardCharsets.UTF_8.name()), containsString("<http://example.com/10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>."));
+        assertThat(stdout.toString(StandardCharsets.UTF_8), containsString("<http://example.com/10> <http://xmlns.com/foaf/0.1/name> \"Venus\\\"\"."));
+        assertThat(stdout.toString(StandardCharsets.UTF_8), containsString("<http://example.com/10> <http://example.com/id> \"10\"."));
+        assertThat(stdout.toString(StandardCharsets.UTF_8), containsString("<http://example.com/10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>."));
     }
 
 
@@ -190,7 +183,7 @@ public void testVerboseWithoutCustomFunctionFile() throws Exception {
         } finally {
             System.setErr(new PrintStream(new FileOutputStream(FileDescriptor.err)));   // reset to original System.err
         }
-        assertThat(stdout.toString(StandardCharsets.UTF_8.name()), not(containsString("Using custom path to functions.ttl file: ")));
+        assertThat(stdout.toString(StandardCharsets.UTF_8), not(containsString("Using custom path to functions.ttl file: ")));
     }
 
     @Test
@@ -202,7 +195,7 @@ public void testWithCustomFunctionFile()  throws Exception {
         } finally {
             System.setErr(new PrintStream(new FileOutputStream(FileDescriptor.err)));   // reset to original System.err
         }
-        assertThat(stdout.toString(StandardCharsets.UTF_8.name()), not(containsString("Using custom path to functions.ttl file: ")));
+        assertThat(stdout.toString(StandardCharsets.UTF_8), not(containsString("Using custom path to functions.ttl file: ")));
     }
 
     @Test
@@ -219,9 +212,8 @@ public void testWithCustomFunctionFileInternalFunctionsStillWork() throws Except
                 false
         );
 
-        File outputFile = null;
         try {
-            outputFile = Utils.getFile(actualOutPath);
+            File outputFile = Utils.getFile(actualOutPath);
             assertTrue(outputFile.delete());
         } catch (Exception e) {
             e.printStackTrace();
@@ -244,7 +236,7 @@ public void testWithCustomFunctionFileVerboseFunctionLogging() throws Exception
                     actualOutPath,
                     false
             );
-            assertThat(stdout.toString(StandardCharsets.UTF_8.name()), containsString("Loading function descriptions"));
+            assertThat(stdout.toString(StandardCharsets.UTF_8), containsString("Loading function descriptions"));
 
             try {
                 File outputFile = Utils.getFile(actualOutPath);
@@ -275,7 +267,7 @@ public void outputTurtle() throws Exception {
 
         try {
             byte[] encoded = Files.readAllBytes(Paths.get(actualTrigPath));
-            String content = new String(encoded, "utf-8");
+            String content = new String(encoded, StandardCharsets.UTF_8);
 
             assertTrue(content.contains("@prefix foaf: <http://xmlns.com/foaf/0.1/> ."));
         } catch (IOException e) {
@@ -380,7 +372,7 @@ public void outputHDT() throws Exception {
                 TripleID tripleID1 = iteratorTripleID1.next();
                 TripleID tripleID2 = iteratorTripleID2.next();
 
-                assertTrue(tripleID1.equals(tripleID2));
+                assertEquals(tripleID1, tripleID2);
             }
         } finally {
             assertTrue((new File(actualHDTPath)).delete());
@@ -491,9 +483,8 @@ public void pipeAndMapping() throws Exception {
     }
 
     @Test
-    public void wrongOutPutFile() throws Exception{
-        assertThrows(IllegalArgumentException.class, () -> {
-            Main.run("-m ./argument-config-file-test-cases/mapping.ttl -o ./wrong/file/output/generated_output.nq".split(" "));
-        });
+    public void wrongOutPutFile() {
+        assertThrows(IllegalArgumentException.class, () ->
+                Main.run("-m ./argument-config-file-test-cases/mapping.ttl -o ./wrong/file/output/generated_output.nq".split(" ")));
     }
 }

…a/be/ugent/rml/Arguments_Test_MySQL.java …be/ugent/rml/ArgumentsTestMySQLTest.javasrc/test/java/be/ugent/rml/Arguments_Test_MySQL.java renamed to src/test/java/be/ugent/rml/ArgumentsTestMySQLTest.java src/test/java/be/ugent/rml/Arguments_Test_MySQL.java renamed to src/test/java/be/ugent/rml/ArgumentsTestMySQLTest.java

@@ -1,19 +1,22 @@
 package be.ugent.rml;
 
 import be.ugent.rml.cli.Main;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class Arguments_Test_MySQL extends MySQLTestCore {
 
-    @BeforeClass
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class ArgumentsTestMySQLTest extends MySQLTestCore {
+
+    @BeforeAll
     public static void beforeClass() {
-        logger = LoggerFactory.getLogger(Arguments_Test_MySQL.class);
+        logger = LoggerFactory.getLogger(ArgumentsTestMySQLTest.class);
     }
 
     @Test
@@ -26,7 +29,7 @@ public void executeR2RML() throws Exception {
 
         prepareDatabase(resourcePath, "root", "");
 
-        Main.run(("-m " + mappingFilePath + " -o " + actualPath + " --r2rml-jdbcDSN " + dbURL + " --r2rml-username root -v").split(" "), cwd);
+        Main.run(("-m " + mappingFilePath + " -o " + actualPath + " --r2rml-jdbcDSN " + getDbURL() + " --r2rml-username root -v").split(" "), cwd);
         compareFiles(
                 expectedPath,
                 actualPath,

…/rml/Custom_RML_FnO_Mapper_CSV_Test.java …ugent/rml/CustomRMLFnOMapperCSVTest.javasrc/test/java/be/ugent/rml/Custom_RML_FnO_Mapper_CSV_Test.java renamed to src/test/java/be/ugent/rml/CustomRMLFnOMapperCSVTest.java src/test/java/be/ugent/rml/Custom_RML_FnO_Mapper_CSV_Test.java renamed to src/test/java/be/ugent/rml/CustomRMLFnOMapperCSVTest.java

@@ -1,14 +1,14 @@
 package be.ugent.rml;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.InvocationTargetException;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 
-public class Custom_RML_FnO_Mapper_CSV_Test extends TestFunctionCore {
+public class CustomRMLFnOMapperCSVTest extends TestFunctionCore {
     @Test
     public void evaluate_0000_CSV() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0000-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0000-CSV/output.ttl");
@@ -50,8 +50,8 @@ public void evaluate_0006_CSV() throws Exception {
     }
 
     @Test
-    public void evaluate_0007_CSV() throws Exception {
-        assertThrows(InvocationTargetException.class, () -> {doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0007-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0007-CSV/output.ttl");});
+    public void evaluate_0007_CSV() {
+        assertThrows(InvocationTargetException.class, () -> doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0007-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0007-CSV/output.ttl"));
     }
 
     @Test
@@ -60,19 +60,19 @@ public void evaluate_0008_CSV() throws Exception {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void evaluate_0009_CSV() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0009-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0009-CSV/output.ttl");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void evaluate_0010_CSV() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0010-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0010-CSV/output.ttl");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void evaluate_0011_CSV() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0011-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0011-CSV/output.ttl");
     }
@@ -88,25 +88,25 @@ public void evaluate_0013_CSV() throws Exception {
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void evaluate_0014_CSV() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0014-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0014-CSV/output.ttl");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void evaluate_0015_CSV() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0015-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0015-CSV/output.ttl");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void evaluate_0016_CSV() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0016-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0016-CSV/output.nq");
     }
 
     @Test
-    @Ignore
+    @Disabled
     public void evaluate_0017_CSV() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0017-CSV/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0017-CSV/output.ttl");
     }

…rml/Custom_RML_FnO_Mapper_JSON_Test.java …gent/rml/CustomRMLFnOMapperJSONTest.javasrc/test/java/be/ugent/rml/Custom_RML_FnO_Mapper_JSON_Test.java renamed to src/test/java/be/ugent/rml/CustomRMLFnOMapperJSONTest.java src/test/java/be/ugent/rml/Custom_RML_FnO_Mapper_JSON_Test.java renamed to src/test/java/be/ugent/rml/CustomRMLFnOMapperJSONTest.java

@@ -1,8 +1,8 @@
 package be.ugent.rml;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-public class Custom_RML_FnO_Mapper_JSON_Test extends TestFunctionCore {
+public class CustomRMLFnOMapperJSONTest extends TestFunctionCore {
     @Test
     public void evaluate_0020_JSON() throws Exception {
         doPreloadMapping("./rml-fno-test-cases/RMLFNOTC0020-JSON/mapping.ttl", "./rml-fno-test-cases/RMLFNOTC0020-JSON/output.ttl");