Skip to content

Clean tests instability #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Meklo merged 15 commits into from
Jun 22, 2026
Merged

Clean tests instability #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2d9485e
Clean loadflow tests instability
Jun 16, 2026
d6bc276
Add verification polling for async deletion
Jun 16, 2026
9b07acb
Override runAsync
Jun 16, 2026
772df63
Override runAsync bis
Jun 16, 2026
916acf3
Fix import case error test
Jun 16, 2026
d3f6022
Debug messages
Jun 16, 2026
99fe7a6
Test
Jun 16, 2026
e5e0103
Test
Jun 16, 2026
6038870
Make doDeleteStudyIfNotCreationInProgress idempotent
Jun 17, 2026
027805a
add executeAsyncOnMainThread to some RootNetworkTest tests
Jun 17, 2026
25db0db
Refine comment
Jun 18, 2026
b3c355c
Use synchronizeStudyServerExecutionService instead
Jun 22, 2026
0ce8466
Merge remote-tracking branch 'origin/main' into marcellinh/clean_load…
Jun 22, 2026
c0820de
Fix import
Jun 22, 2026
63df38f
Swap deleteByIdInBatch by deleteById
Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions src/main/java/org/gridsuite/study/server/service/StudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,23 +546,22 @@ private Optional<DeleteStudyInfos> doDeleteStudyIfNotCreationInProgress(UUID stu
Optional<StudyCreationRequestEntity> studyCreationRequestEntity = studyCreationRequestRepository.findById(studyUuid);
Optional<StudyEntity> studyEntity = studyRepository.findById(studyUuid);
DeleteStudyInfos deleteStudyInfos = null;
if (studyCreationRequestEntity.isEmpty()) {
if (studyCreationRequestEntity.isEmpty() && studyEntity.isPresent()) {
List<RootNetworkInfos> rootNetworkInfos = getStudyRootNetworksInfos(studyUuid);
// get all modification groups related to the study
List<UUID> modificationGroupUuids = networkModificationTreeService.getAllStudyNetworkModificationNodeInfo(studyUuid).stream().map(NetworkModificationNodeInfoEntity::getModificationGroupUuid).toList();
studyEntity.ifPresent(s -> {
networkModificationTreeService.doDeleteTree(studyUuid);
studyRepository.deleteById(studyUuid);
studyInfosService.deleteByUuid(studyUuid);
computationParametersService.deleteComputationsParameters(s);
removeNetworkVisualizationParameters(s.getNetworkVisualizationParametersUuid());
removeSpreadsheetConfigCollection(s.getSpreadsheetConfigCollectionUuid());
removeWorkspacesConfig(s.getWorkspacesConfigUuid());
removeNadConfigs(s.getNadConfigsUuids().stream().toList());
});
StudyEntity s = studyEntity.get();

@SlimaneAmar SlimaneAmar Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to delete something ih study is absent ?

networkModificationTreeService.doDeleteTree(studyUuid);
studyRepository.deleteById(studyUuid);
studyInfosService.deleteByUuid(studyUuid);
computationParametersService.deleteComputationsParameters(s);
removeNetworkVisualizationParameters(s.getNetworkVisualizationParametersUuid());
removeSpreadsheetConfigCollection(s.getSpreadsheetConfigCollectionUuid());
removeWorkspacesConfig(s.getWorkspacesConfigUuid());
removeNadConfigs(s.getNadConfigsUuids().stream().toList());
deleteStudyInfos = new DeleteStudyInfos(rootNetworkInfos, modificationGroupUuids);
} else {
studyCreationRequestRepository.deleteById(studyCreationRequestEntity.get().getId());
studyCreationRequestEntity.ifPresent(creationRequestEntity -> studyCreationRequestRepository.deleteById(creationRequestEntity.getId()));
}

if (deleteStudyInfos == null) {
Expand Down
20 changes: 17 additions & 3 deletions src/test/java/org/gridsuite/study/server/loadflow/LoadFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,20 @@
import static org.gridsuite.study.server.StudyConstants.HEADER_USER_ID;
import static org.gridsuite.study.server.dto.ComputationType.LOAD_FLOW;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.NOT_FOUND;
import static org.gridsuite.study.server.notification.NotificationService.*;
import static org.gridsuite.study.server.notification.NotificationService.HEADER_UPDATE_TYPE;
import static org.gridsuite.study.server.notification.NotificationService.NODE_BUILD_STATUS_UPDATED;
import static org.gridsuite.study.server.notification.NotificationService.UPDATE_TYPE_ALL_COMPUTATION_STATUS;
import static org.gridsuite.study.server.notification.NotificationService.UPDATE_TYPE_COMPUTATION_PARAMETERS;
import static org.gridsuite.study.server.utils.TestUtils.USER_DEFAULT_PROFILE_JSON;
import static org.gridsuite.study.server.utils.TestUtils.synchronizeStudyServerExecutionService;
import static org.gridsuite.study.server.utils.wiremock.WireMockUtilsCriteria.removeRequestMatching;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

Expand Down Expand Up @@ -177,6 +184,8 @@ class LoadFlowTest {
private TestUtils studyTestUtils;
@Autowired
private ConsumerService consumerService;
@MockitoSpyBean
private StudyServerExecutionService studyServerExecutionService;

private static WireMockServer wireMockServer;
private WireMockStubs wireMockStubs;
Expand Down Expand Up @@ -507,7 +516,7 @@ void testDeleteLoadFlowResults() throws Exception {
//Test result count
testResultCount();

//Delete Voltage init results
//Delete loadflow results
testDeleteResults(studyNameUserIdUuid, 1);
}

Expand Down Expand Up @@ -569,13 +578,18 @@ private void testDeleteResults(UUID studyUuid, int expectedInitialResultCount) t
List<RootNetworkNodeInfoEntity> rootNetworkNodeInfoEntities = rootNetworkNodeInfoRepository.findAllByLoadFlowResultUuidNotNull();
RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoEntities.getFirst();

// Run runAsync tasks inline so fire-and-forget cleanup (e.g. blocking=false remote deletions)
// completes before the test verifies it, removes the race condition.
synchronizeStudyServerExecutionService(studyServerExecutionService);

assertEquals(expectedInitialResultCount, rootNetworkNodeInfoEntities.size());
wireMockStubs.loadflowServer.stubDeleteLoadflowResults(LOADFLOW_RESULT_UUID);
wireMockStubs.reportServer.stubDeleteReport();
mockMvc.perform(delete("/v1/supervision/computation/results")
.queryParam("type", LOAD_FLOW.toString())
.queryParam("dryRun", "false"))
.andExpect(status().isOk());

wireMockStubs.loadflowServer.verifyDeleteLoadflowResults();
wireMockStubs.reportServer.verifyDeleteReport();

Expand Down
27 changes: 23 additions & 4 deletions src/test/java/org/gridsuite/study/server/rootnetworks/RootNetworkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
import com.powsybl.network.store.client.NetworkStoreService;
import com.powsybl.ws.commons.error.PowsyblWsProblemDetail;
import org.gridsuite.study.server.ContextConfigurationWithTestChannel;
import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.*;
import org.gridsuite.study.server.dto.caseimport.CaseImportAction;
import org.gridsuite.study.server.dto.caseimport.CaseImportReceiver;
import org.gridsuite.study.server.elasticsearch.EquipmentInfosService;
import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.networkmodificationtree.dto.InsertMode;
import org.gridsuite.study.server.networkmodificationtree.dto.NetworkModificationNode;
import org.gridsuite.study.server.networkmodificationtree.entities.NodeEntity;
Expand Down Expand Up @@ -57,12 +57,21 @@

import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.gridsuite.study.server.StudyConstants.HEADER_ERROR;
import static org.gridsuite.study.server.StudyConstants.HEADER_IMPORT_PARAMETERS;
import static org.gridsuite.study.server.StudyConstants.HEADER_RECEIVER;
import static org.gridsuite.study.server.StudyConstants.HEADER_USER_ID;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.MAXIMUM_ROOT_NETWORK_BY_STUDY_REACHED;
import static org.gridsuite.study.server.error.StudyBusinessErrorCode.NOT_FOUND;
import static org.gridsuite.study.server.StudyConstants.*;
import static org.gridsuite.study.server.utils.TestUtils.createModificationNodeInfo;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.gridsuite.study.server.utils.TestUtils.synchronizeStudyServerExecutionService;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.springframework.http.MediaType.APPLICATION_JSON;
Expand Down Expand Up @@ -144,6 +153,8 @@ class RootNetworkTest {

@MockitoSpyBean
private StudyService studyService;
@MockitoSpyBean
private StudyServerExecutionService studyServerExecutionService;

@MockitoBean
private ReportService reportService;
Expand Down Expand Up @@ -460,6 +471,10 @@ void testCreateRootNetworkConsumerWithoutRequest() throws Exception {
StudyEntity studyEntity = TestUtils.createDummyStudy(NETWORK_UUID, CASE_UUID, CASE_NAME, CASE_FORMAT, REPORT_UUID);
studyRepository.save(studyEntity);

// Run runAsync tasks inline so fire-and-forget cleanup (e.g. blocking=false remote deletions)
// completes before the test verifies it, removes the race condition.
synchronizeStudyServerExecutionService(studyServerExecutionService);

// DO NOT insert creation request - it means root network won't be created and remote resources will be deleted
RootNetworkInfos rootNetworkInfos = RootNetworkInfos.builder().id(UUID.randomUUID()).name("newRootNetworkName").tag("newT")
.caseInfos(new CaseInfos(CASE_UUID2, CASE_UUID, CASE_NAME2, CASE_FORMAT2)).networkInfos(new NetworkInfos(NETWORK_UUID2, NETWORK_ID2))
Expand Down Expand Up @@ -530,6 +545,10 @@ void testDeleteRootNetwork() throws Exception {
// before deletion, check we have 2 root networks for study
assertEquals(2, studyService.getExistingBasicRootNetworkInfos(studyEntity.getId()).size());

// Run runAsync tasks inline so fire-and-forget cleanup (e.g. blocking=false remote deletions)
// completes before the test verifies it, removes the race condition.
synchronizeStudyServerExecutionService(studyServerExecutionService);

mockMvc.perform(delete("/v1/studies/{studyUuid}/root-networks", studyEntity.getId())
.contentType(APPLICATION_JSON)
.content(objectMapper.writeValueAsString(List.of(rootNetworkEntityToDeleteUuid)))
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/org/gridsuite/study/server/studycontroller/StudyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,12 @@ void testCreateStudyWithErrorDuringCaseImport() throws Exception {
assertEquals(userId, headers.get(HEADER_USER_ID));
assertEquals(NotificationService.UPDATE_TYPE_STUDY_CREATION_STARTED, headers.get(HEADER_UPDATE_TYPE));

message = output.receive(TIMEOUT, "study.update");

headers = message.getHeaders();
assertEquals(userId, headers.get(HEADER_USER_ID));
assertEquals(NotificationService.UPDATE_TYPE_STUDY_CREATION_FINISHED, headers.get(HEADER_UPDATE_TYPE));

MvcResult mvcResult = mockMvc.perform(get("/v1/study_creation_requests").header(USER_ID_HEADER, "userId")).andExpectAll(
status().isOk(),
content().contentType(MediaType.APPLICATION_JSON))
Expand Down
Loading