Updated unittest to validate XY Coordinates.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

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

@@ -35,11 +35,13 @@ void enrich_WhenPassingCase1_ThenSCDUpdated() throws Exception {
         writeFile(filename + "-updated.scd", scl);
 
         assertXYCoordinates(scl.getElement(), "//scl:VoltageLevel[@name='J1']", 2, 4);
-        assertXYCoordinates(scl.getElement(), "//scl:Bay[@name='BusBar A']", 1, 15);
+        assertXYCoordinates(scl.getElement(), "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='BusBar A']", 1, 15);
+        assertXYCoordinates(scl.getElement(), "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='Bay 1S']", 2, 13);
+        assertXYCoordinates(scl.getElement(), "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='Bay 1S']/scl:ConductingEquipment[@name='CBR1']", 1, 1);
     }
 
     @Test
-    void enrich_WhenPassingCase2_ThenSCDUpdated() throws IOException {
+    void enrich_WhenPassingCase2_ThenSCDUpdated() throws Exception {
         // The JSON file used here is a copy created by the testcase
         // SclAutoAlignmentServiceTest#createJson_WhenPassingCase2_ThenJsonReturned
         var filename = "scl-2";
@@ -51,6 +53,12 @@ void enrich_WhenPassingCase2_ThenSCDUpdated() throws IOException {
 
         assertNotNull(scl.getElement());
         writeFile(filename + "-updated.scd", scl);
+
+        assertXYCoordinates(scl.getElement(), "//scl:PowerTransformer[@name='T4']", 27, 3);
+        assertXYCoordinates(scl.getElement(), "//scl:VoltageLevel[@name='S1 380kV']", 2, 7);
+        assertXYCoordinates(scl.getElement(), "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BUSBAR10']", 1, 12);
+        assertXYCoordinates(scl.getElement(), "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BAY_T4_2']", 1, 4);
+        assertXYCoordinates(scl.getElement(), "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BAY_T4_2']/scl:ConductingEquipment[@name='BREAKER25']", 1, 4);
     }
 
     private Element readSCLElement(String filename) throws IOException {

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

@@ -38,7 +38,9 @@ void updateSCL_WhenPassingCase1_ThenUpdatedSCLReturned() throws Exception {
 
         var rootElement = toElement(result);
         assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']", 2, 4);
-        assertXYCoordinates(rootElement, "//scl:Bay[@name='BusBar A']", 1, 15);
+        assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='BusBar A']", 1, 15);
+        assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='Bay 1S']", 2, 13);
+        assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='Bay 1S']/scl:ConductingEquipment[@name='CBR1']", 1, 1);
     }
 
     @Test
@@ -49,6 +51,13 @@ void updateSCL_WhenPassingCase2_ThenUpdatedSCLReturned() throws Exception {
         var result = sclAutoAlignmentService.updateSCL(sclString, List.of("_af9a4ae3-ba2e-4c34-8e47-5af894ee20f4"), "Mr. Editor");
         assertNotNull(result);
         writeFile(filename + "-updated-service.scd", result);
+
+        var rootElement = toElement(result);
+        assertXYCoordinates(rootElement, "//scl:PowerTransformer[@name='T4']", 27, 3);
+        assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']", 2, 7);
+        assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BUSBAR10']", 1, 12);
+        assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BAY_T4_2']", 1, 4);
+        assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BAY_T4_2']/scl:ConductingEquipment[@name='BREAKER25']", 1, 4);
     }
 
     @Test