Migrate tests to JUnit5 (#147)

Author: Tristan-WorkGH

pom.xml

@@ -46,6 +46,7 @@
         <gridsuite-dependencies.version>34</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
+        <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
         <!-- FIXME: powsybl-network-store modules'version is overloaded in the dependencies section.The overloads and this property below have to be removed at next powsybl-ws-dependencies.version upgrade -->
         <powsybl-network-store.version>1.18.2</powsybl-network-store.version>
     </properties>
@@ -87,6 +88,13 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
+            <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-bom</artifactId>
+                <version>${mockwebserver3.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
             <dependency>
                 <groupId>com.powsybl</groupId>
@@ -116,7 +124,11 @@
             </dependency>
 
             <!-- project specific dependencies -->
-
+            <dependency>
+                <groupId>com.vladmihalcea</groupId>
+                <artifactId>db-util</artifactId>
+                <version>${db-util.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -227,34 +239,14 @@
             <artifactId>powsybl-iidm-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
+            <artifactId>mockwebserver3-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -270,7 +262,6 @@
         <dependency>
             <groupId>com.vladmihalcea</groupId>
             <artifactId>db-util</artifactId>
-            <version>${db-util.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -279,5 +270,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
 </project>

src/main/java/org/gridsuite/securityanalysis/server/dto/CsvTranslationDTO.java

@@ -1,6 +1,6 @@
 package org.gridsuite.securityanalysis.server.dto;
 
-import lombok.*;
+import lombok.Builder;
 
 import java.util.List;
 import java.util.Map;

src/main/java/org/gridsuite/securityanalysis/server/service/ActionsService.java

@@ -7,7 +7,6 @@
 package org.gridsuite.securityanalysis.server.service;
 
 import org.gridsuite.securityanalysis.server.dto.ContingencyInfos;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
@@ -39,7 +38,6 @@ public void setActionServiceBaseUri(String baseUri) {
         this.baseUri = baseUri;
     }
 
-    @Autowired
     public ActionsService(
             @Value("${gridsuite.services.actions-server.base-uri:http://actions-server/}") String baseUri,
             RestTemplate restTemplate) {

src/main/java/org/gridsuite/securityanalysis/server/service/LoadFlowService.java

@@ -7,7 +7,6 @@
 package org.gridsuite.securityanalysis.server.service;
 
 import org.gridsuite.securityanalysis.server.dto.LoadFlowParametersValues;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -28,7 +27,6 @@ public class LoadFlowService {
 
     private final RestTemplate restTemplate;
 
-    @Autowired
     public LoadFlowService(@Value("${gridsuite.services.loadflow-server.base-uri:http://loadflow-server/}") String baseUri, RestTemplate restTemplate) {
         this.baseUri = baseUri;
         this.restTemplate = restTemplate;

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisObserver.java

@@ -4,7 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-
 package org.gridsuite.securityanalysis.server.service;
 
 import com.powsybl.loadflow.LoadFlowResult;

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisResultService.java

@@ -24,7 +24,6 @@
 import org.gridsuite.securityanalysis.server.util.SecurityAnalysisException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.*;
 import org.springframework.data.jpa.domain.Specification;
@@ -91,7 +90,6 @@ public class SecurityAnalysisResultService extends AbstractComputationResultServ
         AbstractLimitViolationEntity.Fields.side
     );
 
-    @Autowired
     public SecurityAnalysisResultService(SecurityAnalysisResultRepository securityAnalysisResultRepository,
                                          ContingencyRepository contingencyRepository,
                                          PreContingencyLimitViolationRepository preContingencyLimitViolationRepository,
@@ -238,6 +236,7 @@ public void insert(UUID resultUuid, SecurityAnalysisResult result, SecurityAnaly
         securityAnalysisResultRepository.save(securityAnalysisResult);
     }
 
+    @Override
     @Transactional
     public void insertStatus(List<UUID> resultUuids, SecurityAnalysisStatus status) {
         Objects.requireNonNull(resultUuids);
@@ -248,6 +247,7 @@ public void insertStatus(List<UUID> resultUuids, SecurityAnalysisStatus status)
         });
     }
 
+    @Override
     @Transactional
     public void delete(UUID resultUuid) {
         AtomicReference<Long> startTime = new AtomicReference<>();
@@ -271,11 +271,13 @@ private void deleteSecurityAnalysisResult(UUID resultId) {
         securityAnalysisResultRepository.deleteById(resultId);
     }
 
+    @Override
     @Transactional
     public void deleteAll() {
         securityAnalysisResultRepository.deleteAll();
     }
 
+    @Override
     @Transactional(readOnly = true)
     public SecurityAnalysisStatus findStatus(UUID resultUuid) {
         Objects.requireNonNull(resultUuid);

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisService.java

@@ -13,7 +13,7 @@
 import com.powsybl.ws.commons.computation.service.AbstractComputationService;
 import com.powsybl.ws.commons.computation.service.NotificationService;
 import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
-import org.gridsuite.securityanalysis.server.dto.*;
+import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisStatus;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +37,7 @@ public SecurityAnalysisService(SecurityAnalysisResultService securityAnalysisRes
         super(notificationService, securityAnalysisResultService, objectMapper, uuidGeneratorService, defaultProvider);
     }
 
+    @Override
     public UUID runAndSaveResult(SecurityAnalysisRunContext runContext) {
         Objects.requireNonNull(runContext);
         var resultUuid = uuidGeneratorService.generate();
@@ -47,6 +48,7 @@ public UUID runAndSaveResult(SecurityAnalysisRunContext runContext) {
         return resultUuid;
     }
 
+    @Override
     public List<String> getProviders() {
         return SecurityAnalysisProvider.findAll().stream()
             .map(SecurityAnalysisProvider::getName)