summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-10-16 00:36:34 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-16 00:36:34 +0000
commit76af2ce3d46662f2990651305e07c2fa70bf43db (patch)
tree0eaf1f08b39f7a965775a31ad383aaa287f90fdb
parent06c76be7686b359978befa944492ba7f21e4cd19 (diff)
parent67c6aea4c8de811e16b5b19fb890f4625c648c59 (diff)
Merge "Fix CSIT for CLAMP as UI was reworked"
-rw-r--r--tests/clamp/UIs/01__Create_Holmes_model.robot2
-rw-r--r--tests/clamp/UIs/02__Create_TCA_model.robot2
-rw-r--r--tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot16
-rw-r--r--tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot16
4 files changed, 18 insertions, 18 deletions
diff --git a/tests/clamp/UIs/01__Create_Holmes_model.robot b/tests/clamp/UIs/01__Create_Holmes_model.robot
index e8b1429d..532a5e48 100644
--- a/tests/clamp/UIs/01__Create_Holmes_model.robot
+++ b/tests/clamp/UIs/01__Create_Holmes_model.robot
@@ -88,7 +88,7 @@ Save Model from Menu
Set Selenium Speed ${SELENIUM_SPEED_FAST}
Click Element locator=Save CL
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:SAVE
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: save
Set Selenium Speed ${SELENIUM_SPEED_SLOW}
Close Browser
diff --git a/tests/clamp/UIs/02__Create_TCA_model.robot b/tests/clamp/UIs/02__Create_TCA_model.robot
index bdc537ea..fa63b3f4 100644
--- a/tests/clamp/UIs/02__Create_TCA_model.robot
+++ b/tests/clamp/UIs/02__Create_TCA_model.robot
@@ -88,7 +88,7 @@ Save Model from Menu
Set Selenium Speed ${SELENIUM_SPEED_FAST}
Click Element locator=Save CL
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:SAVE
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: save
Set Selenium Speed ${SELENIUM_SPEED_SLOW}
Close Browser
diff --git a/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot b/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
index de10a27c..ebde78b2 100644
--- a/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
+++ b/tests/clamp/UIs/04__Submit_deploy_chain_Holmes.robot
@@ -51,7 +51,7 @@ Validate-Test Holmes CL
Wait Until Element Is Visible locator=Validation Test timeout=60
Click Element locator=Validation Test
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:TEST
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: test
Element Should Contain xpath=//*[@id="status_clds"] DESIGN
Submit Holmes CL
@@ -61,7 +61,7 @@ Submit Holmes CL
Click Element locator=Submit
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:SUBMIT
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: submit
Element Should Contain xpath=//*[@id="status_clds"] DISTRIBUTED
Resubmit Holmes CL
@@ -71,7 +71,7 @@ Resubmit Holmes CL
Click Element locator=Resubmit
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:RESUBMIT
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: resubmit
Element Should Contain xpath=//*[@id="status_clds"] DISTRIBUTED
Deploy Holmes CL
@@ -84,7 +84,7 @@ Deploy Holmes CL
Click Button locator=Deploy
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:deploy
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: deploy
Element Should Contain xpath=//*[@id="status_clds"] ACTIVE
Update Holmes CL
@@ -94,7 +94,7 @@ Update Holmes CL
Click Element locator=Update
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:UPDATE
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: update
Element Should Contain xpath=//*[@id="status_clds"] ACTIVE
Stop Holmes CL
@@ -104,7 +104,7 @@ Stop Holmes CL
Click Element locator=Stop
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:STOP
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: stop
Element Should Contain xpath=//*[@id="status_clds"] STOPPED
Restart Holmes CL
@@ -114,7 +114,7 @@ Restart Holmes CL
Click Element locator=Restart
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:RESTART
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: restart
Element Should Contain xpath=//*[@id="status_clds"] ACTIVE
UnDeploy Holmes CL
@@ -124,7 +124,7 @@ UnDeploy Holmes CL
Click Element locator=UnDeploy
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:undeploy
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: undeploy
Element Should Contain xpath=//*[@id="status_clds"] DISTRIBUTED
Close Browser
diff --git a/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot b/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
index 2b95530a..4a83be25 100644
--- a/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
+++ b/tests/clamp/UIs/05__Submit_deploy_chain_TCA.robot
@@ -51,7 +51,7 @@ Validate-Test TCA CL
Wait Until Element Is Visible locator=Validation Test timeout=60
Click Element locator=Validation Test
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:TEST
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: test
Element Should Contain xpath=//*[@id="status_clds"] DESIGN
Submit TCA CL
@@ -61,7 +61,7 @@ Submit TCA CL
Click Element locator=Submit
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:SUBMIT
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: submit
Element Should Contain xpath=//*[@id="status_clds"] DISTRIBUTED
Resubmit TCA CL
@@ -71,7 +71,7 @@ Resubmit TCA CL
Click Element locator=Resubmit
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:RESUBMIT
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: resubmit
Element Should Contain xpath=//*[@id="status_clds"] DISTRIBUTED
Deploy TCA CL
@@ -84,7 +84,7 @@ Deploy TCA CL
Click Button locator=Deploy
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:deploy
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: deploy
Element Should Contain xpath=//*[@id="status_clds"] ACTIVE
Update TCA CL
@@ -94,7 +94,7 @@ Update TCA CL
Click Element locator=Update
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:UPDATE
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: update
Element Should Contain xpath=//*[@id="status_clds"] ACTIVE
Stop TCA CL
@@ -104,7 +104,7 @@ Stop TCA CL
Click Element locator=Stop
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:STOP
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: stop
Element Should Contain xpath=//*[@id="status_clds"] STOPPED
Restart TCA CL
@@ -114,7 +114,7 @@ Restart TCA CL
Click Element locator=Restart
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:RESTART
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: restart
Element Should Contain xpath=//*[@id="status_clds"] ACTIVE
UnDeploy TCA CL
@@ -124,7 +124,7 @@ UnDeploy TCA CL
Click Element locator=UnDeploy
Click Button locator=Yes
Wait Until Element Is Visible xpath=//*[@id="alert_message_"] timeout=60
- Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful:undeploy
+ Element Text Should Be xpath=//*[@id="alert_message_"] expected=Action Successful: undeploy
Element Should Contain xpath=//*[@id="status_clds"] DISTRIBUTED
Close Browser