From 11299cf5c0393e0b325e6a3c67e747360cb5596a Mon Sep 17 00:00:00 2001
From: Tristan Chuine <tristan.chuine_externe@rte-france.com>
Date: Tue, 24 Sep 2024 15:54:47 +0200
Subject: [PATCH] Migrate tests to JUnit5

Signed-off-by: Tristan Chuine <tristan.chuine_externe@rte-france.com>
---
 pom.xml                                       |  9 ++++--
 .../datasource/CaseDataSourceClientTest.java  | 28 +++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 44db989..b1ce47a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,8 +84,8 @@
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -93,5 +93,10 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/test/java/com/powsybl/cases/datasource/CaseDataSourceClientTest.java b/src/test/java/com/powsybl/cases/datasource/CaseDataSourceClientTest.java
index 71c98e3..6509078 100644
--- a/src/test/java/com/powsybl/cases/datasource/CaseDataSourceClientTest.java
+++ b/src/test/java/com/powsybl/cases/datasource/CaseDataSourceClientTest.java
@@ -6,11 +6,11 @@
  */
 package com.powsybl.cases.datasource;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
@@ -26,8 +26,8 @@
 import java.util.UUID;
 
 import static java.util.Arrays.asList;
-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;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.given;
@@ -35,19 +35,17 @@
 /**
  * @author Chamseddine Benhamed <chamseddine.benhamed at rte-france.com>
  */
-
-@RunWith(MockitoJUnitRunner.class)
-public class CaseDataSourceClientTest {
+@ExtendWith(MockitoExtension.class)
+class CaseDataSourceClientTest {
 
     @Mock
     private RestTemplate caseServerRest;
 
     private CaseDataSourceClient caseDataSourceClient;
 
-    private UUID randomUuid = UUID.randomUUID();
-
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
+        final UUID randomUuid = UUID.randomUUID();
         caseDataSourceClient = new CaseDataSourceClient(caseServerRest, randomUuid);
 
         given(caseServerRest.exchange(eq("/v1/cases/{caseUuid}/datasource/baseName"),
@@ -57,7 +55,7 @@ public void setUp() {
                 eq(randomUuid)))
                 .willReturn(ResponseEntity.ok("myCaseName"));
 
-        ParameterizedTypeReference< Set<String>> parameterizedTypeReference = new ParameterizedTypeReference<Set<String>>() { };
+        ParameterizedTypeReference<Set<String>> parameterizedTypeReference = new ParameterizedTypeReference<>() { };
 
         given(caseServerRest.exchange(eq("/v1/cases/" + randomUuid + "/datasource/list?regex=.*"),
                 eq(HttpMethod.GET),
@@ -91,7 +89,7 @@ public void setUp() {
     }
 
     @Test
-    public void test() throws IOException {
+    void test() throws IOException {
         assertEquals("myCaseName", caseDataSourceClient.getBaseName());
 
         assertEquals(new HashSet<>(asList("A.xml", "B.xml")), caseDataSourceClient.listNames(".*"));