Commit e0a51303 authored by Benedetta Arena's avatar Benedetta Arena
Browse files

fix: improve centralization of tests

parent b53cf3c9
Loading
Loading
Loading
Loading
+19 −13
Original line number Diff line number Diff line
@@ -68,25 +68,31 @@ Setup Initial Context Source Registrations
    ...    broker_url=${broker_C_url}
    Check Response Status Code    201    ${response.status_code}

    ${registration_id}=    Generate Random CSR Id
    Set Suite Variable    ${registration_id}
    ${registration_payload}=    Prepare Context Source Registration From File
    ...    ${registration_id}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    entity_id=${second_entity_id}
    ...    mode=inclusive
    ...    broker_url=${broker_B_url}
    ${response}=    Create Context Source Registration With Return    ${registration_payload}    content_type=${CONTENT_TYPE_LD_JSON}    broker_url=${broker_A_url}
    Check Response Status Code    201    ${response.status_code}

    Initialize IOP CNF 01
    ...    ${broker_A_url}
    @{first_set}=    Create List
    ...    ${entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    inclusive
    ...    ${broker_B_url}
    ...    ${broker_A_url}

    @{second_set}=    Create List
    ...    ${second_entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    inclusive
    ...    ${broker_B_url}
    ...    ${broker_A_url}

    @{third_set}=    Create List
    ...    ${entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][exclusive_2]
    ...    exclusive
    ...    ${broker_C_url}
    ...    ${broker_A_url}

    Initialize IOP CNF 01
    ...    ${first_set}
    ...    ${second_set}
    ...    ${third_set}

Delete Entities And Delete Registrations

+19 −14
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
Documentation       Three brokers are set up A, B and C. A has two registrations, one inclusive for the entities created in B and one exclusive for the entity created in C. 

Resource            ${EXECDIR}/resources/IOPUtils/InteroperabilityUtils.resource
Variables           ${EXECDIR}/resources/IOPUtils/IOPRegistry.py

Test Setup          Setup Initial Context Source Registrations
Test Teardown       Delete Entities and Delete Registrations
@@ -69,25 +68,31 @@ Setup Initial Context Source Registrations
    ...    broker_url=${broker_C_url}
    Check Response Status Code    201    ${response.status_code}

    ${registration_id}=    Generate Random CSR Id
    Set Suite Variable    ${registration_id}
    ${registration_payload}=    Prepare Context Source Registration From File
    ...    ${registration_id}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    entity_id=${second_entity_id}
    ...    mode=inclusive
    ...    broker_url=${broker_B_url}
    ${response}=    Create Context Source Registration With Return    ${registration_payload}    content_type=${CONTENT_TYPE_LD_JSON}    broker_url=${broker_A_url}
    Check Response Status Code    201    ${response.status_code}

    Initialize IOP CNF 01
    ...    ${broker_A_url}
    @{first_set}=    Create List
    ...    ${entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    inclusive
    ...    ${broker_B_url}
    ...    ${broker_A_url}

    @{second_set}=    Create List
    ...    ${second_entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    inclusive
    ...    ${broker_B_url}
    ...    ${broker_A_url}

    @{third_set}=    Create List
    ...    ${entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][exclusive_2]
    ...    exclusive
    ...    ${broker_C_url}
    ...    ${broker_A_url}

    Initialize IOP CNF 01
    ...    ${first_set}
    ...    ${second_set}
    ...    ${third_set}

Delete Entities And Delete Registrations
    @{entities_to_delete}=    Create List    ${entity_id}    ${second_entity_id}
+11 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
Documentation       Three brokers are set up A, B and C. A has two registrations, one inclusive for the entities created in B and one exclusive for the entity created in C.

Resource            ${EXECDIR}/resources/IOPUtils/InteroperabilityUtils.resource
Variables           ${EXECDIR}/resources/IOPUtils/IOPRegistry.py

Test Setup          Setup Initial Context Source Registrations
Test Teardown       Delete Entities and Delete Registrations
@@ -59,14 +58,23 @@ Setup Initial Context Source Registrations
    ...    broker_url=${broker_C_url}
    Check Response Status Code    201    ${response.status_code}

    Initialize IOP CNF 01
    ...    ${broker_A_url}
    @{first_set}=    Create List
    ...    ${entity_id1}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    inclusive
    ...    ${broker_B_url}
    ...    ${broker_A_url}

    @{second_set}=    Create List
    ...    ${entity_id2}
    ...    ${IOP_REGISTRY_URL}[registration][exclusive_2]
    ...    exclusive
    ...    ${broker_C_url}
    ...    ${broker_A_url}

    Initialize IOP CNF 01
    ...    ${first_set}
    ...    ${second_set}

Delete Entities And Delete Registrations
    @{entities_to_delete}=    Create List    ${entity_id1}    ${entity_id2}
+11 −3
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
Documentation       Three brokers are set up A, B and C. A has two registrations, one inclusive for the the entity created in B and one exclusive for the entity created in C.

Resource            ${EXECDIR}/resources/IOPUtils/InteroperabilityUtils.resource
Variables           ${EXECDIR}/resources/IOPUtils/IOPRegistry.py

Test Setup          Setup Initial Context Source Registrations
Test Teardown       Delete Entities and Delete Registrations
@@ -53,14 +52,23 @@ Setup Initial Context Source Registrations
    ...    broker_url=${broker_C_url}
    Check Response Status Code    201    ${response.status_code}

    Initialize IOP CNF 01
    ...    ${broker_A_url}
    @{first_set}=    Create List
    ...    ${entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    inclusive
    ...    ${broker_B_url}
    ...    ${broker_A_url}

    @{second_set}=    Create List
    ...    ${entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][exclusive_2]
    ...    exclusive
    ...    ${broker_C_url}
    ...    ${broker_A_url}

    Initialize IOP CNF 01
    ...    ${first_set}
    ...    ${second_set}

Delete Entities And Delete Registrations
    @{entities_to_delete}=    Create List    ${entity_id}
+12 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
Documentation       Three brokers are set up A, B and C. A has two registrations, one inclusive for the entities created in B and one exclusive for the entity created in C. 

Resource            ${EXECDIR}/resources/IOPUtils/InteroperabilityUtils.resource
Variables           ${EXECDIR}/resources/IOPUtils/IOPRegistry.py

Test Setup          Setup Initial Context Source Registrations
Test Teardown       Delete Entities and Delete Registrations
@@ -46,14 +45,23 @@ Setup Initial Context Source Registrations
    ${entity_id}=    Generate Random Parking Entity Id
    Set Suite Variable    ${entity_id}

    Initialize IOP CNF 01
    ...    ${broker_A_url}
    @{first_set}=    Create List
    ...    ${entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][inclusive_2]
    ...    inclusive
    ...    ${broker_B_url}
    ...    ${broker_A_url}

    @{second_set}=    Create List
    ...    ${entity_id}
    ...    ${IOP_REGISTRY_URL}[registration][exclusive_2]
    ...    exclusive
    ...    ${broker_C_url}
    ...    ${broker_A_url}

    Initialize IOP CNF 01
    ...    ${first_set}
    ...    ${second_set}

Delete Entities And Delete Registrations
    @{entities_to_delete}=    Create List    ${entity_id}
Loading