Merge branch 'main' into refactor_aws_gh_actions

Author: pascalwilbrink

compas/docker-compose-postgresql.yml

@@ -100,7 +100,7 @@ services:
   scl-auto-alignment:
     labels:
       compas: true
-    image: "lfenergy/compas-scl-auto-alignment:0.4.2"
+    image: "lfenergy/compas-scl-auto-alignment:0.5.0"
     ports:
       - "9092:8080"
     environment:
@@ -151,7 +151,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.29.0.1"
+    image: "lfenergy/compas-open-scd:v0.33.0.5"
     depends_on:
       - scl-data-service
       - cim-mapping

integration-testing/TestSuite001-basic-compas.robot

@@ -103,6 +103,7 @@ TestCase001-06
     Save version to CoMPAS   MINOR   ${sclname}   ${scltype}   1.1.0
 
 TestCase001-11
+    skip
     [Documentation]     Trying saving local file to CoMPAS (Rest) with invalid name
     # First we will open the local file to be saved.
     Open Menu           Open project
@@ -166,6 +167,7 @@ TestCase001-52
     Get Text            ${substation-editor-selector} section > h1:has-text("Sub1")
 
 TestCase001-61
+    skip
     [Documentation]     Trying saving local file to CoMPAS (Websocket) with invalid name
     # First we will open the local file to be saved.
     Change Websockets setting   True

integration-testing/TestSuite003-cim-mapping.robot

@@ -32,6 +32,7 @@ TestCase003-01
 
 TestCase003-02
     [Documentation]         Trying to create a project from Invalid CIM Filename
+    skip
     Set Test Variable       ${sclname}  MiniGridTestConfiguration_Invalid_XML
 
     ${promise}=             Promise To Upload File    ${CURDIR}/test-files/${sclname}.xml

integration-testing/TestSuite005-validator.robot

@@ -11,12 +11,13 @@ Test Teardown   Make screenshot and Stop OpenSCD
 
 *** Keywords ***
 Execute SCL Validator
-    Open Menu            Validate using OCL
+    Open Menu            [WIP] Validate using OCL
     Wait until executed
     Close Menu
 
 *** Test Cases ***
 TestCase005-01
+    skip
     [Documentation]     Execute the SCL Validator (Websockets) with OCL Validation Errros.
     Set Test Variable   ${sclname}  SingleSubstation
     Set Test Variable   ${scltype}  SCD
@@ -28,10 +29,11 @@ TestCase005-01
     Execute SCL Validator
 
     Open Navigation Menu       menu.viewDiag
-    Get Text            mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(4)    ==   Validate using OCL
+    Get Text            mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(4)    ==   [WIP] Validate using OCL
     Get Element Count   mwc-dialog#diagnostic > filtered-list > abbr                          ==   332
 
 TestCase005-02
+    skip
     [Documentation]     Execute the SCL Validator (REST API) with OCL Validation Errros.
     Set Test Variable   ${sclname}  SingleSubstation
     Set Test Variable   ${scltype}  SCD
@@ -42,10 +44,11 @@ TestCase005-02
     Execute SCL Validator
 
     Open Navigation Menu       menu.viewDiag
-    Get Text            mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(4)    ==   Validate using OCL
+    Get Text            mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(4)    ==   [WIP] Validate using OCL
     Get Element Count   mwc-dialog#diagnostic > filtered-list > abbr                          ==   332
 
 TestCase005-03
+    skip
     [Documentation]     Execute the SCL Validator (Websockets) with XSD Validation Errors.
     Set Test Variable   ${sclname}  XsdValidationErrors
     Set Test Variable   ${scltype}  SCD
@@ -57,11 +60,12 @@ TestCase005-03
     Execute SCL Validator
 
     Open Navigation Menu       menu.viewDiag
-    Get Text            mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(12)   ==   Validate using OCL
+    Get Text            mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(12)   ==   [WIP] Validate using OCL
     Get Attribute       mwc-dialog#diagnostic > filtered-list > abbr:nth-child(14)    title   *=   Attribute 'type' must appear on element 'DO'.
     Get Element Count   mwc-dialog#diagnostic > filtered-list > abbr                          ==   11
 
 TestCase005-04
+    skip
     [Documentation]     Execute the SCL Validator (REST API) with XSD Validation Errors.
     Set Test Variable   ${sclname}  XsdValidationErrors
     Set Test Variable   ${scltype}  SCD
@@ -72,6 +76,6 @@ TestCase005-04
     Execute SCL Validator
 
     Open Navigation Menu       menu.viewDiag
-    Get Text            mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(12)   ==   Validate using OCL
+    Get Text            mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(12)   ==   [WIP] Validate using OCL
     Get Attribute       mwc-dialog#diagnostic > filtered-list > abbr:nth-child(14)    title   *=   Attribute 'type' must appear on element 'DO'.
     Get Element Count   mwc-dialog#diagnostic > filtered-list > abbr                          ==   11

integration-testing/include/general-openscd.robot

@@ -100,7 +100,7 @@ Wait for dialog is closed
     Wait For Elements State   ${dialog-selector}   hidden
 
 Wait until executed
-    Wait For Function         element => element.className.indexOf('mdc-circular-progress--closed') >= 0   open-scd > mwc-circular-progress-four-color > div[role="progressbar"]   timeout=30s
+    Wait For Function         element => element.className.indexOf('mdc-linear-progress--closed') >= 0   open-scd > mwc-linear-progress > div[role="progressbar"]   timeout=30s
 
 Close Issues Snackbar
     ${snackbarVisible}=   Get Element States   mwc-snackbar#issue > mwc-icon-button[slot="dismiss"] > button    *=    visible
@@ -110,9 +110,10 @@ Close Issues Snackbar
 
 Check Log
     [Arguments]   ${primaryMessage}   ${secondaryMessage}
-    Open Menu     View log
+    Open Navigation Menu     menu.viewLog
     Get Text      mwc-dialog#log abbr[title="${primaryMessage}"]
     Get Text      mwc-dialog#log abbr[title="${primaryMessage}"] span[slot="secondary"]:has-text("${secondaryMessage}")
     Click         mwc-dialog#log mwc-button[slot="primaryAction"] > button
+    Set Strict Mode         true
     Wait for dialog is closed
     Close Menu