Commit 325f93c9 authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

fix: correct Dist Ops TCs for Query Entities

parent 26edb243

TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot

+1 −1
Changes for TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Test Template Receive cSourceNotification For Newly Matching Context Sourc 




*** Variables ***

${first_context_source_registration_payload_file_path}=     csourceRegistrations/context-source-registration-vehicle-entities.jsonld

${first_context_source_registration_payload_file_path}=     csourceRegistrations/context-source-registration-vehicle-complete.jsonld

${second_context_source_registration_payload_file_path}=    csourceRegistrations/context-source-registration-bus-entities.jsonld

${subscription_payload_file_path}=                          csourceSubscriptions/subscription.jsonld

TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_01_inc.robot

+8 −6
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_01_inc.robot: 8 added lines, 6 removed lines.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify that, when one has an inclusive registration on a Context Broker and an entity only on a Context Source, if one queries the Context Broker the query gets forwarded to the Context Source correctly

Documentation       Verify that, when one has an inclusive registration on a Context Broker and an entity only on a

...                 Context Source, if one queries the Context Broker the query gets forwarded to the Context Source

...                 correctly



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
@@ -15,18 +17,18 @@ Test Teardown Delete Registration And Stop Context Source Mock Server 




*** Variables ***

${entity_id_prefix}                     urn:ngsi-ld:Vehicle:

${entity_payload_filename}              vehicle-simple-attributes.json

${registration_id_prefix}               urn:ngsi-ld:Registration:

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-complete.jsonld





*** Test Cases ***

D011_01_01_inc Query The Context Broker With Type

    [Documentation]    Check that if one queries the Context Broker for type, entity with matching type on a Context Source gets returned

    [Documentation]    Check that if one queries the Context Broker for type, entity with matching type on a Context

    ...    Source gets returned

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_7_2

    ${entity_body}=    Load Entity    ${entity_payload_filename}    ${entity_id}

    Set Stub Reply    GET    /ngsi-ld/v1/entities?type=Vehicle    200    ${entity_body}

    ${serialized_entity}=    Load Entity As Serialized Array    ${entity_payload_filename}    ${entity_id}

    Set Stub Reply    GET    /ngsi-ld/v1/entities?type=Vehicle    200    ${serialized_entity}



    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}



    Check Response Status Code    200    ${response.status_code}

TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_02_inc.robot

+8 −5
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_02_inc.robot: 8 added lines, 5 removed lines.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify that, when one has an inclusive registration on a Context Broker and an entity only on a Context Source, if one queries the Context Broker the query gets forwarded to the Context Source correctly

Documentation       Verify that, when one has an inclusive registration on a Context Broker and an entity only on a

...                 Context Source, if one queries the Context Broker the query gets forwarded to the Context Source

...                 correctly



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
@@ -15,16 +17,17 @@ Test Teardown Delete Registration And Stop Context Source Mock Server 




*** Variables ***

${entity_payload_filename}              vehicle-simple-attributes.jsonld

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-complete.jsonld





*** Test Cases ***

D011_01_02_inc Query The Context Broker With Type And Missing Attribute

    [Documentation]    Check that if one queries for type and an attribute that is missing, no entity gets returned

    [Documentation]    Check that if one queries for type and an attribute that is missing, no entity gets returned.

    ...    Contrast with D011_01_04, where a local entity also exists but also lacks the queried attribute.

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_7_2

    ${entity_body}=    Load Entity    ${entity_payload_filename}    ${entity_id}

    Set Stub Reply    GET    /ngsi-ld/v1/entities?type=Vehicle    200    ${entity_body}

    ${empty_response}=    Create Empty Array Result

    Set Stub Reply    GET    /ngsi-ld/v1/entities?attrs=speed&type=Vehicle    200    ${empty_response}



    ${response}=    Query Entities    entity_types=Vehicle    attrs=speed    context=${ngsild_test_suite_context}



    Check Response Status Code    200    ${response.status_code}

TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_03_inc.robot

+9 −5
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_03_inc.robot: 9 added lines, 5 removed lines.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify that, when one has an inclusive registration on a Context Broker, one entity on it and another on a Context Source, if one queries the Context Broker the query gets forwarded to the Context Source correctly

Documentation       Verify that, when one has an inclusive registration on a Context Broker, one entity on it and

...                 another on a Context Source, if one queries the Context Broker the query gets forwarded to the

