diff options
| -rw-r--r-- | test/csit/plans/portal-sdk/testsuite/setup.sh | 10 | ||||
| -rw-r--r-- | test/csit/tests/portal-sdk/testsuites/test1.robot | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/test/csit/plans/portal-sdk/testsuite/setup.sh b/test/csit/plans/portal-sdk/testsuite/setup.sh index 2091d14e0..456a9343d 100644 --- a/test/csit/plans/portal-sdk/testsuite/setup.sh +++ b/test/csit/plans/portal-sdk/testsuite/setup.sh @@ -55,9 +55,9 @@ cd portal git pull cd deliveries rm .env -rm docker-compose.yml +#rm docker-compose.yml cp $CURR/.env . -cp $CURR/docker-compose.yml . +#cp $CURR/docker-compose.yml . #cd properties_simpledemo/ECOMPPORTALAPP #rm system.properties #cp $CURR/system.properties . @@ -68,7 +68,7 @@ source $CURR/.env # Make inter-app communication work in CSIT export EXTRA_HOST_IP="-i ${HOST_IP}" -export EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org" +export EXTRA_HOST_NAME="-n portal.api.simpledemo.onap.org" # Copy property files to new directory @@ -107,7 +107,7 @@ docker-compose up -d # insert/update hosts entry ip_address=$HOST_IP -host_name="portal.api.simpledemo.openecomp.org" +host_name="portal.api.simpledemo.onap.org" # find existing instances in the host file and save the line numbers matches_in_hosts="$(grep -n $host_name /etc/hosts | cut -f1 -d:)" host_entry="${ip_address} ${host_name}" @@ -137,7 +137,7 @@ TIME_OUT=500 INTERVAL=20 TIME=0 while [ "$TIME" -lt "$TIME_OUT" ]; do - response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/portalApi/healthCheck); echo $response + response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/portalApi/healthCheck); echo $response if [ "$response" == "200" ]; then echo Portal and its database well started in $TIME seconds diff --git a/test/csit/tests/portal-sdk/testsuites/test1.robot b/test/csit/tests/portal-sdk/testsuites/test1.robot index ad332c5df..f3e4017fb 100644 --- a/test/csit/tests/portal-sdk/testsuites/test1.robot +++ b/test/csit/tests/portal-sdk/testsuites/test1.robot @@ -6,8 +6,8 @@ Library XvfbRobot *** Variables *** -${PORTAL_URL} http://portal.api.simpledemo.openecomp.org:8989 -${PORTAL_ENV} /ECOMPPORTAL +${PORTAL_URL} http://portal.api.simpledemo.onap.org:8989 +${PORTAL_ENV} /ONAPPORTAL ${PORTAL_LOGIN_URL} ${PORTAL_URL}${PORTAL_ENV}/login.htm ${PORTAL_HOME_PAGE} ${PORTAL_URL}${PORTAL_ENV}/applicationsHome ${PORTAL_MICRO_ENDPOINT} ${PORTAL_URL}${PORTAL_ENV}/commonWidgets @@ -28,7 +28,6 @@ ${GLOBAL_VM_PRIVATE_KEY} ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pv Portal admin Login To Portal GUI [Documentation] Logs into Portal GUI - ## Setup Browser Now being managed by test case # Setup Browser Start Virtual Display 1920 1080 Open Browser ${PORTAL_LOGIN_URL} chrome @@ -60,8 +59,7 @@ Validate SDK Sub Menu Page Should Contain Reports Page Should Contain Profile Page Should Contain Admin - # Click Element xpath=(.//span[@id='tab-Home'])[1] - + Click Sample Pages and validate sub Menu [Documentation] Click Sample Pages Select frame xpath=.//*[@id='tabframe-xDemo-App'] @@ -74,7 +72,7 @@ Click Sample Pages and validate sub Menu Click Link xpath=//a[@id='parent-item-Sample-Pages'] Click Link xpath=//a[contains(@title,'Notebook')] Element Text Should Be xpath=//h1[contains(.,'Notebook')] Notebook - Click Link xpath=//a[@id='parent-item-Home'] + #Click Link xpath=//a[@id='parent-item-Home'] Click Reports and validate sub Menu [Documentation] Click Reports Tab |