Commit 602a556e authored by Houcem Kacem's avatar Houcem Kacem
Browse files

Merge branch 'fix/fix-batch-entities-expecations' into 'develop' 

fix batch entities expectations

See merge request !60
parents 9f7ea593 daaa643e

TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot

+2 −3
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ Batch Create Entity Scenarios 
    Check Response Status Code Set To  201

    Check Response Body Containing Array Of URIs set to   @{expected_entities_ids}



    Query Entities    ${entities_to_be_queried}  Building    context=${ngsild_test_suite_context}

    ${ignored_keys}=    Create List     ${context_regex_expr}

    Check Created Resources Set To     ${entities_to_be_created}    ${ignored_keys}

    Query Entities    ${entities_to_be_queried}  Building    context=${ngsild_test_suite_context}   accept=${CONTENT_TYPE_LD_JSON}

    Check Created Resources Set To     ${entities_to_be_created}



    Batch Delete Entities       @{expected_entities_ids}

TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot

+2 −3
Original line number Diff line number Diff line
@@ -32,10 +32,9 @@ Create a batch of two valid entities and one invalid entity 


    ${expected_entities_ids}=  Catenate    SEPARATOR=,     @{expected_successful_entities_ids}



    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}

    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}    accept=${CONTENT_TYPE_LD_JSON}

    @{created_entities}=  Create List   ${first_entity}     ${second_entity}

    ${ignored_keys}=    Create List     ${context_regex_expr}

    Check Created Resources Set To     ${created_entities}      ${ignored_keys}

    Check Created Resources Set To     ${created_entities}

    @{entities_ids_to_be_deleted}=  Create List   ${first_entity_id}     ${second_entity_id}    ${existing_entity_id}

    Batch Delete Entities       @{entities_ids_to_be_deleted}

TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot

+2 −3
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ Batch Update Entity Scenarios 
    ${second_updated_entity}=    Upsert Element In Entity     ${second_created_entity}    ${update_fragment}

    @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}

    ${expected_entities_ids}=  Catenate    SEPARATOR=,     @{entities_ids_to_be_updated}

    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}

    ${ignored_keys}=    Create List     ${context_regex_expr}

    Check Updated Resources Set To   ${updated_entities}    ${ignored_keys}

    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}    accept=${CONTENT_TYPE_LD_JSON}

    Check Updated Resources Set To   ${updated_entities}



Setup Initial Entities

    ${first_entity_id}=     Generate Random Entity Id    ${building_id_prefix}

TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot

+2 −3
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ Batch Update Entity With NoOverwrite Option Scenarios 
    ${second_updated_entity}=    Upsert Element In Entity     ${second_created_entity}    ${update_fragment}

    @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}

    ${expected_entities_ids}=  Catenate    SEPARATOR=,     @{entities_ids_to_be_updated}

    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}

    ${ignored_keys}=    Create List     ${context_regex_expr}

    Check Updated Resources Set To   ${updated_entities}    ${ignored_keys}

    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}    accept=${CONTENT_TYPE_LD_JSON}

    Check Updated Resources Set To   ${updated_entities}



Setup Initial Entities

    ${first_entity_id}=     Generate Random Entity Id    ${building_id_prefix}

TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot

+2 −3
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ Update a batch of non existing and existing entities 
    ${second_updated_entity}=    Upsert Element In Entity     ${second_created_entity}    ${update_fragment}

    @{updated_entities}=  Create List   ${first_updated_entity}     ${second_updated_entity}

    ${expected_entities_ids}=  Catenate    SEPARATOR=,     @{expected_successful_entities_ids}

    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}

    ${ignored_keys}=    Create List     ${context_regex_expr}

    Check Updated Resources Set To   ${updated_entities}    ${ignored_keys}

    Query Entities    ${expected_entities_ids}  Building    context=${ngsild_test_suite_context}    accept=${CONTENT_TYPE_LD_JSON}

    Check Updated Resources Set To   ${updated_entities}



    Batch Delete Entities       @{expected_successful_entities_ids}