Skip to content

Commit 282746a

Browse files
author
Dennis Labordus
committed
Fix to make run more stable.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent b89e942 commit 282746a

File tree

6 files changed

+77
-83
lines changed

6 files changed

+77
-83
lines changed

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

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,75 +15,67 @@ TestCase001-01
1515
Set Test Variable ${sclname} MiniGrid
1616
Set Test Variable ${scltype} SCD
1717

18-
Open Menu Open project
19-
Open local file ${sclname} ${scltype}
20-
Check Title Filename ${sclname} ${scltype}
18+
Open Menu Open project
19+
Open local file ${sclname} ${scltype}
2120

22-
Select Tab Substation
23-
Get Text ${substation-editor-selector} div#header > h1:has-text("Sub1")
21+
Select Tab Substation
22+
Get Text ${substation-editor-selector} div#header > h1:has-text("Sub1")
2423

2524
TestCase001-02
2625
[Documentation] Open project from Local File and Add to CoMPAS
2726
Set Test Variable ${sclname} MiniGrid
2827
Set Test Variable ${scltype} SCD
2928

30-
Open Menu Open project
31-
Open local file ${sclname} ${scltype}
32-
Check Title Filename ${sclname} ${scltype}
29+
Open Menu Open project
30+
Open local file ${sclname} ${scltype}
3331

3432
Set Test Variable ${sclname} ${TEST NAME}
3533
Set Test Variable ${scltype} CID
3634

37-
Open Menu Save project
38-
Add to CoMPAS ${sclname} ${scltype}
39-
Check Title Filename ${sclname}-${current-date}-1.0.0 ${scltype}
35+
Open Menu Save project
36+
Add to CoMPAS ${sclname} ${scltype} 1.0.0
4037

41-
Select Tab Substation
42-
Get Text ${substation-editor-selector} div#header > h1:has-text("Sub1")
38+
Select Tab Substation
39+
Get Text ${substation-editor-selector} div#header > h1:has-text("Sub1")
4340

4441
TestCase001-03
4542
[Documentation] Open project from CoMPAS
4643
# First we need to add a project to CoMPAS to be able to open it from CoMPAS.
4744
Set Test Variable ${sclname} MiniGrid
4845
Set Test Variable ${scltype} SCD
4946

50-
Open Menu Open project
51-
Open local file ${sclname} ${scltype}
52-
Check Title Filename ${sclname} ${scltype}
47+
Open Menu Open project
48+
Open local file ${sclname} ${scltype}
5349

5450
Set Test Variable ${sclname} ${TEST NAME}
5551
Set Test Variable ${scltype} CID
5652

57-
Open Menu Save project
58-
Add to CoMPAS ${sclname} ${scltype}
59-
Check Title Filename ${sclname}-${current-date}-1.0.0 ${scltype}
53+
Open Menu Save project
54+
Add to CoMPAS ${sclname} ${scltype} 1.0.0
6055

6156
Close OpenSCD
6257
Open OpenSCD and Login
6358

64-
Open Menu Open project
65-
Open from CoMPAS ${sclname} ${scltype}
66-
Check Title Filename ${sclname}-${current-date}-1.0.0 ${scltype}
59+
Open Menu Open project
60+
Open from CoMPAS ${sclname} ${scltype} 1.0.0
6761

68-
Select Tab Substation
69-
Get Text ${substation-editor-selector} div#header > h1:has-text("Sub1")
62+
Select Tab Substation
63+
Get Text ${substation-editor-selector} div#header > h1:has-text("Sub1")
7064

7165
TestCase001-04
7266
[Documentation] Open project from CoMPAS and Save to Local File
7367
# First we need to add a project to CoMPAS to be able to open it from CoMPAS.
7468
Set Test Variable ${sclname} MiniGrid
7569
Set Test Variable ${scltype} SCD
7670

77-
Open Menu Open project
78-
Open local file ${sclname} ${scltype}
79-
Check Title Filename ${sclname} ${scltype}
71+
Open Menu Open project
72+
Open local file ${sclname} ${scltype}
8073

8174
Set Test Variable ${sclname} ${TEST NAME}
8275
Set Test Variable ${scltype} CID
8376

84-
Open Menu Save project
85-
Add to CoMPAS ${sclname} ${scltype}
86-
Check Title Filename ${sclname}-${current-date}-1.0.0 ${scltype}
77+
Open Menu Save project
78+
Add to CoMPAS ${sclname} ${scltype} 1.0.0
8779

8880
Open Menu Save project
8981
Save to local file ${sclname} ${scltype}

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

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,25 @@ TestCase002-01
1515
Set Test Variable ${sclname} MiniGrid
1616
Set Test Variable ${scltype} SCD
1717

18-
Open Menu Open project
19-
Open local file ${sclname} ${scltype}
20-
Check Title Filename ${sclname} ${scltype}
18+
Open Menu Open project
19+
Open local file ${sclname} ${scltype}
2120

