Rename equipment in iMeasurement in CurrentLimitAutomatonGroovyExtens…

…ion (#240) * Rename in CurrentLimitAutomatonGroovyExtension & CurrentLimitTwoLevelsAutomatonGroovyExtension : - equipment -> iMeasurement - side -> iMeasurementSide - equipment2 -> iMeasurement2 - side2 -> iMeasurement2Side * Fixes UT Signed-off-by: lisrte <laurent.issertial@rte-france.com>
powsybl · Jun 9, 2023 · 36496c8 · 36496c8
1 parent c439ba3
commit 36496c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/...n/groovy/com/powsybl/dynawaltz/dsl/automatons/CurrentLimitAutomatonGroovyExtension.groovy b/...n/groovy/com/powsybl/dynawaltz/dsl/automatons/CurrentLimitAutomatonGroovyExtension.groovy
@@ -43,8 +43,8 @@ class CurrentLimitAutomatonGroovyExtension extends AbstractPureDynamicGroovyExte
     static class CurrentLimitAutomatonBuilder extends AbstractPureDynamicModelBuilder {
 
         Network network
-        Branch<? extends Branch> equipment
-        Side side
+        Branch<? extends Branch> iMeasurement
+        Side iMeasurementSide
         Branch<? extends Branch> controlledEquipment
         String lib
 
@@ -54,14 +54,14 @@ class CurrentLimitAutomatonGroovyExtension extends AbstractPureDynamicGroovyExte
         }
 
         void iMeasurement(String staticId) {
-            equipment = network.getBranch(staticId)
-            if (equipment == null) {
-                throw new DslException("Equipment ${staticId} is not a quadripole")
+            iMeasurement = network.getBranch(staticId)
+            if (iMeasurement == null) {
+                throw new DslException("I measurement equipment ${staticId} is not a quadripole")
             }
         }
 
         void iMeasurementSide(Branch.Side side) {
-            this.side = SideConverter.convert(side)
+            this.iMeasurementSide = SideConverter.convert(side)
         }
 
         void controlledQuadripole(String staticId) {
@@ -74,10 +74,10 @@ class CurrentLimitAutomatonGroovyExtension extends AbstractPureDynamicGroovyExte
         @Override
         void checkData() {
             super.checkData()
-            if (!equipment) {
+            if (!iMeasurement) {
                 throw new DslException("'iMeasurement' field is not set")
             }
-            if (!side) {
+            if (!iMeasurementSide) {
                 throw new DslException("'iMeasurementSide' field is not set")
             }
             if (!controlledEquipment) {
@@ -88,7 +88,7 @@ class CurrentLimitAutomatonGroovyExtension extends AbstractPureDynamicGroovyExte
         @Override
         CurrentLimitAutomaton build() {
             checkData()
-            new CurrentLimitAutomaton(dynamicModelId, parameterSetId, equipment, side, controlledEquipment, lib)
+            new CurrentLimitAutomaton(dynamicModelId, parameterSetId, iMeasurement, iMeasurementSide, controlledEquipment, lib)
         }
     }
 }
diff --git a/...com/powsybl/dynawaltz/dsl/automatons/CurrentLimitTwoLevelsAutomatonGroovyExtension.groovy b/...com/powsybl/dynawaltz/dsl/automatons/CurrentLimitTwoLevelsAutomatonGroovyExtension.groovy
@@ -39,8 +39,8 @@ class CurrentLimitTwoLevelsAutomatonGroovyExtension extends AbstractPureDynamicG
 
     static class CurrentLimitAutomatonTwoLevelBuilder extends CurrentLimitAutomatonGroovyExtension.CurrentLimitAutomatonBuilder {
 
-        Branch<? extends Branch> equipment2
-        Side side2
+        Branch<? extends Branch> iMeasurement2
+        Side iMeasurement2Side
 
         CurrentLimitAutomatonTwoLevelBuilder(Network network, String lib) {
             super(network, lib)
@@ -55,31 +55,31 @@ class CurrentLimitTwoLevelsAutomatonGroovyExtension extends AbstractPureDynamicG
         }
 
         void iMeasurement2(String staticId) {
-            equipment2 = network.getBranch(staticId)
-            if (!equipment2) {
+            iMeasurement2 = network.getBranch(staticId)
+            if (!iMeasurement2) {
                 throw new DslException("Equipment ${staticId} is not a quadripole")
             }
         }
 
         void iMeasurement2Side(Branch.Side side) {
-            this.side2 = SideConverter.convert(side)
+            this.iMeasurement2Side = SideConverter.convert(side)
         }
 
         @Override
         void checkData() {
             super.checkData()
-            if (!equipment2) {
+            if (!iMeasurement2) {
                 throw new DslException("'iMeasurement2' field is not set")
             }
-            if (!side2) {
+            if (!iMeasurement2Side) {
                 throw new DslException("'iMeasurement2Side' field is not set")
             }
         }
 
         @Override
         CurrentLimitTwoLevelsAutomaton build() {
             checkData()
-            new CurrentLimitTwoLevelsAutomaton(dynamicModelId, parameterSetId, equipment, side, equipment2, side2, controlledEquipment, lib)
+            new CurrentLimitTwoLevelsAutomaton(dynamicModelId, parameterSetId, iMeasurement, iMeasurementSide, iMeasurement2, iMeasurement2Side, controlledEquipment, lib)
         }
     }
 }
diff --git a/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java b/dynawaltz-dsl/src/test/java/com/powsybl/dynawaltz/dsl/DynamicModelsSupplierTest.java
@@ -127,7 +127,7 @@ private static Stream<Arguments> provideAutomatonModelData() {
 
     private static Stream<Arguments> provideExceptionsModel() {
         return Stream.of(
-                Arguments.of("currentLimitQuadripoleException", EurostagTutorialExample1Factory.create(), "Equipment NGEN is not a quadripole"),
+                Arguments.of("currentLimitQuadripoleException", EurostagTutorialExample1Factory.create(), "I measurement equipment NGEN is not a quadripole"),
                 Arguments.of("currentLimitMissingControlledException", EurostagTutorialExample1Factory.create(), "'controlledEquipment' field is not set"),
                 Arguments.of("phaseShifterTransformerException", EurostagTutorialExample1Factory.create(), "Transformer static id unknown: NGEN"),
                 Arguments.of("tapChangerBusException", EurostagTutorialExample1Factory.create(), "Bus static id unknown: LOAD"),