Merge pull request #63 from com-pas/nsdoc-loading

Update Docker Images to support NSDoc Loading + Added Validator Test

Author: Rob Tjalma

RELEASE.md

@@ -10,6 +10,17 @@ For information about CoMPAS go to this [site](https://com-pas.github.io/).
 
 ## Release notes
 
+### Release 0.6.0
+
+Next release for testing the CoMPAS System with all components.
+- [SCL Validator Service](https://github.com/com-pas/compas-scl-validator) (Version 0.1.1):
+  - Validation using OCL Files;
+  - Facilitate automatic loading of NSDoc Files in OpenSCD; 
+  - Updated libraries to the latest versions;
+- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.12.0.2):
+  - Automatic loading of NSDoc Files from SCL Validator Service;
+  - Added CoMPAS Validation using the SCL Validator Service;
+
 ### Release 0.5.0
 
 Next release for testing the CoMPAS System with all components.
@@ -20,7 +31,7 @@ Next release for testing the CoMPAS System with all components.
 - [CIM Mapping Service](https://github.com/com-pas/compas-cim-mapping) (Version 0.8.3):
   - Updated libraries to the latest versions;
 - [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.12.0.0):
-  - See details in [Release notes](https://github.com/openscd/open-scd/releases/tag/v0.12.0)
+  - See details in [Release notes](https://github.com/openscd/open-scd/releases/tag/v0.12.0);
 
 ### Release 0.3.0
 

compas/docker-compose-basex.yml

@@ -111,7 +111,7 @@ services:
   scl-validator:
     labels:
       compas: true
-    image: "lfenergy/compas-scl-validator:0.1.0"
+    image: "lfenergy/compas-scl-validator:0.1.1"
     ports:
       - "9093:8080"
     environment:
@@ -138,7 +138,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.12.0.1"
+    image: "lfenergy/compas-open-scd:v0.12.0.2"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
       interval: 30s

compas/docker-compose-postgresql.yml

@@ -118,7 +118,7 @@ services:
   scl-validator:
     labels:
       compas: true
-    image: "lfenergy/compas-scl-validator:0.1.0"
+    image: "lfenergy/compas-scl-validator:0.1.1"
     ports:
       - "9093:8080"
     environment:
@@ -145,7 +145,7 @@ services:
   open-scd:
     labels:
       compas: true
-    image: "lfenergy/compas-open-scd:v0.12.0.1"
+    image: "lfenergy/compas-open-scd:v0.12.0.2"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
       interval: 30s

integration-testing/TestSuite005-validator.robot

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2021 Alliander N.V.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+*** Settings ***
+Documentation   Basic test cases for executing the SCL Validator Service.
+Resource        ./include/general-compas.robot
+
+Test Setup      Initialize and Start OpenSCD
+Test Teardown   Make screenshot and Stop OpenSCD
+
+*** Keywords ***
+Execute SCL Validator
+    Open Menu            Validate using OCL
+    Wait until executed
+    Close Menu
+
+*** Test Cases ***
+TestCase005-01
+    [Documentation]     Execute the SCL Validator for a Simple Configuration.
+    Set Test Variable   ${sclname}  SingleSubstation
+    Set Test Variable   ${scltype}  SCD
+
+    Open Menu           Open project
+    Open local file     ${sclname}    ${scltype}
+
+    Execute SCL Validator
+
+    Open Menu           View diagnostics
+    Get Text            mwc-dialog#diagnostic mwc-list-item:nth-child(4)   ==   Validate using OCL
+    Get Attribute       mwc-dialog#diagnostic abbr:nth-child(6)    title   *=   [SCD File] DataTypeTemplates section is mandatory (line 1)
+    Get Element Count   mwc-dialog#diagnostic abbr                         ==   333

integration-testing/include/general-openscd.robot

@@ -95,9 +95,12 @@ Check Title Filename
     Get Text        open-scd > mwc-drawer div#title   ==   ${filename}.${scltype.lower()}
 
 Wait for dialog is closed
-    Wait For Function         element => element.style.opacity==0   open-scd > mwc-circular-progress-four-color > div[role="progressbar"]
+    Wait until executed
     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
+
 Close Issues Snackbar
     ${snackbar}=        Get Element State   mwc-snackbar#issue > mwc-icon-button[slot="dismiss"] > button
     IF                  ${snackbar} == 'visible'