22-
Select Tab CoMPAS Versions
23-
Get Text ${compas-versions-editor-selector} mwc-list > mwc-list-item > span:has-text("No versions found")
21+
Select Tab CoMPAS Versions
22+
Get Text ${compas-versions-editor-selector} mwc-list > mwc-list-item > span:has-text("No versions found")
2423

2524
TestCase002-02
2625
[Documentation] Check one versions on tab CoMPAS Versions
2726
Set Test Variable ${sclname} MiniGrid
2827
Set Test Variable ${scltype} SCD
2928

30-
Open Menu Open project
31-
Open local file ${sclname} ${scltype}
32-
Check Title Filename ${sclname} ${scltype}
29+
Open Menu Open project
30+
Open local file ${sclname} ${scltype}
3331

3432
Set Test Variable ${sclname} ${TEST NAME}
3533
Set Test Variable ${scltype} CID
3634

37-
Open Menu Save project
38-
Add to CoMPAS ${sclname} ${scltype}
39-
Check Title Filename ${sclname}-${current-date}-1.0.0 ${scltype}
35+
Open Menu Save project
36+
Add to CoMPAS ${sclname} ${scltype} 1.0.0
4037

4138
Select Tab CoMPAS Versions
4239
Get Element Count ${compas-versions-editor-selector} mwc-list > mwc-check-list-item == 1
@@ -46,37 +43,32 @@ TestCase002-03
4643
Set Test Variable ${sclname} MiniGrid
4744
Set Test Variable ${scltype} SCD
4845

49-
Open Menu Open project
50-
Open local file ${sclname} ${scltype}
51-
Check Title Filename ${sclname} ${scltype}
46+
Open Menu Open project
47+
Open local file ${sclname} ${scltype}
5248

5349
Set Test Variable ${sclname} ${TEST NAME}
5450
Set Test Variable ${scltype} CID
5551

56-
Open Menu Save project
57-
Add to CoMPAS ${sclname} ${scltype}
58-
Check Title Filename ${sclname}-${current-date}-1.0.0 ${scltype}
52+
Open Menu Save project
53+
Add to CoMPAS ${sclname} ${scltype} 1.0.0
5954

6055
Select Tab CoMPAS Versions
6156
Get Element Count ${compas-versions-editor-selector} mwc-list > mwc-check-list-item == 1
6257

63-
Open Menu Save project
64-
Update in CoMPAS MAJOR
65-
Check Title Filename ${sclname}-${current-date}-2.0.0 ${scltype}
58+
Open Menu Save project
59+
Update in CoMPAS MAJOR ${sclname} ${scltype} 2.0.0
6660

6761
Select Tab CoMPAS Versions
6862
Get Element Count ${compas-versions-editor-selector} mwc-list > mwc-check-list-item == 2
6963

70-
Open Menu Save project
71-
Update in CoMPAS MINOR
72-
Check Title Filename ${sclname}-${current-date}-2.1.0 ${scltype}
64+
Open Menu Save project
65+
Update in CoMPAS MINOR ${sclname} ${scltype} 2.1.0
7366

7467
Select Tab CoMPAS Versions
7568
Get Element Count ${compas-versions-editor-selector} mwc-list > mwc-check-list-item == 3
7669

77-
Open Menu Save project
78-
Update in CoMPAS PATCH
79-
Check Title Filename ${sclname}-${current-date}-2.1.1 ${scltype}
70+
Open Menu Save project
71+
Update in CoMPAS PATCH ${sclname} ${scltype} 2.1.1
8072

8173
Select Tab CoMPAS Versions
8274
Get Element Count ${compas-versions-editor-selector} mwc-list > mwc-check-list-item == 4

‎integration-testing/TestSuite003-cim-mapping.robot‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ Test Teardown Make screenshot and Stop OpenSCD
1111

1212
*** Keywords ***
1313
Open Project from CIM
14-
[Arguments] ${name}
15-
${promise}= Promise To Upload File ${CURDIR}/test-files/${name}.xml
16-
Open Menu Project from CIM
17-
${upload_result}= Wait For ${promise}
14+
[Arguments] ${name} ${scltype}
15+
${promise}= Promise To Upload File ${CURDIR}/test-files/${name}.xml
16+
Open Menu Project from CIM
17+
${upload_result}= Wait For ${promise}
18+
Sleep 0.5s Wait until loading file starts.
1819
Wait for Progressbar
19-
Wait for dialog is closed
20+
Check Title Filename ${name} ${scltype}
2021
Close Menu
2122

2223
*** Test Cases ***
2324
TestCase003-01
24-
[Documentation] Create project from CIM File
25-
Set Test Variable ${sclname} MiniGridTestConfiguration_BC_EQ_v3.0.0
26-
Set Test Variable ${scltype} SSD
25+
[Documentation] Create project from CIM File
26+
Set Test Variable ${sclname} MiniGridTestConfiguration_BC_EQ_v3.0.0
27+
Set Test Variable ${scltype} SSD
2728

