diff --git a/pom.xml b/pom.xml index 79c065305..2666345fa 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 1.0.5 5.0.0-alpha.14 - 0.20.0 + 0.21.0-SNAPSHOT org.gridsuite.modification.server **/migration/**/* gridsuite diff --git a/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java index d695453db..396169c89 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java @@ -12,6 +12,7 @@ import com.powsybl.iidm.network.ReactiveCapabilityCurve; import com.powsybl.iidm.network.ReactiveLimitsKind; import com.powsybl.iidm.network.extensions.ActivePowerControl; +import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.*; import org.gridsuite.modification.server.dto.NetworkModificationsResult; import org.gridsuite.modification.server.utils.NetworkCreation; @@ -28,8 +29,7 @@ import static org.gridsuite.modification.server.report.NetworkModificationServerReportResourceBundle.ERROR_MESSAGE_KEY; import static org.gridsuite.modification.server.utils.TestUtils.assertLogMessage; import static org.gridsuite.modification.server.utils.assertions.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -351,4 +351,14 @@ void testDisconnection() throws Exception { void testConnection() throws Exception { assertChangeConnectionState(getNetwork().getBattery("v3Battery"), true); } + + @Test + void testConnectionError() { + getNetwork().getSwitch("v3dBattery").setOpen(true); + BatteryModificationInfos batteryModificationInfos = new BatteryModificationInfos(); + batteryModificationInfos.setEquipmentId("v3Battery"); + batteryModificationInfos.setTerminalConnected(new AttributeModification<>(true, OperationType.SET)); + String message = assertThrows(NetworkModificationException.class, () -> batteryModificationInfos.toModification().apply(getNetwork())).getMessage(); + assertEquals("INJECTION_MODIFICATION_ERROR : Could not connect equipment 'v3Battery'", message); + } } diff --git a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java index bc684a385..119e5483f 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java @@ -824,7 +824,7 @@ void testChangeConnectionStatus() throws Exception { changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.ONE, true, true, null); changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.ONE, true, false, null); changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, true, null); - changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, false, "Could not disconnect equipment 'trf2'"); + changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, false, "Could not disconnect equipment 'trf2' on side 2"); } private void changeConnectionState(TwoWindingsTransformer existingEquipment, TwoSides side, boolean actualState, boolean expectedState, String errorMessage) throws Exception {