diff --git a/src/test/java/org/gridsuite/modification/server/modifications/EquipmentByFilterDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/EquipmentByFilterDeletionTest.java index 77595fe20..34c57d0b9 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/EquipmentByFilterDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/EquipmentByFilterDeletionTest.java @@ -150,7 +150,7 @@ public void testCreateWithErrors() throws Exception { .equipmentFilters(List.of(filter1)) .build(); - List filters = List.of(getFilterEquipments(FILTER_ID_1, "filter1", List.of(getIdentifiableAttributes(LOAD_WRONG_ID_1)))); + List filters = List.of(getFilterEquipments(FILTER_ID_1, "filter1", List.of(getIdentifiableAttributes(LOAD_WRONG_ID_1)), List.of())); UUID stubId = wireMockServer.stubFor(WireMock.get(WireMock.urlMatching(getPath(getNetworkUuid()) + "(.+){1}.*")) .willReturn(WireMock.ok() @@ -165,6 +165,33 @@ public void testCreateWithErrors() throws Exception { wireMockUtils.verifyGetRequest(stubId, PATH, handleQueryParams(getNetworkUuid(), filters.stream().map(FilterEquipments::getFilterId).collect(Collectors.toList())), false); } + @Test + public void testCreateAllFiltersWrong() throws Exception { + var filter1 = FilterInfos.builder() + .id(FILTER_ID_1) + .name("filter1") + .build(); + + ByFilterDeletionInfos byFilterDeletionInfos = ByFilterDeletionInfos.builder() + .stashed(false) + .equipmentType("LOAD") + .equipmentFilters(List.of(filter1)) + .build(); + + List filters = List.of(getFilterEquipments(FILTER_ID_1, "filter1", List.of(getIdentifiableAttributes(LOAD_WRONG_ID_1)), List.of(LOAD_WRONG_ID_1))); + + UUID stubId = wireMockServer.stubFor(WireMock.get(WireMock.urlMatching(getPath(getNetworkUuid()) + "(.+){1}.*")) + .willReturn(WireMock.ok() + .withBody(mapper.writeValueAsString(filters)) + .withHeader("Content-Type", "application/json"))).getId(); + + mockMvc.perform(post(getNetworkModificationUri()).content(mapper.writeValueAsString(byFilterDeletionInfos)).contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + assertLogMessage("All of the following filters have equipments with wrong id : filter1", + "allFiltersWrong", reportService); + wireMockUtils.verifyGetRequest(stubId, PATH, handleQueryParams(getNetworkUuid(), filters.stream().map(FilterEquipments::getFilterId).collect(Collectors.toList())), false); + } + @Test @Override public void testCopy() throws Exception { @@ -243,20 +270,21 @@ private List getTestFilters() { IdentifiableAttributes load9 = getIdentifiableAttributes(LOAD_ID_9); IdentifiableAttributes load10 = getIdentifiableAttributes(LOAD_ID_10); - FilterEquipments filter1 = getFilterEquipments(FILTER_ID_1, "filter1", List.of(load1, load2)); - FilterEquipments filter2 = getFilterEquipments(FILTER_ID_2, "filter2", List.of(load3, load4)); - FilterEquipments filter3 = getFilterEquipments(FILTER_ID_3, "filter3", List.of(load5, load6)); - FilterEquipments filter4 = getFilterEquipments(FILTER_ID_4, "filter4", List.of(load7, load8)); - FilterEquipments filter5 = getFilterEquipments(FILTER_ID_5, "filter5", List.of(load9, load10)); + FilterEquipments filter1 = getFilterEquipments(FILTER_ID_1, "filter1", List.of(load1, load2), List.of()); + FilterEquipments filter2 = getFilterEquipments(FILTER_ID_2, "filter2", List.of(load3, load4), List.of()); + FilterEquipments filter3 = getFilterEquipments(FILTER_ID_3, "filter3", List.of(load5, load6), List.of()); + FilterEquipments filter4 = getFilterEquipments(FILTER_ID_4, "filter4", List.of(load7, load8), List.of()); + FilterEquipments filter5 = getFilterEquipments(FILTER_ID_5, "filter5", List.of(load9, load10), List.of()); return List.of(filter1, filter2, filter3, filter4, filter5); } - private FilterEquipments getFilterEquipments(UUID filterID, String filterName, List identifiableAttributes) { + private FilterEquipments getFilterEquipments(UUID filterID, String filterName, List identifiableAttributes, List notFoundEquipments) { return FilterEquipments.builder() .filterId(filterID) .filterName(filterName) .identifiableAttributes(identifiableAttributes) + .notFoundEquipments(notFoundEquipments) .build(); } diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelByFilterDeletionTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelByFilterDeletionTest.java index ace0c717c..2f1820f42 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelByFilterDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelByFilterDeletionTest.java @@ -36,12 +36,12 @@ public class VoltageLevelByFilterDeletionTest extends AbstractNetworkModificationTest { private static final UUID FILTER_ID_1 = UUID.randomUUID(); private static final UUID FILTER_ID_2 = UUID.randomUUID(); - private static final String VOLTAGE_LEVEL_ID_1 = "vl1"; + private static final String VOLTAGE_LEVEL_ID_1 = "v1"; - private static final String VOLTAGE_LEVEL_ID_2 = "vl2"; + private static final String VOLTAGE_LEVEL_ID_2 = "v2"; - private static final String VOLTAGE_LEVEL_ID_3 = "vl3"; - private static final String VOLTAGE_LEVEL_ID_4 = "vl4"; + private static final String VOLTAGE_LEVEL_ID_3 = "v3"; + private static final String VOLTAGE_LEVEL_ID_4 = "v4"; public static final String PATH = "/v1/filters/export"; public static final String VOLTAGE_LEVEL_WRONG_ID_1 = "wrongId1";