Commit 793c7687 authored by Patricia dos Santos Oliveira's avatar Patricia dos Santos Oliveira
Browse files

Merge branch 'feature/validation-after-create-or-update' into 'develop' 

reviewed query entities tests

See merge request !41
parents b418b2e3 5d7f6d97

TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ Query several entities based on attribute names 
    Check Response Status Code  201    ${response['status']}



    ${attributes_to_be_retrieved}=  Catenate    SEPARATOR=,   ${attribute_airqualitylevel}  ${attribute_subcategory}

    ${entities_ids_to_be_retrieved}=  Catenate    SEPARATOR=,     ${first_entity_id}

    @{entities_ids_to_be_compared}=  Create List     ${first_entity_id}

    ${response}=    Query Entities    attrs=${attributes_to_be_retrieved}

    Check Response Status Code  200    ${response['status']}

    Check Response Body Containing List Containing Entity elements    ${expectation_filename}    ${entities_ids_to_be_retrieved}    ${response['body']}

    Check Response Body Containing List Containing Entity elements    ${expectation_filename}    ${entities_ids_to_be_compared}    ${response['body']}



    [Teardown]  Delete Entities    ${first_entity_id}    ${second_entity_id}

TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot

+1 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ ${building_entity_type}= https://ngsi-ld-test-suite/context#Building 
${vehicle_entity_type}=  https://ngsi-ld-test-suite/context#Vehicle

${parking_entity_type}=  https://ngsi-ld-test-suite/context#OffStreetParking





*** Test Cases ***                                                 

Query several entities via POST Interaction based on the entities types

    [Documentation]  Check that you can query several entities via POST Interaction based on the entities types
@@ -36,12 +35,10 @@ Query several entities via POST Interaction based on the entities types 
    ${entity_types_to_be_retrieved}=  Catenate    SEPARATOR=,   ${vehicle_entity_type}    ${parking_entity_type}

    ${response}=    Query Entities Via POST    entity_types=${entity_types_to_be_retrieved}

    Check Response Status Code  200    ${response['status']}

    @{entities_ids_to_be_retrieved}=  Catenate    SEPARATOR=,     ${building_entity_id}    ${vehicle_entity_id}

    Check Response Body Containing List Containing Entity elements    ${expectation_filename}    ${entity_types_to_be_compared}    ${response['body']}



    [Teardown]  Delete Entities    ${building_entity_id}    ${vehicle_entity_id}    ${parking_entity_id}





*** Keywords ***

Delete Entities

    [Arguments]  ${building_entity_id}    ${vehicle_entity_id}    ${parking_entity_id}

TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot

+1 −3
Original line number Diff line number Diff line
@@ -24,15 +24,13 @@ Query several entities via POST Interaction based on the given id pattern 
    Check Response Status Code  201    ${response['status']}



    @{entities_ids_to_be_compared}=  Create List   ${first_entity_id}    ${second_entity_id}

    ${entities_ids_to_be_retrieved}=  Catenate    SEPARATOR=,   ${first_entity_id}    ${second_entity_id}

    @{entity_types_to_be_retrieved}=  Create List   ${entity_type}

    ${entity_types_to_be_retrieved}=  Catenate    SEPARATOR=,    ${entity_type}

    ${response}=    Query Entities Via POST    entity_id_pattern=${entity_id_pattern}    entity_types=${entity_types_to_be_retrieved}

    Check Response Status Code  200    ${response['status']}

    Check Response Body Containing List Containing Entity elements    ${expectation_filename}    ${entities_ids_to_be_compared}    ${response['body']}



    [Teardown]  Delete Entities    ${first_entity_id}    ${second_entity_id}





*** Keywords ***

Delete Entities

    [Arguments]  ${first_entity_id}    ${second_entity_id}

TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Query entities in a simplified representation 


    @{entities_ids_to_be_compared}=  Create List    ${first_entity_id}    ${second_entity_id}

    ${entities_ids_to_be_retrieved}=  Catenate    SEPARATOR=,   ${first_entity_id}    ${second_entity_id}

    @{entity_types_to_be_retrieved}=  Create List   ${entity_type}

    ${entity_types_to_be_retrieved}=  Catenate    SEPARATOR=,   ${entity_type}

    ${response}=    Query Entities    entity_ids=${entities_ids_to_be_retrieved}    entity_types=${entity_types_to_be_retrieved}    options=${options_parameter}

    Check Response Status Code  200    ${response['status']}

    Check Response Body Containing List Containing Entity elements    ${expectation_filename}    ${entities_ids_to_be_compared}    ${response['body']}

TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Get an entity by id that can be returned in a geoJSON format 


    @{entities_ids_to_be_compared}=  Create List   ${first_entity_id}    ${second_entity_id}

    ${entities_ids_to_be_retrieved}=  Catenate    SEPARATOR=,   ${first_entity_id}    ${second_entity_id}

    @{entity_types_to_be_retrieved}=  Create List   ${entity_type}

    ${entity_types_to_be_retrieved}=  Catenate    SEPARATOR=,   ${entity_type}

    ${response}=    Query Entities     entity_ids=${entities_ids_to_be_retrieved}    entity_types=${entity_types_to_be_retrieved}    accept=${accept_header}

    Check Response Status Code  200    ${response['status']}

    Check Response Body Containing List Containing Entity elements    ${expectation_filename}    ${entities_ids_to_be_compared}    ${response['body']}