...                 Context Source correctly



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
@@ -18,17 +20,19 @@ Test Teardown Delete Created Entity And Registration And Stop Context Sour 
${entity_payload_filename}              vehicle-simple-attributes.jsonld

${entity_payload_filename2}             vehicle-simple-attributes-second.json

${registration_id_prefix}               urn:ngsi-ld:Registration:

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-entities.jsonld

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-complete.jsonld





*** Test Cases ***

D011_01_03_inc Query The Context Broker With Type And Attribute

    [Documentation]    Check that if one queries for attribute present in an entity on a Context Source, only that entity gets returned

    [Documentation]    Check that if one queries for attribute present in an entity on a Context Source, only that

    ...    entity gets returned

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_7_2

    ${entity_body}=    Load Entity    ${entity_payload_filename2}    ${second_entity_id}

    Set Stub Reply    GET    /ngsi-ld/v1/entities?type=Vehicle    200    ${entity_body}

    ${serialized_entity}=    Load Entity As Serialized Array    ${entity_payload_filename2}    ${second_entity_id}

    Set Stub Reply    GET    /ngsi-ld/v1/entities?attrs=isParked2&type=Vehicle    200    ${serialized_entity}



    ${response}=    Query Entities    entity_types=Vehicle    attrs=isParked2    context=${ngsild_test_suite_context}



    Check Response Status Code    200    ${response.status_code}

    @{entities_id}=    Create List    ${second_entity_id}

    Check Response Body Containing Entities URIS set to    ${entities_id}    ${response.json()}

TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_04_inc.robot

+12 −13
Changes for TP/NGSI-LD/DistributedOperations/Consumption/Entity/QueryEntities/D011_01_04_inc.robot: 12 added lines, 13 removed lines.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Verify that, when one has an inclusive registration on a Context Broker, one entity on it and another on a Context Source, if one queries the Context Broker the query gets forwarded to the Context Source correctly

Documentation       Verify that, when one has an inclusive registration on a Context Broker, an entity exists on both

...                 the Context Broker and a Context Source, and one queries for an attribute absent from both entities,

...                 an empty result is returned



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
@@ -15,32 +17,29 @@ Test Teardown Delete Created Entity And Registration And Stop Context Sour 




*** Variables ***

${entity_id_prefix}                     urn:ngsi-ld:Vehicle:

${entity_payload_filename}              vehicle-simple-attributes.json

${entity_payload_filename2}             vehicle-simple-attributes-second.jsonld

${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-complete.jsonld





*** Test Cases ***

D011_01_04_inc Query The Context Broker With Type And Attribute In Neither

    [Documentation]    Check that if one queries for attribute present in neither of the entities, neither of them gets returned

    [Documentation]    Check that if one queries for attribute present in neither of the entities, neither of them gets

    ...    returned. Contrast with D011_01_02, where no local entity exists at all.

    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_7_2

    ${entity_body}=    Load Entity    ${entity_payload_filename}    ${first_entity_id}

    Set Stub Reply    GET    /ngsi-ld/v1/entities?type=Vehicle    200    ${entity_body}

    ${empty_response}=    Create Empty Array Result

    Set Stub Reply    GET    /ngsi-ld/v1/entities?attrs=speed&type=Vehicle    200    ${empty_response}



    ${response}=    Query Entities    entity_types=Vehicle    attrs=speed    context=${ngsild_test_suite_context}



    Check Response Status Code    200    ${response.status_code}

    Should Be Empty    ${response.json()}





*** Keywords ***

Create Entity And Registration On The Context Broker And Start Context Source Mock Server

    ${first_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${first_entity_id}



    ${second_entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${second_entity_id}

    ${response1}=    Create Entity    ${entity_payload_filename2}    ${second_entity_id}

    ${entity_id}=    Generate Random Vehicle Entity Id

    Set Suite Variable    ${entity_id}

    ${response1}=    Create Entity    ${entity_payload_filename2}    ${entity_id}

    Check Response Status Code    201    ${response1.status_code}



    ${registration_id}=    Generate Random CSR Id
@@ -54,5 +53,5 @@ Create Entity And Registration On The Context Broker And Start Context Source Mo 


Delete Created Entity And Registration And Stop Context Source Mock Server

    Delete Context Source Registration    ${registration_id}

    Delete Entity    ${second_entity_id}

    Delete Entity    ${entity_id}

    Stop Context Source Mock Server