WIP adopting junit5

dhp-common/src/test/java/eu/dnetlib/dhp/application/ArgumentApplicationParserTest.java

@@ -1,14 +1,14 @@
 package eu.dnetlib.dhp.application;
 
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.util.Base64;
 import java.util.zip.GZIPOutputStream;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class ArgumentApplicationParserTest {
 

dhp-common/src/test/java/eu/dnetlib/dhp/model/mdstore/MetadataRecordTest.java

@@ -1,8 +1,8 @@
 package eu.dnetlib.dhp.model.mdstore;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class MetadataRecordTest {
 

dhp-common/src/test/java/eu/dnetlib/message/MessageTest.java

@@ -1,12 +1,12 @@
 package eu.dnetlib.message;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MessageTest {
 

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/action/AtomicActionTest.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.dnetlib.dhp.schema.oaf.Relation;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 

dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/oaf/MergeTest.java

@@ -1,8 +1,8 @@
 package eu.dnetlib.dhp.schema.oaf;
 
 import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -13,7 +13,7 @@ public class MergeTest {
 
     OafEntity oaf;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         oaf = new Publication();
     }

dhp-workflows/dhp-aggregation/pom.xml

@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.25.0</version>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
 

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collection/CollectionJobTest.java

@@ -6,10 +6,10 @@ import java.nio.file.Path;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -20,12 +20,12 @@ public class CollectionJobTest {
 
 	private Path testDir;
 
-	@Before
+	@BeforeEach
 	public void setup() throws IOException {
 		testDir = Files.createTempDirectory("dhp-collection");
 	}
 
-	@After
+	@AfterEach
 	public void teadDown() throws IOException {
 		FileUtils.deleteDirectory(testDir.toFile());
 	}

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/collector/worker/DnetCollectorWorkerApplicationTests.java

@@ -7,13 +7,13 @@ import eu.dnetlib.dhp.collection.worker.DnetCollectorWorker;
 import eu.dnetlib.dhp.collection.worker.utils.CollectorPluginFactory;
 import eu.dnetlib.message.Message;
 import eu.dnetlib.message.MessageManager;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.*;
 
 
@@ -24,7 +24,7 @@ public class DnetCollectorWorkerApplicationTests {
     private MessageManager messageManager = mock(MessageManager.class);
 
     private DnetCollectorWorker worker;
-    @Before
+    @BeforeEach
     public void setup() throws Exception {
         ObjectMapper mapper = new ObjectMapper();
         final String apiJson = mapper.writeValueAsString(getApi());
@@ -47,7 +47,7 @@ public class DnetCollectorWorkerApplicationTests {
     }
 
 
-    @After
+    @AfterEach
     public void dropDown(){
         File f = new File("/tmp/file.seq");
         f.delete();

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/migration/step1/MigrateDbEntitiesApplicationTest.java

@@ -1,6 +1,6 @@
 package eu.dnetlib.dhp.migration.step1;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.sql.Array;
@@ -11,8 +11,8 @@ import java.util.List;
 import java.util.Objects;
 
 import org.apache.commons.io.IOUtils;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -35,7 +35,7 @@ public class MigrateDbEntitiesApplicationTest {
 	@Mock
 	private ResultSet rs;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		this.app = new MigrateDbEntitiesApplication();
 	}

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/transformation/TransformationJobTest.java

@@ -37,12 +37,12 @@ public class TransformationJobTest {
 
     private Path testDir;
 
-    @Before
+    @BeforeEach
     public void setup() throws IOException {
         testDir = Files.createTempDirectory("dhp-collection");
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws IOException {
         FileUtils.deleteDirectory(testDir.toFile());
     }

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/transformation/vocabulary/VocabularyTest.java

@@ -1,7 +1,7 @@
 package eu.dnetlib.dhp.transformation.vocabulary;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 public class VocabularyTest {
 
 

dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/dedup/MergeAuthorTest.java

@@ -3,8 +3,8 @@ package eu.dnetlib.dhp.dedup;
 import eu.dnetlib.dhp.schema.oaf.Publication;
 import org.apache.commons.io.IOUtils;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -16,7 +16,7 @@ public class MergeAuthorTest {
     private List<Publication> publicationsToMerge;
     private final ObjectMapper mapper = new ObjectMapper();
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         final String json = IOUtils.toString(this.getClass().getResourceAsStream("/eu/dnetlib/dhp/dedup/json/authors_merge.json"));
 

dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/dedup/SparkCreateDedupTest.java

@@ -6,9 +6,9 @@ import eu.dnetlib.dhp.application.ArgumentApplicationParser;
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.*;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
@@ -17,7 +17,7 @@ public class SparkCreateDedupTest {
     String configuration;
     String entity = "organization";
 
-    @Before
+    @BeforeEach
     public void setUp() throws IOException {
 //        configuration = IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dedup/conf/org.curr.conf.json"));
         configuration = "";

dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/dedup/jpath/JsonPathTest.java

@@ -3,7 +3,7 @@ package eu.dnetlib.dhp.dedup.jpath;
 import eu.dnetlib.pace.config.DedupConfig;
 import eu.dnetlib.pace.model.MapDocument;
 import eu.dnetlib.pace.util.MapDocumentUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JsonPathTest {
 

dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java

@@ -12,12 +12,12 @@ public class SparkGraphImporterJobTest {
     private static final long MAX = 1000L;
     private Path testDir;
 
-    @Before
+    @BeforeEach
     public void setup() throws IOException {
         testDir = Files.createTempDirectory(getClass().getSimpleName());
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws IOException {
         FileUtils.deleteDirectory(testDir.toFile());
     }

dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/graph/GraphJoinerTest.java

@@ -1,6 +1,6 @@
 package eu.dnetlib.dhp.graph;
 
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -13,7 +13,7 @@ public class GraphJoinerTest {
     private Path inputDir;
     private Path outputDir;
 
-    @Before
+    @BeforeEach
     public void before() throws IOException {
         workingDir = Files.createTempDirectory("promote_action_set");
         inputDir = workingDir.resolve("input");