review remarks

Signed-off-by: David BRAQUART <david.braquart@rte-france.com>
gridsuite · Jan 29, 2024 · 9419564 · 9419564
1 parent e1cfeb6
commit 9419564
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/...uite/modification/server/entities/equipment/modification/InjectionModificationEntity.java b/...uite/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/...va/org/gridsuite/modification/server/modifications/AbstractInjectionModificationTest.java b/...va/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;
 
@@ -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
@@ -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/...ava/org/gridsuite/modification/server/modifications/ShuntCompensatorModificationTest.java b/...ava/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;