From 4c90bf324197fafdf6edc33d90029254f6f0e93a Mon Sep 17 00:00:00 2001 From: David BRAQUART Date: Mon, 29 Jan 2024 15:19:06 +0100 Subject: [PATCH] review remarks Signed-off-by: David BRAQUART --- .../modification/InjectionModificationEntity.java | 8 +++++++- .../AbstractInjectionModificationTest.java | 15 ++++++++------- .../modifications/LineModificationTest.java | 14 +++++++------- .../ShuntCompensatorModificationTest.java | 7 +++++-- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/InjectionModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/InjectionModificationEntity.java index f451f80ca..4ad4b5324 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/InjectionModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/InjectionModificationEntity.java @@ -6,7 +6,13 @@ */ package org.gridsuite.modification.server.entities.equipment.modification; -import jakarta.persistence.*; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.MappedSuperclass; import lombok.Getter; import lombok.NoArgsConstructor; import org.gridsuite.modification.server.dto.InjectionModificationInfos; diff --git a/src/test/java/org/gridsuite/modification/server/modifications/AbstractInjectionModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/AbstractInjectionModificationTest.java index f4de6451c..f4121db9c 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/AbstractInjectionModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/AbstractInjectionModificationTest.java @@ -9,9 +9,10 @@ import com.powsybl.iidm.network.Injection; import org.gridsuite.modification.server.dto.*; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.springframework.http.MediaType; + +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -21,11 +22,11 @@ @Tag("IntegrationTest") public abstract class AbstractInjectionModificationTest extends AbstractNetworkModificationTest { - protected void assertChangeConnectionState(Injection existingEquipment, boolean expectedState) throws Exception { + void assertChangeConnectionState(Injection existingEquipment, boolean expectedState) throws Exception { assertChangeConnectionState(existingEquipment, (InjectionModificationInfos) buildModification(), expectedState); } - protected void assertChangeConnectionState(Injection existingEquipment, InjectionModificationInfos modificationInfos, boolean expectedState) throws Exception { + void assertChangeConnectionState(Injection existingEquipment, InjectionModificationInfos modificationInfos, boolean expectedState) throws Exception { modificationInfos.setConnected(new AttributeModification<>(expectedState, OperationType.SET)); if (expectedState) { @@ -37,17 +38,17 @@ protected void assertChangeConnectionState(Injection existingEquipment, Injec existingEquipment.getTerminal().connect(); } } - Assertions.assertEquals(!expectedState, existingEquipment.getTerminal().isConnected()); + assertThat(existingEquipment.getTerminal().isConnected()).isNotEqualTo(expectedState); String modificationInfosJson = mapper.writeValueAsString(modificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationInfosJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()); - // connection state has changed - Assertions.assertEquals(expectedState, existingEquipment.getTerminal().isConnected()); + // connection state has changed as expected + assertThat(existingEquipment.getTerminal().isConnected()).isEqualTo(expectedState); // try to modify again => no change on connection state mockMvc.perform(post(getNetworkModificationUri()).content(modificationInfosJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()); - Assertions.assertEquals(expectedState, existingEquipment.getTerminal().isConnected()); + assertThat(existingEquipment.getTerminal().isConnected()).isEqualTo(expectedState); } } diff --git a/src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java index 43d170ea9..368738dcb 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java @@ -388,20 +388,20 @@ private void changeLineConnectionState(Line existingEquipment, boolean expectedS existingEquipment.getTerminal2().connect(); } } - assertEquals(!expectedState, existingEquipment.getTerminal1().isConnected()); - assertEquals(!expectedState, existingEquipment.getTerminal2().isConnected()); + assertThat(existingEquipment.getTerminal1().isConnected()).isNotEqualTo(expectedState); + assertThat(existingEquipment.getTerminal2().isConnected()).isNotEqualTo(expectedState); String modificationInfosJson = mapper.writeValueAsString(modificationInfos); mockMvc.perform(post(getNetworkModificationUri()).content(modificationInfosJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()); - // connection state has changed - assertEquals(expectedState, existingEquipment.getTerminal1().isConnected()); - assertEquals(expectedState, existingEquipment.getTerminal2().isConnected()); + // connection state has changed as expected + assertThat(existingEquipment.getTerminal1().isConnected()).isEqualTo(expectedState); + assertThat(existingEquipment.getTerminal2().isConnected()).isEqualTo(expectedState); // try to modify again => no change on connection state mockMvc.perform(post(getNetworkModificationUri()).content(modificationInfosJson).contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()); - assertEquals(expectedState, existingEquipment.getTerminal1().isConnected()); - assertEquals(expectedState, existingEquipment.getTerminal2().isConnected()); + assertThat(existingEquipment.getTerminal1().isConnected()).isEqualTo(expectedState); + assertThat(existingEquipment.getTerminal2().isConnected()).isEqualTo(expectedState); } } diff --git a/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java index 04de45588..6b3c2c834 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java @@ -8,7 +8,9 @@ package org.gridsuite.modification.server.modifications; import com.fasterxml.jackson.core.type.TypeReference; -import com.powsybl.iidm.network.*; +import com.powsybl.iidm.network.Network; +import com.powsybl.iidm.network.ShuntCompensatorLinearModel; +import com.powsybl.iidm.network.VoltageLevel; import com.powsybl.iidm.network.extensions.ConnectablePosition; import lombok.SneakyThrows; import org.gridsuite.modification.server.NetworkModificationException; @@ -25,7 +27,8 @@ import static org.gridsuite.modification.server.NetworkModificationException.Type.SHUNT_COMPENSATOR_NOT_FOUND; import static org.gridsuite.modification.server.utils.NetworkUtil.createShuntCompensator; import static org.gridsuite.modification.server.utils.TestUtils.assertLogMessage; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;