Merge pull request #50 from com-pas/fix-busbar-check

Fixed the way a Bay is recognized as Busbar

Author: Flurb

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericBay.java

@@ -7,6 +7,7 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public class GenericBay extends AbstractGenericNameEntity<GenericVoltageLevel> {
     private List<GenericConnectivityNode> connectivityNodes;
@@ -17,7 +18,15 @@ public GenericBay(GenericVoltageLevel parent, Element element) {
     }
 
     public boolean isBusbar() {
-        return getConnectivityNodes().size() == 1;
+        return getConnectivityNodes().size() == 1 && getNrOfChilderen() == 1;
+    }
+
+    private long getNrOfChilderen() {
+        var nodeList = getElement().getChildNodes();
+        return IntStream.range(0, nodeList.getLength())
+                .mapToObj(nodeList::item)
+                .filter(Element.class::isInstance)
+                .count();
     }
 
     public List<GenericConnectivityNode> getConnectivityNodes() {

service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/AbstractGenericEntityTest.java

@@ -37,7 +37,7 @@ void getElementsStream_WhenCallingForKnownElement_ThenReturnElements() {
         var result = entity.getElementsStream("Bay")
                 .collect(Collectors.toList());
 
-        assertEquals(7, result.size());
+        assertEquals(8, result.size());
     }
 
     @Test

service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericBayTest.java

@@ -20,16 +20,17 @@ class GenericBayTest {
     public static final String BAY_NAME = "Bay A";
     public static final String BUSBAR_NAME = "BusBar A";
 
+    private GenericVoltageLevel voltageLevel;
     private GenericBay bay;
     private GenericBay busbar;
 
     @BeforeEach
     void setup() throws IOException {
         var scl = new GenericSCL(readSCLElement(BASIC_SCD_FILENAME));
         var substation = scl.getSubstation(SUBSTATION_NAME).get();
-        var voltageLevel = substation.getVoltageLevel(VOLTAGE_LEVEL_NAME).get();
+        voltageLevel = substation.getVoltageLevel(VOLTAGE_LEVEL_NAME).get();
         busbar = voltageLevel.getBays().get(0);
-        bay = voltageLevel.getBays().get(2);
+        bay = voltageLevel.getBays().get(3);
     }
 
     @Test
@@ -44,6 +45,20 @@ void constructorBay_WhenCreated_ThenElementSet() {
         assertEquals(BAY_NAME, bay.getName());
     }
 
+    @Test
+    void isBusbar_WhenCalledOnAllBays_ThenExpectedResult() {
+        var bayNr = 0;
+        for (var bayOrBusbar : voltageLevel.getBays()) {
+            // First 2 bays are Busbars, others are Bays.
+            if (bayNr <= 1) {
+                assertTrue(bayOrBusbar.isBusbar());
+            } else {
+                assertFalse(bayOrBusbar.isBusbar());
+            }
+            bayNr++;
+        }
+    }
+
     @Test
     void isBusbar_WhenCalledOnBusbar_ThenTrueReturned() {
         assertTrue(busbar.isBusbar());

service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericConductingEquipmentTest.java

@@ -26,7 +26,7 @@ void setup() throws IOException {
         var scl = new GenericSCL(readSCLElement(BASIC_SCD_FILENAME));
         var substation = scl.getSubstation(SUBSTATION_NAME).get();
         var voltageLevel = substation.getVoltageLevel(VOLTAGE_LEVEL_NAME).get();
-        var bay = voltageLevel.getBays().get(2);
+        var bay = voltageLevel.getBays().get(3);
         conductingEquipment = bay.getConductingEquipments().get(0);
     }
 

service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericConnectivityNodeTest.java

@@ -25,7 +25,7 @@ void setup() throws IOException {
         var scl = new GenericSCL(readSCLElement(BASIC_SCD_FILENAME));
         var substation = scl.getSubstation(SUBSTATION_NAME).get();
         var voltageLevel = substation.getVoltageLevel(VOLTAGE_LEVEL_NAME).get();
-        var bay = voltageLevel.getBays().get(2);
+        var bay = voltageLevel.getBays().get(3);
         connectivityNode = bay.getConnectivityNodes().get(0);
     }
 

service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericTerminalTest.java

@@ -25,7 +25,7 @@ void setup() throws IOException {
         var scl = new GenericSCL(readSCLElement(BASIC_SCD_FILENAME));
         var substation = scl.getSubstation(SUBSTATION_NAME).get();
         var voltageLevel = substation.getVoltageLevel(VOLTAGE_LEVEL_NAME).get();
-        var bay = voltageLevel.getBays().get(2);
+        var bay = voltageLevel.getBays().get(3);
         var conductingEquipment = bay.getConductingEquipments().get(0);
         terminal = conductingEquipment.getTerminals().get(0);
     }

service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericVoltageLevelTest.java

@@ -58,8 +58,8 @@ void getBays_WhenCalled_ThenVoltageLevelsReturned() {
         var result = voltageLevel.getBays();
 
         assertNotNull(result);
-        assertEquals(7, result.size());
+        assertEquals(8, result.size());
         assertEquals(BUSBAR_NAME, result.get(0).getName());
-        assertEquals(BAY_NAME, result.get(2).getName());
+        assertEquals(BAY_NAME, result.get(3).getName());
     }
 }

service/src/test/resources/scl/scl-1.scd

@@ -21,6 +21,17 @@
             <Bay sxy:x="1" sxy:y="2" name="BusBar B">
                 <ConnectivityNode pathName="AA1/J1/BusBar B/L1" name="L1"/>
             </Bay>
+            <Bay name="Bay 1S" sxy:x="2" sxy:y="8">
+                <ConductingEquipment name="CBR1" sxy:x="1" sxy:y="1" type="CBR">
+                    <Terminal cNodeName="L1" connectivityNode="AA1/J1/BusBar B/L1" name="T4"/>
+                    <Terminal cNodeName="CN1" connectivityNode="AA1/J1/Bay 1S/CN1" name="T3"/>
+                </ConductingEquipment>
+                <ConductingEquipment name="CBR2" sxy:x="4" sxy:y="1" type="CBR">
+                    <Terminal cNodeName="L1" connectivityNode="AA1/J1/BusBar A/L1" name="T1"/>
+                    <Terminal cNodeName="CN1" connectivityNode="AA1/J1/Bay 1S/CN1" name="T2"/>
+                </ConductingEquipment>
+                <ConnectivityNode name="CN1" pathName="AA1/J1/Bay 1S/CN1"/>
+            </Bay>
             <Bay sxy:x="1" sxy:y="6" name="Bay A" desc="Feld A">
                 <ConductingEquipment type="DIS" sxy:x="1" sxy:y="1" name="QB1">
                     <Terminal name="T1" connectivityNode="AA1/J1/BusBar B/L1" substationName="AA1" voltageLevelName="J1" bayName="BusBar B" cNodeName="L1" txy:actTerm="1"/>