fix tests

Signed-off-by: maissa SOUISSI <maissa.souissi@rte-france.com>
gridsuite · Jan 26, 2024 · 017f16b · 017f16b
1 parent 6d81364
commit 017f16b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/src/main/resources/db/changelog/changesets/changelog_20240126T123545Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240126T123545Z.xml
@@ -0,0 +1,21 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="souissimai (generated)" id="1706272561275-29">
+        <renameColumn tableName="voltage_level_creation_entity"
+                      columnDataType="float(53)"
+                      oldColumnName="nominal_voltage"
+                      newColumnName="nominalv" />
+    </changeSet>
+    <changeSet author="souissimai (generated)" id="1706272561275-30">
+        <renameColumn tableName="voltage_level_modification"
+                      columnDataType="float(53)"
+                      oldColumnName="nominal_voltage"
+                      newColumnName="nominalv" />
+    </changeSet>
+    <changeSet author="souissimai (generated)" id="1706272561275-31">
+        <renameColumn tableName="voltage_level_modification"
+                      columnDataType="float(53)"
+                      oldColumnName="nominal_voltage_op"
+                      newColumnName="nominalv_op" />
+    </changeSet>
+</databaseChangeLog>
diff --git a/...java/org/gridsuite/modification/server/modifications/LineAttachToNewVoltageLevelTest.java b/...java/org/gridsuite/modification/server/modifications/LineAttachToNewVoltageLevelTest.java
@@ -42,7 +42,7 @@ private VoltageLevelCreationInfos getNewVoltageLevel() {
                 .stashed(false)
                 .equipmentId("newVoltageLevel")
                 .equipmentName("NewVoltageLevel")
-                .nominalVoltage(379.3)
+                .nominalV(379.3)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)

diff --git a/...t/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevelTest.java b/...t/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevelTest.java
@@ -63,7 +63,7 @@ protected ModificationInfos buildModificationUpdate() {
                 .stashed(false)
                 .equipmentId("newVoltageLevel")
                 .equipmentName("NewVoltageLevel")
-                .nominalVoltage(379.3)
+                .nominalV(379.3)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)

diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelCreationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelCreationTest.java
@@ -55,7 +55,7 @@ protected ModificationInfos buildModificationUpdate() {
                 .equipmentId("VoltageLevelIdEdited")
                 .equipmentName("VoltageLevelEdited")
                 .substationId("s2")
-                .nominalVoltage(385)
+                .nominalV(385)
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)
                 .ipMin(0.0)

diff --git a/...st/java/org/gridsuite/modification/server/modifications/VoltageLevelModificationTest.java b/...st/java/org/gridsuite/modification/server/modifications/VoltageLevelModificationTest.java
@@ -46,7 +46,7 @@ protected ModificationInfos buildModification() {
                 .stashed(false)
                 .equipmentId("v1")
                 .equipmentName(new AttributeModification<>("test 1", OperationType.SET))
-                .nominalVoltage(new AttributeModification<>(420D, OperationType.SET))
+                .nominalV(new AttributeModification<>(420D, OperationType.SET))
                 .lowVoltageLimit(new AttributeModification<>(30D, OperationType.SET))
                 .highVoltageLimit(new AttributeModification<>(50D, OperationType.SET))
                 .ipMax(new AttributeModification<>(0.8, OperationType.SET))
@@ -60,7 +60,7 @@ protected ModificationInfos buildModificationUpdate() {
                 .stashed(false)
                 .equipmentId("v1Edited")
                 .equipmentName(new AttributeModification<>("test 2", OperationType.SET))
-                .nominalVoltage(new AttributeModification<>(450D, OperationType.SET))
+                .nominalV(new AttributeModification<>(450D, OperationType.SET))
                 .lowVoltageLimit(new AttributeModification<>(40D, OperationType.SET))
                 .highVoltageLimit(new AttributeModification<>(55D, OperationType.SET))
                 .ipMax(new AttributeModification<>(0.9, OperationType.SET))

diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java
@@ -721,7 +721,7 @@ public void testVoltageLevelCreation() {
                 .equipmentId("idVL1")
                 .equipmentName("VLName")
                 .substationId("s1")
-                .nominalVoltage(379.0)
+                .nominalV(379.0)
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)
                 .ipMin(0.0)
@@ -755,7 +755,7 @@ public void testVoltageLevelCreation() {
     private VoltageLevelCreationInfos makeAVoltageLevelInfos() {
 
         VoltageLevelCreationInfos createVoltLvlEntity1 = VoltageLevelCreationInfos.builder()
-                .substationId("s1").nominalVoltage(379.0).equipmentId("idVL1").equipmentName("VLName")
+                .substationId("s1").nominalV(379.0).equipmentId("idVL1").equipmentName("VLName")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)
                 .ipMin(0.0)

diff --git a/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java b/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java
@@ -28,7 +28,7 @@ public static VoltageLevelCreationInfos getCreationVoltageLevel(String substatio
             .equipmentId(voltageLevelId)
             .equipmentName(voltageLevelName)
             .substationId(substationId)
-            .nominalVoltage(379.1)
+            .nominalV(379.1)
             .lowVoltageLimit(0.0)
             .highVoltageLimit(10.0)
             .ipMin(0.0)