Fix tests

Author: Slimane AMAR

src/main/java/org/gridsuite/study/server/service/StudyServerExecutionService.java

@@ -43,7 +43,7 @@ public CompletableFuture<Void> runAsyncAndComplete(Runnable runnable) {
     }
 
     private void logAsyncError(Throwable e) {
-        if (e != null) {
+        if (LOGGER.isErrorEnabled() && e != null) {
             LOGGER.error(e.toString(), e);
         }
     }

src/test/java/org/gridsuite/study/server/LoadFLowUnitTest.java

@@ -16,8 +16,10 @@
 import org.gridsuite.study.server.repository.StudyRepository;
 import org.gridsuite.study.server.service.*;
 import org.gridsuite.study.server.utils.elasticsearch.DisableElasticsearch;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
+import org.mockito.stubbing.Answer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -26,6 +28,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.gridsuite.study.server.dto.ComputationType.LOAD_FLOW;
@@ -71,6 +74,18 @@ class LoadFLowUnitTest {
     @MockBean
     StudyRepository studyRepository;
 
+    @SpyBean
+    private StudyServerExecutionService studyServerExecutionService;
+
+    @BeforeEach
+    void setup() {
+        // Synchronize for tests
+        doAnswer((Answer<CompletableFuture>) invocation -> {
+            ((Runnable) invocation.getArguments()[0]).run();
+            return CompletableFuture.completedFuture(null);
+        }).when(studyServerExecutionService).runAsyncAndComplete(any(Runnable.class));
+    }
+
     @Test
     void testRunLoadFlow() {
         when(rootNetworkNodeInfoService.getComputationResultUuid(nodeUuid, rootNetworkUuid, LOAD_FLOW)).thenReturn(null);

src/test/java/org/gridsuite/study/server/NetworkModificationTest.java

@@ -46,7 +46,6 @@
 import org.gridsuite.study.server.service.*;
 import org.gridsuite.study.server.service.client.dynamicsecurityanalysis.DynamicSecurityAnalysisClient;
 import org.gridsuite.study.server.service.client.dynamicsimulation.DynamicSimulationClient;
-import org.gridsuite.study.server.service.LoadFlowService;
 import org.gridsuite.study.server.service.shortcircuit.ShortCircuitService;
 import org.gridsuite.study.server.utils.*;
 import org.gridsuite.study.server.utils.elasticsearch.DisableElasticsearch;
@@ -58,6 +57,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
+import org.mockito.stubbing.Answer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +76,7 @@
 import org.springframework.test.web.servlet.MvcResult;
 
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.gridsuite.study.server.StudyConstants.HEADER_ERROR_MESSAGE;
@@ -86,8 +87,8 @@
 import static org.gridsuite.study.server.utils.SendInput.POST_ACTION_SEND_INPUT;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -234,6 +235,9 @@ class NetworkModificationTest {
     @Autowired
     private TestUtils studyTestUtils;
 
+    @SpyBean
+    private StudyServerExecutionService studyServerExecutionService;
+
     @Autowired
     private ObjectMapper objectMapper;
 
@@ -261,6 +265,12 @@ void setup(final MockWebServer server) {
 
         when(networkStoreService.getNetwork(NETWORK_UUID)).thenReturn(network);
 
+        // Synchronize for tests
+        doAnswer((Answer<CompletableFuture>) invocation -> {
+            ((Runnable) invocation.getArguments()[0]).run();
+            return CompletableFuture.completedFuture(null);
+        }).when(studyServerExecutionService).runAsyncAndComplete(any(Runnable.class));
+
         wireMockServer = new WireMockServer(wireMockConfig().dynamicPort().extensions(new SendInput(input)));
         wireMockUtils = new WireMockUtils(wireMockServer);
 

src/test/java/org/gridsuite/study/server/StudyTest.java

@@ -87,6 +87,7 @@
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
@@ -341,6 +342,9 @@ class StudyTest {
     @Autowired
     private TestUtils studyTestUtils;
 
+    @SpyBean
+    private StudyServerExecutionService studyServerExecutionService;
+
     private static EquipmentInfos toEquipmentInfos(Line line) {
         return EquipmentInfos.builder()
             .networkUuid(NETWORK_UUID)
@@ -380,6 +384,12 @@ private void initMockBeans(Network network) {
                 .thenReturn(List.of(new VariantInfos(VariantManagerConstants.INITIAL_VARIANT_ID, 0)));
 
         doNothing().when(networkStoreService).deleteNetwork(NETWORK_UUID);
+
+        // Synchronize for tests
+        doAnswer((Answer<CompletableFuture>) invocation -> {
+            ((Runnable) invocation.getArguments()[0]).run();
+            return CompletableFuture.completedFuture(null);
+        }).when(studyServerExecutionService).runAsyncAndComplete(any(Runnable.class));
     }
 
     private void initMockBeansNetworkNotExisting() {