-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
12 changed files
with
860 additions
and
11 deletions.
There are no files selected for viewing
10 changes: 10 additions & 0 deletions
10
src/main/java/org/gridsuite/modification/server/dto/byfilter/equipmentfield/FieldUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...TransformerByFormulaModificationTest.java → ...TransformerByFormulaModificationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
264 changes: 264 additions & 0 deletions
264
...e/modification/server/modifications/byfilter/simple/AbstractBySimpleModificationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,264 @@ | ||
| /** | ||
| * Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * 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.modification.server.modifications.byfilter.simple; | ||
|
|
||
| import com.fasterxml.jackson.core.type.TypeReference; | ||
| import com.github.tomakehurst.wiremock.client.WireMock; | ||
| import com.github.tomakehurst.wiremock.matching.StringValuePattern; | ||
| import com.powsybl.iidm.network.IdentifiableType; | ||
| import com.powsybl.iidm.network.Network; | ||
| import org.gridsuite.filter.AbstractFilter; | ||
| import org.gridsuite.filter.identifierlistfilter.IdentifierListFilter; | ||
| import org.gridsuite.filter.identifierlistfilter.IdentifierListFilterEquipmentAttributes; | ||
| import org.gridsuite.filter.utils.EquipmentType; | ||
| import org.gridsuite.modification.server.dto.BySimpleModificationInfos; | ||
| import org.gridsuite.modification.server.dto.FilterInfos; | ||
| import org.gridsuite.modification.server.dto.NetworkModificationResult; | ||
| import org.gridsuite.modification.server.dto.byfilter.simple.AbstractSimpleModificationByFilterInfos; | ||
| import org.gridsuite.modification.server.dto.byfilter.simple.DoubleModificationByFilterInfos; | ||
| import org.gridsuite.modification.server.impacts.AbstractBaseImpact; | ||
| import org.gridsuite.modification.server.modifications.AbstractNetworkModificationTest; | ||
| import org.gridsuite.modification.server.service.FilterService; | ||
| import org.gridsuite.modification.server.utils.NetworkCreation; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.junit.jupiter.api.Tag; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.test.web.servlet.MvcResult; | ||
|
|
||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.gridsuite.modification.server.Impacts.TestImpactUtils.createCollectionElementImpact; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; | ||
| import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; | ||
|
|
||
| /** | ||
| * @author Thang PHAM <quyet-thang.pham at rte-france.com> | ||
| */ | ||
| @Tag("IntegrationTest") | ||
| public abstract class AbstractBySimpleModificationTest extends AbstractNetworkModificationTest { | ||
| protected static final UUID FILTER_ID_1 = UUID.randomUUID(); | ||
| protected static final UUID FILTER_ID_2 = UUID.randomUUID(); | ||
| protected static final UUID FILTER_ID_3 = UUID.randomUUID(); | ||
| protected static final UUID FILTER_ID_4 = UUID.randomUUID(); | ||
| protected static final UUID FILTER_ID_5 = UUID.randomUUID(); | ||
| protected static final UUID FILTER_ID_6 = UUID.randomUUID(); | ||
| protected static final UUID FILTER_WITH_ALL_WRONG_IDS = UUID.randomUUID(); | ||
| protected static final UUID FILTER_WITH_ONE_WRONG_ID = UUID.randomUUID(); | ||
| protected final FilterInfos filter1 = new FilterInfos(FILTER_ID_1, "filter1"); | ||
| protected final FilterInfos filter2 = new FilterInfos(FILTER_ID_2, "filter2"); | ||
| protected final FilterInfos filter3 = new FilterInfos(FILTER_ID_3, "filter3"); | ||
| protected final FilterInfos filter4 = new FilterInfos(FILTER_ID_4, "filter4"); | ||
| protected final FilterInfos filter5 = new FilterInfos(FILTER_ID_5, "filter5"); | ||
| protected final FilterInfos filter6 = new FilterInfos(FILTER_ID_6, "filter6"); | ||
| protected final FilterInfos filterWithOneWrongId = new FilterInfos(FILTER_WITH_ONE_WRONG_ID, "filterWithOneWrongId"); | ||
|
|
||
| public static final String PATH = "/v1/filters/metadata"; | ||
|
|
||
| @Override | ||
| protected void assertResultImpacts(List<AbstractBaseImpact> impacts) { | ||
| assertThat(impacts).containsExactly(createCollectionElementImpact(getIdentifiableType())); | ||
| } | ||
|
|
||
| @Before | ||
| public void specificSetUp() { | ||
| FilterService.setFilterServerBaseUri(wireMockServer.baseUrl()); | ||
|
|
||
| getNetwork().getVariantManager().setWorkingVariant("variant_1"); | ||
| createEquipments(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testByModificationError() throws Exception { | ||
| //Test with modification = null | ||
| mockMvc.perform(post(getNetworkModificationUri()).content(mapper.writeValueAsString(null)).contentType(MediaType.APPLICATION_JSON)) | ||
| .andExpect(status().isBadRequest()); | ||
|
|
||
| // Test with empty list of simple modification | ||
| checkCreationApplicationStatus(BySimpleModificationInfos.builder().equipmentType(getIdentifiableType()).simpleModificationInfosList(List.of()).build(), | ||
| NetworkModificationResult.ApplicationStatus.WITH_ERRORS); | ||
|
|
||
| // Test with empty list of filters in simple modification | ||
| List<AbstractSimpleModificationByFilterInfos<?>> simpleInfosWithNoFilters = getSimpleModificationInfos().stream().peek(simpleInfos -> simpleInfos.setFilters(List.of())).toList(); | ||
| checkCreationApplicationStatus(BySimpleModificationInfos.builder().equipmentType(getIdentifiableType()).simpleModificationInfosList(simpleInfosWithNoFilters).build(), | ||
| NetworkModificationResult.ApplicationStatus.WITH_ERRORS); | ||
|
|
||
| // Test with editedField = null | ||
| AbstractSimpleModificationByFilterInfos<?> simpleInfosWithNoEditedField = DoubleModificationByFilterInfos.builder() | ||
| .value(50.) | ||
| .filters(List.of()) | ||
| .build(); | ||
| checkCreationApplicationStatus(BySimpleModificationInfos.builder().equipmentType(getIdentifiableType()).simpleModificationInfosList(List.of(simpleInfosWithNoEditedField)).build(), | ||
| NetworkModificationResult.ApplicationStatus.WITH_ERRORS); | ||
| } | ||
|
|
||
| protected void checkCreateWithWarning(List<AbstractSimpleModificationByFilterInfos<?>> simpleInfos, List<IdentifierListFilterEquipmentAttributes> existingEquipmentList) throws Exception { | ||
| AbstractFilter filter = getFilterEquipments(FILTER_WITH_ONE_WRONG_ID, existingEquipmentList); | ||
|
|
||
| UUID stubId = wireMockServer.stubFor(WireMock.get(WireMock.urlMatching("/v1/filters/metadata\\?ids=" + FILTER_WITH_ONE_WRONG_ID)) | ||
| .willReturn(WireMock.ok() | ||
| .withBody(mapper.writeValueAsString(List.of(filter))) | ||
| .withHeader("Content-Type", "application/json"))).getId(); | ||
|
|
||
| BySimpleModificationInfos bySimpleModificationInfos = BySimpleModificationInfos.builder() | ||
| .simpleModificationInfosList(simpleInfos) | ||
| .equipmentType(getIdentifiableType()) | ||
| .build(); | ||
|
|
||
| checkCreationApplicationStatus(bySimpleModificationInfos, NetworkModificationResult.ApplicationStatus.WITH_WARNINGS); | ||
|
|
||
| wireMockUtils.verifyGetRequest(stubId, PATH, handleQueryParams(List.of(FILTER_WITH_ONE_WRONG_ID)), false); | ||
| } | ||
|
|
||
| protected void checkCreateWithError(List<AbstractSimpleModificationByFilterInfos<?>> simpleInfos, List<AbstractFilter> filterEquipments) throws Exception { | ||
| String filterIds = filterEquipments.stream() | ||
| .map(AbstractFilter::getId) | ||
| .map(UUID::toString) | ||
| .collect(Collectors.joining(",")); | ||
|
|
||
| UUID stubId = wireMockServer.stubFor(WireMock.get(WireMock.urlMatching("/v1/filters/metadata\\?ids=" + filterIds)) | ||
| .willReturn(WireMock.ok() | ||
| .withBody(mapper.writeValueAsString(filterEquipments)) | ||
| .withHeader("Content-Type", "application/json"))).getId(); | ||
|
|
||
| BySimpleModificationInfos bySimpleModificationInfos = BySimpleModificationInfos.builder() | ||
| .simpleModificationInfosList(simpleInfos) | ||
| .equipmentType(getIdentifiableType()) | ||
| .build(); | ||
|
|
||
| checkCreationApplicationStatus(bySimpleModificationInfos, NetworkModificationResult.ApplicationStatus.WITH_ERRORS); | ||
|
|
||
| wireMockUtils.verifyGetRequest(stubId, | ||
| PATH, | ||
| handleQueryParams(filterEquipments.stream().map(AbstractFilter::getId).collect(Collectors.toList())), | ||
| false); | ||
| } | ||
|
|
||
| @Test | ||
| public void testModificationWithAllWrongEquipmentIds() throws Exception { | ||
| AbstractFilter filter = getFilterEquipments(FILTER_WITH_ALL_WRONG_IDS, List.of()); | ||
|
|
||
| List<AbstractSimpleModificationByFilterInfos<?>> simpleInfosList = getSimpleModificationInfos().stream() | ||
| .peek(simpleInfos -> simpleInfos.setFilters(List.of(new FilterInfos(FILTER_WITH_ALL_WRONG_IDS, "filterWithWrongId")))) | ||
| .toList(); | ||
|
|
||
| UUID stubId = wireMockServer.stubFor(WireMock.get(WireMock.urlMatching("/v1/filters/metadata\\?ids=" + FILTER_WITH_ALL_WRONG_IDS)) | ||
| .willReturn(WireMock.ok() | ||
| .withBody(mapper.writeValueAsString(List.of(filter))) | ||
| .withHeader("Content-Type", "application/json"))).getId(); | ||
|
|
||
| BySimpleModificationInfos bySimpleModificationInfos = BySimpleModificationInfos.builder() | ||
| .simpleModificationInfosList(simpleInfosList) | ||
| .equipmentType(getIdentifiableType()) | ||
| .build(); | ||
|
|
||
| checkCreationApplicationStatus(bySimpleModificationInfos, NetworkModificationResult.ApplicationStatus.WITH_ERRORS); | ||
|
|
||
| wireMockUtils.verifyGetRequest(stubId, PATH, handleQueryParams(List.of(FILTER_WITH_ALL_WRONG_IDS)), false); | ||
| } | ||
|
|
||
| @Test | ||
| @Override | ||
| public void testCreate() throws Exception { | ||
| List<AbstractFilter> filters = getTestFilters(); | ||
| UUID stubId = wireMockServer.stubFor(WireMock.get(WireMock.urlMatching(getPath(true) + ".{2,}")) | ||
| .willReturn(WireMock.ok() | ||
| .withBody(mapper.writeValueAsString(filters)) | ||
| .withHeader("Content-Type", "application/json"))).getId(); | ||
|
|
||
| super.testCreate(); | ||
|
|
||
| wireMockUtils.verifyGetRequest(stubId, PATH, handleQueryParams(filters.stream().map(AbstractFilter::getId).collect(Collectors.toList())), false); | ||
| } | ||
|
|
||
| @Test | ||
| @Override | ||
| public void testCopy() throws Exception { | ||
| List<AbstractFilter> filters = getTestFilters(); | ||
| UUID stubId = wireMockServer.stubFor(WireMock.get(WireMock.urlMatching(getPath(true) + ".{2,}")) | ||
| .willReturn(WireMock.ok() | ||
| .withBody(mapper.writeValueAsString(filters)) | ||
| .withHeader("Content-Type", "application/json"))).getId(); | ||
|
|
||
| super.testCopy(); | ||
|
|
||
| wireMockUtils.verifyGetRequest(stubId, PATH, handleQueryParams(filters.stream().map(AbstractFilter::getId).collect(Collectors.toList())), false); | ||
| } | ||
|
|
||
| protected void checkCreationApplicationStatus(BySimpleModificationInfos bySimpleModificationInfos, | ||
| NetworkModificationResult.ApplicationStatus applicationStatus) throws Exception { | ||
| String modificationToCreateJson = mapper.writeValueAsString(bySimpleModificationInfos); | ||
|
|
||
| MvcResult mvcResult = mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON)) | ||
| .andExpect(status().isOk()).andReturn(); | ||
|
|
||
| Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); | ||
| assertTrue(networkModificationResult.isPresent()); | ||
| assertEquals(applicationStatus, networkModificationResult.get().getApplicationStatus()); | ||
| } | ||
|
|
||
| @Override | ||
| protected Network createNetwork(UUID networkUuid) { | ||
| return NetworkCreation.create(networkUuid, true); | ||
| } | ||
|
|
||
| @Override | ||
| protected BySimpleModificationInfos buildModification() { | ||
| return BySimpleModificationInfos.builder() | ||
| .equipmentType(getIdentifiableType()) | ||
| .simpleModificationInfosList(getSimpleModificationInfos()) | ||
| .stashed(false) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected BySimpleModificationInfos buildModificationUpdate() { | ||
| return BySimpleModificationInfos.builder() | ||
| .equipmentType(getIdentifiableType()) | ||
| .simpleModificationInfosList(getUpdatedSimpleModificationInfos()) | ||
| .stashed(false) | ||
| .build(); | ||
| } | ||
|
|
||
| protected IdentifierListFilterEquipmentAttributes getIdentifiableAttributes(String id, Double distributionKey) { | ||
| return new IdentifierListFilterEquipmentAttributes(id, distributionKey); | ||
| } | ||
|
|
||
| protected AbstractFilter getFilterEquipments(UUID filterID, List<IdentifierListFilterEquipmentAttributes> identifiableAttributes) { | ||
| return IdentifierListFilter.builder().id(filterID).modificationDate(new Date()).equipmentType(getEquipmentType()) | ||
| .filterEquipmentsAttributes(identifiableAttributes) | ||
| .build(); | ||
| } | ||
|
|
||
| Map<String, StringValuePattern> handleQueryParams(List<UUID> filterIds) { | ||
| return Map.of("ids", WireMock.matching(filterIds.stream().map(uuid -> ".+").collect(Collectors.joining(",")))); | ||
| } | ||
|
|
||
| String getPath(boolean isRegexPath) { | ||
| if (isRegexPath) { | ||
| return "/v1/filters/metadata\\?ids="; | ||
| } | ||
| return "/v1/filters/metadata?ids="; | ||
| } | ||
|
|
||
| protected abstract void createEquipments(); | ||
|
|
||
| protected abstract List<AbstractFilter> getTestFilters(); | ||
|
|
||
| protected abstract List<AbstractSimpleModificationByFilterInfos<?>> getSimpleModificationInfos(); | ||
|
|
||
| protected abstract List<AbstractSimpleModificationByFilterInfos<?>> getUpdatedSimpleModificationInfos(); | ||
|
|
||
| protected abstract IdentifiableType getIdentifiableType(); | ||
|
|
||
| protected abstract EquipmentType getEquipmentType(); | ||
| } |
Oops, something went wrong.