diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java b/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java index a2d8a2f39..452ba52c3 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java @@ -149,6 +149,7 @@ private boolean checkIfChangeRequestedOnDropActiveControl() { && modificationInfos.getDroop() == null && modificationInfos.getP0() == null; } + private void hvdcAngleDroopActivePowerControlAdder(HvdcLine hvdcLine, Reporter subReporter) { List reports = new ArrayList<>(); diff --git a/src/main/resources/db/changelog/changesets/changelog_20240119T121902Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240130T081725Z.xml similarity index 58% rename from src/main/resources/db/changelog/changesets/changelog_20240119T121902Z.xml rename to src/main/resources/db/changelog/changesets/changelog_20240130T081725Z.xml index 3a8c89a41..c21323347 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20240119T121902Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20240130T081725Z.xml @@ -1,12 +1,14 @@ - + + + @@ -28,7 +30,7 @@ - + @@ -41,7 +43,7 @@ - + @@ -73,26 +75,64 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + - + - + - - - - - - - diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index 8359c3f77..219bfdcb3 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -247,5 +247,5 @@ databaseChangeLog: file: changesets/changelog_20240119T151936Z.xml relativeToChangelogFile: true - include: - file: changesets/changelog_20240119T121902Z.xml + file: changesets/changelog_20240130T081725Z.xml relativeToChangelogFile: true diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VscModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VscModificationTest.java index 41c2d14bd..2c33c9994 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VscModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VscModificationTest.java @@ -235,23 +235,6 @@ public void testUnchangedHVDCngleDroopActivePowerControl() throws Exception { Assert.assertTrue(activePowerControl.isEnabled()); } - @Test - public void testNoHVDCngleDroopActivePowerControlExtention() throws Exception { - var networkuuid = UUID.randomUUID(); - Network networkWitoutExt = NetworkCreation.createWithVSC(networkuuid, false); - VscModificationInfos modificationInfos = (VscModificationInfos) buildModification(); - modificationInfos.setAngleDroopActivePowerControl(new AttributeModification<>(null, OperationType.SET)); - modificationInfos.setDroop(new AttributeModification<>(null, OperationType.SET)); - modificationInfos.setP0(new AttributeModification<>(null, OperationType.SET)); - VscModification vscModification = new VscModification(modificationInfos); - Reporter subReporter = new Reporter.NoOpImpl(); - ComputationManager computationManager = new LocalComputationManager(); - vscModification.apply(networkWitoutExt, true, computationManager, subReporter); - HvdcLine hvdcLine = networkWitoutExt.getHvdcLine("hvdcLine"); - HvdcAngleDroopActivePowerControl activePowerControl = hvdcLine.getExtension(HvdcAngleDroopActivePowerControl.class); - assertNull(activePowerControl); - } - @Override @SneakyThrows protected void testUpdateModificationMessage(ModificationInfos modificationInfos) {