Updated OpenSCD and some Robot Tests.

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

Author: Dennis Labordus

compas/docker-compose-basex.yml

@@ -144,7 +144,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.18.0.0"
+    image: "lfenergy/compas-open-scd:v0.18.0.1"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
       interval: 30s

compas/docker-compose-postgresql.yml

@@ -151,7 +151,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.18.0.0"
+    image: "lfenergy/compas-open-scd:v0.18.0.1"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
       interval: 30s

integration-testing/TestSuite002-versions-compas.robot

@@ -9,6 +9,10 @@ Resource        ./include/general-compas.robot
 Test Setup      Initialize and Start OpenSCD
 Test Teardown   Make screenshot and Stop OpenSCD
 
+*** Variables ***
+# Variables of Selectors commonly used.
+${compas-versions-editor-selector}  oscd-plugin932e8e83a469de68
+
 *** Keywords ***
 Upload new version
     [Arguments]                 ${changeType}   ${name}   ${type}
@@ -42,6 +46,7 @@ Initialize Versions
     IF                  ${create-multiple-versions} == True
     Open Menu           Save project
     Update in CoMPAS    MAJOR   ${sclname}   ${scltype}   2.0.0
+    Select Tab          CoMPAS Versions
     Get Element Count   ${compas-versions-editor-selector} mwc-list > mwc-check-list-item   ==  2
     END
 

integration-testing/TestSuite004-auto-alignment.robot

@@ -10,10 +10,12 @@ Test Setup      Initialize and Start OpenSCD
 Test Teardown   Make screenshot and Stop OpenSCD
 
 *** Variables ***
-${substation1}                  _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4
-${substation1VoltageLevel}      ${substation1}>S1 110kV
-${substation3}                  _974565b1-ac55-4901-9f48-afc7ef5486df
-${substation3VoltageLevel}      ${substation3}>S3 110kV
+${single-line-diagram-selector}   oscd-plugin631642fb644970bc
+
+${substation1}                    _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4
+${substation1VoltageLevel}        ${substation1}>S1 110kV
+${substation3}                    _974565b1-ac55-4901-9f48-afc7ef5486df
+${substation3VoltageLevel}        ${substation3}>S3 110kV
 
 *** Keywords ***
 Execute SCL Auto Alignment
@@ -29,14 +31,14 @@ Execute SCL Auto Alignment
 Select SLD Substation
     [Arguments]         ${id}
     # First click on the selectbox to open the dropdown box, to make the values visible.
-    Click               single-line-diagram-plugin mwc-select[id="substationSelector"]
+    Click               ${single-line-diagram-selector} mwc-select[id="substationSelector"]
     # Now we can select the correct substation.
-    Click               single-line-diagram-plugin mwc-select[id="substationSelector"] > mwc-list-item[value="${id}"]
+    Click               ${single-line-diagram-selector} mwc-select[id="substationSelector"] > mwc-list-item[value="${id}"]
 
 Check X/Y Coordinates
     [Arguments]         ${id}   ${x}    ${y}
-    Get Attribute       single-line-diagram-plugin svg g[id="${id}"]   sxy:x   ==  ${x}
-    Get Attribute       single-line-diagram-plugin svg g[id="${id}"]   sxy:y   ==  ${y}
+    Get Attribute       ${single-line-diagram-selector} svg g[id="${id}"]   sxy:x   ==  ${x}
+    Get Attribute       ${single-line-diagram-selector} svg g[id="${id}"]   sxy:y   ==  ${y}
 
 *** Test Cases ***
 TestCase004-01

integration-testing/include/general-compas.robot

@@ -7,10 +7,6 @@ Documentation   Generic variables and Keywords to work with the OpenSCD CoMPAS C
 Resource        ./general-config.robot
 Resource        ./general-openscd.robot
 
-*** Variables ***
-# Variables of Selectors commonly used.
-${compas-versions-editor-selector}  compas-versions-plugin
-
 *** Keywords ***
 Open from CoMPAS
     [Arguments]                 ${name}   ${type}   ${expectedVersion}