diff --git a/pom.xml b/pom.xml
index 22deb4716..8f99bea43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,8 @@
**/migration/**/*
gridsuite
org.gridsuite:network-modification-server
- 0.63.0
+
+ 0.64.0
1.38.0
@@ -106,6 +107,12 @@
powsybl-network-store-model
${network-store-client.version}
+
+
+ org.gridsuite
+ gridsuite-network-modification
+ ${network-modification.version}
+
@@ -143,7 +150,6 @@
org.gridsuite
gridsuite-network-modification
- ${network-modification.version}
com.powsybl
diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/GeneratorModificationByAssignmentTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/GeneratorModificationByAssignmentTest.java
index 33f42e05c..db6878ebf 100644
--- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/GeneratorModificationByAssignmentTest.java
+++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/GeneratorModificationByAssignmentTest.java
@@ -78,7 +78,7 @@ protected void createEquipments() {
getNetwork().getGenerator(GENERATOR_ID_2)
.setTargetP(200)
.setMaxP(2000)
- .setMinP(50)
+ .setMinP(10)
.setTargetV(10)
.setTargetQ(20)
.newExtension(GeneratorStartupAdder.class)
@@ -214,7 +214,7 @@ protected List> getAssignmentInfos() {
DoubleAssignmentInfos assignmentInfos10 = DoubleAssignmentInfos.builder()
.editedField(GeneratorField.MAXIMUM_ACTIVE_POWER.name())
- .value(50.)
+ .value(300.)
.filters(List.of(filter1, filter2, filter3, filter4, filter5))
.build();
@@ -291,7 +291,7 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(0.1, generatorStartup1.getPlannedOutageRate(), 0);
assertEquals(0.05, generatorStartup1.getForcedOutageRate(), 0);
assertEquals(10, generatorStartup1.getPlannedActivePowerSetpoint(), 0);
- assertEquals(50, generator1.getMaxP(), 0);
+ assertEquals(300., generator1.getMaxP(), 0);
assertEquals(2, generator1.getMinP(), 0);
assertEquals(true, generator1.isVoltageRegulatorOn());
@@ -304,7 +304,7 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(0.1, generatorStartup2.getPlannedOutageRate(), 0);
assertEquals(0.05, generatorStartup2.getForcedOutageRate(), 0);
assertEquals(10, generatorStartup2.getPlannedActivePowerSetpoint(), 0);
- assertEquals(50, generator2.getMaxP(), 0);
+ assertEquals(300, generator2.getMaxP(), 0);
assertEquals(2, generator2.getMinP(), 0);
Generator generator3 = getNetwork().getGenerator(GENERATOR_ID_3);
@@ -313,7 +313,7 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(300, generator3.getTargetP(), 0);
assertEquals(0.2, generatorShortCircuit3.getDirectTransX(), 0);
assertEquals(0.3, generatorShortCircuit3.getStepUpTransformerX(), 0);
- assertEquals(50, generator3.getMaxP(), 0);
+ assertEquals(300, generator3.getMaxP(), 0);
assertEquals(2, generator3.getMinP(), 0);
Generator generator4 = getNetwork().getGenerator(GENERATOR_ID_4);
@@ -322,19 +322,19 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(0.2, generatorShortCircuit4.getDirectTransX(), 0);
assertEquals(0.3, generatorShortCircuit4.getStepUpTransformerX(), 0);
assertEquals(400, generator4.getTargetP(), 0);
- assertEquals(50, generator4.getMaxP(), 0);
+ assertEquals(700, generator4.getMaxP(), 0);
assertEquals(2, generator4.getMinP(), 0);
Generator generator5 = getNetwork().getGenerator(GENERATOR_ID_5);
ActivePowerControl activePowerControl5 = generator5.getExtension(ActivePowerControl.class);
assertNotNull(activePowerControl5);
- assertEquals(50, generator5.getMaxP(), 0);
+ assertEquals(300, generator5.getMaxP(), 0);
assertEquals(2, activePowerControl5.getDroop(), 0);
Generator generator6 = getNetwork().getGenerator(GENERATOR_ID_6);
ActivePowerControl activePowerControl6 = generator6.getExtension(ActivePowerControl.class);
assertNotNull(activePowerControl6);
- assertEquals(50, generator6.getMaxP(), 0);
+ assertEquals(300, generator6.getMaxP(), 0);
assertEquals(2, activePowerControl6.getDroop(), 0);
Generator generator7 = getNetwork().getGenerator(GENERATOR_ID_7);
@@ -379,7 +379,7 @@ protected void assertAfterNetworkModificationDeletion() {
assertEquals(0.55, generatorStartup2.getForcedOutageRate(), 0);
assertEquals(40, generatorStartup2.getPlannedActivePowerSetpoint(), 0);
assertEquals(2000, generator2.getMaxP(), 0);
- assertEquals(50, generator2.getMinP(), 0);
+ assertEquals(10, generator2.getMinP(), 0);
Generator generator3 = getNetwork().getGenerator(GENERATOR_ID_3);
GeneratorShortCircuit generatorShortCircuit3 = generator3.getExtension(GeneratorShortCircuit.class);
diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/GeneratorByFormulaModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/GeneratorByFormulaModificationTest.java
index 0f38782a8..b46fd28ec 100644
--- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/GeneratorByFormulaModificationTest.java
+++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/GeneratorByFormulaModificationTest.java
@@ -305,7 +305,7 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(0.055, generatorStartup2.getForcedOutageRate(), 0);
assertEquals(50, generatorStartup2.getPlannedActivePowerSetpoint(), 0);
assertEquals(2002, generator2.getMaxP(), 0);
- assertEquals(100, generator2.getMinP(), 0);
+ assertEquals(50, generator2.getMinP(), 0);
Generator generator3 = getNetwork().getGenerator(GENERATOR_ID_3);
GeneratorShortCircuit generatorShortCircuit3 = generator3.getExtension(GeneratorShortCircuit.class);
diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java
index e068800a2..c1c3e306e 100644
--- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java
+++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java
@@ -245,7 +245,7 @@ protected void assertAfterNetworkModificationCreation() {
assertTrue(Double.isNaN(getNetwork().getVoltageLevel(VOLTAGE_LEVEL_ID_7).getLowVoltageLimit()));
assertTrue(Double.isNaN(getNetwork().getVoltageLevel(VOLTAGE_LEVEL_ID_7).getHighVoltageLimit()));
- assertLogMessageWithoutRank("Cannot modify equipment v7 : At least one of the value or referenced field is not a number", REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_NAN, reportService);
+ assertLogMessageWithoutRank("Cannot modify equipment v7 : At least one of the value or referenced field is missing", REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_MISSING, reportService);
assertLogMessageWithoutRank("Cannot modify equipment v7 : The value or referenced field of the second operand in the division operator is zero", REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_ZERO, reportService);
assertLogMessageWithoutRank("Some of the equipment have been modified : 14 equipment(s) modified and 5 equipment(s) not modified", REPORT_KEY_BY_FILTER_MODIFICATION_SOME, reportService);
}