Commit 964782d7 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

simplify tests case 14 of publish test suite

parent 269b318b

tests/features/CAPIF Api Publish Service/capif_api_publish_service.robot

+10 −23
Original line number Diff line number Diff line
@@ -364,14 +364,9 @@ Check Two Published APIs with different APFs are removed when Provider is delete 
    Dictionaries Should Be Equal    ${resp.json()}    ${service_api_description_published_2}



    # Get all services present at CCF

    ${resp}=    Get Request Capif

    ...    /helper/getServices

    ...    server=${CAPIF_HTTPS_URL}

    ...    verify=ca.crt

    ...    username=${SUPERADMIN_USERNAME}



    Log Dictionary    ${resp.json()}

    ${services_present_on_ccf_after_publish}=    Get Number Of Services



    # Delete Provider using AMF cert

    ${resp}=    Delete Request Capif

    ...    ${register_user_info['resource_url'].path}

    ...    server=${CAPIF_HTTPS_URL}
@@ -380,29 +375,21 @@ Check Two Published APIs with different APFs are removed when Provider is delete 


    Call Method    ${CAPIF_USERS}    remove_capif_users_entry    ${register_user_info['resource_url'].path}



    ${resp}=    Get Request Capif

    ...    /helper/getServices

    ...    server=${CAPIF_HTTPS_URL}

    ...    verify=ca.crt

    ...    username=${SUPERADMIN_USERNAME}

    ${services_present_on_ccf_after_delete_provider}=    Get Number Of Services



    Log Dictionary    ${resp.json()}

    ${services_present_on_ccf}=    Get Length    ${resp.json()['services']}

    ${services_removed}=   Evaluate    ${services_present_on_ccf_after_publish} - ${services_present_on_ccf_after_delete_provider}



    Run Keyword And Continue On Failure    Should Be Equal    "${services_removed}"    "2"      msg=Not all services removed after delete provider (removed) vs (expected)



    # Remove service API by superadmin

    ${resp}=    Delete Request Capif

    ...    /published-apis/v1/${register_user_info['apf_roles']['${APF_PROVIDER_USERNAME}_1']['apf_id']}/service-apis/${serviceApiId2}

    ...    server=${CAPIF_HTTPS_URL}

    ...    verify=ca.crt

    ...    username=${SUPERADMIN_USERNAME}



    ${resp}=    Get Request Capif

    ...    /helper/getServices

    ...    server=${CAPIF_HTTPS_URL}

    ...    verify=ca.crt

    ...    username=${SUPERADMIN_USERNAME}

    ${services_present_on_ccf_after_provider_deletion_superadmin}=    Get Number Of Services



    Log Dictionary    ${resp.json()}

    ${services_present_on_ccf_after_provider_deletion}=    Get Length    ${resp.json()['services']}

    ${services_removed}=   Evaluate    ${services_present_on_ccf} - ${services_present_on_ccf_after_provider_deletion}

    ${services_removed}=   Evaluate    ${services_present_on_ccf_after_publish} - ${services_present_on_ccf_after_provider_deletion_superadmin}

    

    Should Be Equal    ${services_removed}    2      msg=Not all services removed after delete provider (removed) vs (expected)
 
    Run Keyword And Continue On Failure   Should Be Equal    "${services_removed}"    "2"      msg=Not all services removed after delete provider (removed) vs (expected)

tests/resources/common/basicRequests.robot

+12 −0
Original line number Diff line number Diff line
@@ -901,3 +901,15 @@ Create Security Context Between invoker and provider 
    ...    username=${register_user_info_invoker['management_cert']}



    Check Response Variable Type And Values    ${resp}    201    ServiceSecurity



Get Number Of Services

    ${resp}=    Get Request Capif

    ...    /helper/getServices

    ...    server=${CAPIF_HTTPS_URL}

    ...    verify=ca.crt

    ...    username=${SUPERADMIN_USERNAME}



    Log Dictionary    ${resp.json()}

    ${size}=    Get Length    ${resp.json()['services']}



    RETURN   ${size}