28-
Open Project from CIM ${sclname}
29-
Check Title Filename ${sclname} ${scltype}
29+
Open Project from CIM ${sclname} ${scltype}
3030

31-
Select Tab Substation
32-
Get Text ${substation-editor-selector} div#header > h1:has-text("Sub1")
31+
Select Tab Substation
32+
Get Text ${substation-editor-selector} div#header > h1:has-text("Sub1")

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,32 @@ ${compas-versions-editor-selector} compas-versions-plugin
1313

1414
*** Keywords ***
1515
Open from CoMPAS
16-
[Arguments] ${name} ${type}
17-
Click ${dialog-selector} compas-open compas-scltype-list > mwc-list > mwc-list-item >> span:has-text("${type.upper()}")
18-
Click ${dialog-selector} compas-open compas-scl-list > mwc-list > mwc-list-item:has-text("${name}-${current-date}")
16+
[Arguments] ${name} ${type} ${expectedVersion}
17+
Click ${dialog-selector} compas-open compas-scltype-list > mwc-list > mwc-list-item >> span:has-text("${type.upper()}")
18+
Click ${dialog-selector} compas-open compas-scl-list > mwc-list > mwc-list-item:has-text("${name}-${current-date}")
1919
Wait for Progressbar
2020
Wait for dialog is closed
21+
# check if the title (filename) changed to the new expected one. This way we know we can close the menu.
22+
Check Title Filename ${sclname}-${current-date}-${expectedVersion} ${scltype}
2123
Close Menu
2224

2325
Add to CoMPAS
24-
[Arguments] ${name} ${type}
25-
Fill Text ${dialog-selector} compas-save mwc-textfield#name input ${name}-${current-date}
26-
Click ${dialog-selector} compas-save compas-scltype-radiogroup mwc-list > mwc-radio-list-item[value="${type.upper()}"]
27-
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
26+
[Arguments] ${name} ${type} ${expectedVersion}
27+
Fill Text ${dialog-selector} compas-save mwc-textfield#name input ${name}-${current-date}
28+
Click ${dialog-selector} compas-save compas-scltype-radiogroup mwc-list > mwc-radio-list-item[value="${type.upper()}"]
29+
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
2830
Wait for Progressbar
2931
Wait for dialog is closed
32+
# check if the title (filename) changed to the new expected one. This way we know we can close the menu.
33+
Check Title Filename ${sclname}-${current-date}-${expectedVersion} ${scltype}
3034
Close Menu
3135

3236
Update in CoMPAS
33-
[Arguments] ${changeType}
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
37+
[Arguments] ${changeType} ${name} ${type} ${expectedVersion}
38+
Click ${dialog-selector} compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
39+
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
3640
Wait for Progressbar
3741
Wait for dialog is closed
42+
# check if the title (filename) changed to the new expected one. This way we know we can close the menu.
43+
Check Title Filename ${sclname}-${current-date}-${expectedVersion} ${scltype}
3844
Close Menu

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
Documentation Setup up configuration to run all Robot TestCases using the Browser Library (playwright)
77
Library Browser enable_presenter_mode=${enable_presenter_mode}
88
... run_on_failure=Make screenshot on failure
9+
... retry_assertions_for=0:00:10
910
Library OperatingSystem
1011
Library DateTime
1112

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,15 @@ Select Tab
5858
Click mwc-tab[label="${tabname}"] > button
5959

6060
Open local file
61-
[Arguments] ${name} ${type}
62-
${promise}= Promise To Upload File ${CURDIR}/../test-files/${name}.${type.lower()}
63-
Click ${dialog-selector} compas-open mwc-button[label="Open file..."] button
64-
${upload_result}= Wait For ${promise}
61+
[Arguments] ${name} ${type}
62+
${promise}= Promise To Upload File ${CURDIR}/../test-files/${name}.${type.lower()}
63+
Click ${dialog-selector} compas-open mwc-button[label="Open file..."] button
64+
${upload_result}= Wait For ${promise}
65+
Sleep 0.5s Wait until loading file starts.
6566
Wait for Progressbar
6667
Wait for dialog is closed
68+
# check if the title (filename) changed to the new expected one. This way we know we can close the menu.
69+
Check Title Filename ${name} ${scltype}
6770
Close Menu
6871

6972
Save to local file
@@ -77,7 +80,7 @@ Save to local file
7780

7881
Check Title Filename
7982
[Arguments] ${filename} ${scltype}
80-
Get Text open-scd > mwc-drawer div#title:text-is("${filename}.${scltype.lower()}")
83+
Get Text open-scd > mwc-drawer div#title == ${filename}.${scltype.lower()}
8184

8285
Wait for Progressbar
8386
Wait For Function element => element.style.opacity==0 open-scd > mwc-circular-progress-four-color > div[role="progressbar"]

0 commit comments

Comments
 (0)