Skip to content

Commit ede8f03

Browse files
juancho0202juancho0202
authored
Merge pull request #88 from com-pas/update-docker-image-20sept
Update Container Image versions to the latest and fix Robot Tests
2 parents f282a6c + 79c3211 commit ede8f03

File tree

7 files changed

+58
-40
lines changed

7 files changed

+58
-40
lines changed

‎RELEASE.md‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,29 @@ For information about CoMPAS go to this [site](https://com-pas.github.io/).
1010

1111
## Release notes
1212

13+
### Release 0.13.0
14+
15+
Next release for testing the CoMPAS System with all components.
16+
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.24.0.2):
17+
- Add Labels when saving SCL File to CoMPAS;
18+
- See details in [OpenSCD Release notes (V0.24.0)](https://github.com/openscd/open-scd/releases/tag/v0.24.0);
19+
- [CIM Mapping Service](https://github.com/com-pas/compas-cim-mapping) (Version 0.9.2):
20+
- Updated libraries to the latest versions;
21+
- [SCL Auto Alignment Service](https://github.com/com-pas/compas-scl-auto-alignment) (Version 0.3.1):
22+
- Updated libraries to the latest versions;
23+
- [SCL Validator Service](https://github.com/com-pas/compas-scl-validator) (Version 0.4.3):
24+
- Updated libraries to the latest versions;
25+
- [SCL Data Service](https://github.com/com-pas/compas-scl-data-service) (Version 0.11.0):
26+
- Return labels by Listing SCL Files per SCL Type;
27+
- Updated libraries to the latest versions;
28+
1329
### Release 0.12.0
1430

1531
Next release for testing the CoMPAS System with all components.
1632
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.23.0.0):
1733
- Processing validation message from SCL Validator Service;
18-
- See details in [OpenSCD Release notes (V0.23.0.0)](https://github.com/openscd/open-scd/releases/tag/v0.23.0);
19-
- [SCL Validator Service](https://github.com/com-pas/compas-scl-validator) (Version 0.4.1):
34+
- See details in [OpenSCD Release notes (V0.23.0)](https://github.com/openscd/open-scd/releases/tag/v0.23.0);
35+
- [SCL Validator Service](https://github.com/com-pas/compas-scl-validator) (Version 0.4.2):
2036
- Process validation messages from XSD Validation to be processed better by frontend;
2137
- Updated libraries to the latest versions;
2238

@@ -25,7 +41,7 @@ Next release for testing the CoMPAS System with all components.
2541
Next release for testing the CoMPAS System with all components.
2642
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.22.0.0):
2743
- Processing validation message from SCL Validator Service;
28-
- See details in [OpenSCD Release notes (V0.22.0.0)](https://github.com/openscd/open-scd/releases/tag/v0.22.0);
44+
- See details in [OpenSCD Release notes (V0.22.0)](https://github.com/openscd/open-scd/releases/tag/v0.22.0);
2945
- [SCL Validator Service](https://github.com/com-pas/compas-scl-validator) (Version 0.4.1):
3046
- Process validation messages from RiseClipse to be processed better by frontend;
3147
- Updated libraries to the latest versions;
@@ -36,8 +52,8 @@ Next release for testing the CoMPAS System with all components.
3652
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.21.0.0):
3753
- Export IED Parameters to CSV File;
3854
- On IED Template Project from CoMPAS backend service;
39-
- See details in [OpenSCD Release notes (V0.21.0.0)](https://github.com/openscd/open-scd/releases/tag/v0.21.0);
40-
- See details in [OpenSCD Release notes (V0.20.0.0)](https://github.com/openscd/open-scd/releases/tag/v0.20.0);
55+
- See details in [OpenSCD Release notes (V0.21.0)](https://github.com/openscd/open-scd/releases/tag/v0.21.0);
56+
- See details in [OpenSCD Release notes (V0.20.0)](https://github.com/openscd/open-scd/releases/tag/v0.20.0);
4157
- [SCL Data Service](https://github.com/com-pas/compas-scl-data-service) (Version 0.10.0):
4258
- Upgrade to JDK 17;
4359
- Updated libraries to the latest versions;
@@ -56,8 +72,8 @@ Next release for testing the CoMPAS System with all components.
5672
Next release for testing the CoMPAS System with all components.
5773
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.19.0.0):
5874
- Show Who/When/What information for the versions in CoMPAS;
59-
- See details in [OpenSCD Release notes (V0.19.0.0)](https://github.com/openscd/open-scd/releases/tag/v0.19.0);
60-
- See details in [OpenSCD Release notes (V0.18.0.0)](https://github.com/openscd/open-scd/releases/tag/v0.18.0);
75+
- See details in [OpenSCD Release notes (V0.19.0)](https://github.com/openscd/open-scd/releases/tag/v0.19.0);
76+
- See details in [OpenSCD Release notes (V0.18.0)](https://github.com/openscd/open-scd/releases/tag/v0.18.0);
6177
- [SCL Data Service](https://github.com/com-pas/compas-scl-data-service) (Version 0.9.9):
6278
- Return Who/When/What information when returning versions;
6379
- Updated libraries to the latest versions;

‎compas/docker-compose-basex.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ services:
3939
scl-data-service:
4040
labels:
4141
compas: true
42-
image: "lfenergy/compas-scl-data-service:0.10.0-basex"
42+
image: "lfenergy/compas-scl-data-service:0.11.0-basex"
4343
ports:
4444
- "9090:8080"
4545
environment:
@@ -69,7 +69,7 @@ services:
6969
cim-mapping:
7070
labels:
7171
compas: true
72-
image: "lfenergy/compas-cim-mapping:0.9.1"
72+
image: "lfenergy/compas-cim-mapping:0.9.2"
7373
ports:
7474
- "9091:8080"
7575
environment:
@@ -93,7 +93,7 @@ services:
9393
scl-auto-alignment:
9494
labels:
9595
compas: true
96-
image: "lfenergy/compas-scl-auto-alignment:0.3.0"
96+
image: "lfenergy/compas-scl-auto-alignment:0.3.1"
9797
ports:
9898
- "9092:8080"
9999
environment:
@@ -117,7 +117,7 @@ services:
117117
scl-validator:
118118
labels:
119119
compas: true
120-
image: "lfenergy/compas-scl-validator:0.4.2"
120+
image: "lfenergy/compas-scl-validator:0.4.3"
121121
ports:
122122
- "9093:8080"
123123
environment:
@@ -144,7 +144,7 @@ services:
144144
open-scd:
145145
labels:
146146
compas: true
147-
image: "lfenergy/compas-open-scd:v0.23.0.0"
147+
image: "lfenergy/compas-open-scd:v0.24.0.2"
148148
healthcheck:
149149
test: ["CMD", "curl", "-f", "http://localhost/"]
150150
interval: 30s

‎compas/docker-compose-postgresql.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
scl-data-service:
4747
labels:
4848
compas: true
49-
image: "lfenergy/compas-scl-data-service:0.10.0-postgresql"
49+
image: "lfenergy/compas-scl-data-service:0.11.0-postgresql"
5050
ports:
5151
- "9090:8080"
5252
environment:
@@ -76,7 +76,7 @@ services:
7676
cim-mapping:
7777
labels:
7878
compas: true
79-
image: "lfenergy/compas-cim-mapping:0.9.1"
79+
image: "lfenergy/compas-cim-mapping:0.9.2"
8080
ports:
8181
- "9091:8080"
8282
environment:
@@ -100,7 +100,7 @@ services:
100100
scl-auto-alignment:
101101
labels:
102102
compas: true
103-
image: "lfenergy/compas-scl-auto-alignment:0.3.0"
103+
image: "lfenergy/compas-scl-auto-alignment:0.3.1"
104104
ports:
105105
- "9092:8080"
106106
environment:
@@ -124,7 +124,7 @@ services:
124124
scl-validator:
125125
labels:
126126
compas: true
127-
image: "lfenergy/compas-scl-validator:0.4.2"
127+
image: "lfenergy/compas-scl-validator:0.4.3"
128128
ports:
129129
- "9093:8080"
130130
environment:
@@ -151,7 +151,7 @@ services:
151151
open-scd:
152152
labels:
153153
compas: true
154-
image: "lfenergy/compas-open-scd:v0.23.0.0"
154+
image: "lfenergy/compas-open-scd:v0.24.0.2"
155155
healthcheck:
156156
test: ["CMD", "curl", "-f", "http://localhost/"]
157157
interval: 30s

‎integration-testing/TestSuite001-basic-compas.robot‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ TestCase001-02
3333
Set Test Variable ${scltype} CID
3434

3535
Open Menu Save project
36-
Add to CoMPAS MiniGrid.scd ${sclname} ${scltype} 1.0.0
36+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
3737

3838
Select Tab Substation
3939
Get Text ${substation-editor-selector} section > h1:has-text("Sub1")
@@ -51,7 +51,7 @@ TestCase001-03
5151
Set Test Variable ${scltype} CID
5252

5353
Open Menu Save project
54-
Add to CoMPAS MiniGrid.scd ${sclname} ${scltype} 1.0.0
54+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
5555

5656
Close OpenSCD
5757
Open OpenSCD and Login
@@ -75,7 +75,7 @@ TestCase001-04
7575
Set Test Variable ${scltype} CID
7676

7777
Open Menu Save project
78-
Add to CoMPAS MiniGrid.scd ${sclname} ${scltype} 1.0.0
78+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
7979

8080
Open Menu Save project
8181
Save to local file ${sclname} ${scltype}
@@ -94,12 +94,13 @@ TestCase001-05
9494
Set Test Variable ${scltype} CID
9595

9696
Open Menu Save project
97-
Get Text ${dialog-selector} compas-save mwc-textfield#name input == MiniGrid.scd
98-
Fill Text ${dialog-selector} compas-save mwc-textfield#name input ${sclname}
99-
Click ${dialog-selector} compas-save compas-scltype-radiogroup mwc-list > mwc-radio-list-item[value="${scltype}"]
100-
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
97+
Get Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input == MiniGrid
98+
Fill Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input ${sclname}
99+
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select
100+
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${scltype}"]
101+
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
101102
Wait until executed
102-
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
103+
Click mwc-dialog#compas-save-dlg > mwc-button[slot="secondaryAction"] > button
103104
Wait for dialog is closed
104105
Close Menu
105106

‎integration-testing/TestSuite002-versions-compas.robot‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Initialize Versions
3838
Set Test Variable ${scltype} CID
3939

4040
Open Menu Save project
41-
Add to CoMPAS MiniGrid.scd ${sclname} ${scltype} 1.0.0
41+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
4242

4343
Select Tab CoMPAS Versions
4444
Get Element Count ${compas-versions-editor-selector} mwc-list > mwc-check-list-item == 1
@@ -164,7 +164,7 @@ TestCase002-30
164164
# Next select the first version from the list and compare this to the current open edited version.
165165
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
166166
Click ${compas-versions-editor-selector} mwc-fab[label="Compare version (current)"] > button
167-
Get Text ${dialog-selector} \#wizard-content > mwc-list > mwc-list-item:nth-child(3) >> text=Substation
167+
Get Text ${dialog-selector} div#wizard-content mwc-list > mwc-list-item > span:has-text("Substation")
168168
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
169169
Wait for dialog is closed
170170

@@ -175,15 +175,15 @@ TestCase002-31
175175
Select Tab CoMPAS Versions
176176
# Now select no versions and try to compare, should show a error dialog.
177177
Click ${compas-versions-editor-selector} mwc-fab[label="Compare version (current)"] > button
178-
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum one version to compare the current project against.")
178+
Get Text ${dialog-selector} div#wizard-content > span:has-text("Select maximum one version to compare the current project against.")
179179
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
180180
Wait for dialog is closed
181181

182182
# Now select two versions and try to compare, should show a error dialog.
183183
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
184184
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(2) mwc-checkbox
185185
Click ${compas-versions-editor-selector} mwc-fab[label="Compare version (current)"] > button
186-
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum one version to compare the current project against.")
186+
Get Text ${dialog-selector} div#wizard-content > span:has-text("Select maximum one version to compare the current project against.")
187187
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
188188
Wait for dialog is closed
189189

@@ -200,7 +200,7 @@ TestCase002-32
200200
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
201201
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(2) mwc-checkbox
202202
Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button
203-
Get Text ${dialog-selector} \#wizard-content > mwc-list:nth-child(1) > mwc-list-item:nth-child(3) >> text=Substation
203+
Get Text ${dialog-selector} div#wizard-content mwc-list > mwc-list-item > span:has-text("Substation")
204204
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
205205
Wait for dialog is closed
206206

@@ -214,21 +214,21 @@ TestCase002-33
214214
Select Tab CoMPAS Versions
215215
# Now select no versions and try to compare, should show a error dialog.
216216
Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button
217-
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum two versions to compare with each other.")
217+
Get Text ${dialog-selector} div#wizard-content > span:has-text("Select maximum two versions to compare with each other.")
218218
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
219219
Wait for dialog is closed
220220

221221
# Now select one versions and try to compare, should show a error dialog.
222222
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
223223
Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button
224-
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum two versions to compare with each other.")
224+
Get Text ${dialog-selector} div#wizard-content > span:has-text("Select maximum two versions to compare with each other.")
225225
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
226226
Wait for dialog is closed
227227

228228
# Now select three versions (first is already selected) and try to compare, should show a error dialog.
229229
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(2) mwc-checkbox
230230
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(3) mwc-checkbox
231231
Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button
232-
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum two versions to compare with each other.")
232+
Get Text ${dialog-selector} div#wizard-content > span:has-text("Select maximum two versions to compare with each other.")
233233
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
234234
Wait for dialog is closed

‎integration-testing/include/general-compas.robot‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ Open from CoMPAS
2020
Add to CoMPAS
2121
[Arguments] ${initialValue} ${name} ${type} ${expectedVersion}
2222
# Make sure the initial value is entered. so we can continue.
23-
Get Text ${dialog-selector} compas-save mwc-textfield#name input == ${initialValue}
24-
Fill Text ${dialog-selector} compas-save mwc-textfield#name input ${name}-${current-date}
25-
Click ${dialog-selector} compas-save compas-scltype-radiogroup mwc-list > mwc-radio-list-item[value="${type.upper()}"]
26-
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
23+
Get Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input == ${initialValue}
24+
Fill Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input ${name}-${current-date}
25+
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select
26+
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${type.upper()}"]
27+
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
2728
Wait for dialog is closed
2829
Close Menu
2930
# check if the title (filename) changed to the new expected one.
3031
Check Title Filename ${name}-${current-date}-${expectedVersion} ${type}
3132

3233
Update in CoMPAS
3334
[Arguments] ${changeType} ${name} ${type} ${expectedVersion}
34-
Click ${dialog-selector} compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
35-
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
35+
Click mwc-dialog#compas-save-dlg > compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
36+
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
3637
Wait for dialog is closed
3738
Close Menu
3839
# check if the title (filename) changed to the new expected one.

‎integration-testing/include/general-openscd.robot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Open local file
8484
Save to local file
8585
[Arguments] ${name} ${type}
8686
${dl_promise}= Promise To Wait For Download ${OUTPUT DIR}/saved-files/${name}-${current-date}.${type.lower()}
87-
Click ${dialog-selector} compas-save mwc-button[label="Save to file..."] button
87+
Click mwc-dialog#compas-save-dlg > compas-save mwc-button[label="Save to file..."] button
8888
${file_obj}= Wait For ${dl_promise}
8989
File Should Exist ${file_obj}[saveAs]
9090
Wait for dialog is closed

0 commit comments

Comments
 (0)