Commit 7512aba8 authored by Andrea Il Grande's avatar Andrea Il Grande
Browse files

Mixed similar tests on attributes into one (056_02_01)

parent 508ea3b3

TP/NGSI-LD/ContextSource/DistributedOperations/AdditiveInclusive/QueryEntity/056_01_03.robot

+6 −9
Original line number Original line Diff line number Diff line
@@ -19,16 +19,13 @@ ${registration_id_prefix} urn:ngsi-ld:Registration: 
${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-complete.jsonld

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





*** Test Cases ***

*** Test Cases ***

056_01_03 Query The Context Consumer With Type And Attribute

056_01_03 Query The Context Consumer With Type And Missing Attribute

    [Tags]    dist-ops    e-query    5_7_2

    [Tags]    dist-ops    e-query    5_7_2

    [Documentation]    Check that if one queries for type and attribute, entity gets returned with just that attribute

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

    @{entities_id}=    Create List    ${entity_id}

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

    ${expected}=    Load JSON From File    ${EXECDIR}/data/entities/${entity_payload_filename}

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

    Check Response Status Code    200    ${response.status_code}

    Check Response Status Code    200    ${response.status_code}

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

    Should Be Empty    ${response.json()}

    Check JSON Value In Response Body    ['brandName']    ${expected['brandName']}    ${response.json()[0]}



    Check JSON Value Not In Response Body    ['isParked']    ${response.json()[0]}

    

    

*** Keywords ***

*** Keywords ***

Setup Entity On Remote And Registration

Setup Entity On Remote And Registration

TP/NGSI-LD/ContextSource/DistributedOperations/AdditiveInclusive/QueryEntity/056_01_04.robot

deleted100644 → 0
+0 −52
Original line number Original line Diff line number Diff line 
*** Settings ***

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



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

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

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

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

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource



Suite Setup         Setup Entity On Remote And Registration

Suite Teardown      Delete Created Entity And Registration





*** Variables ***

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

${entity_payload_filename}              vehicle-simple-attributes.jsonld

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

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



*** Test Cases ***

056_01_04 Query The Context Consumer With Type And Missing Attribute

    [Tags]    dist-ops    e-query    5_7_2

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

    ${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 ***

Setup Entity On Remote And Registration

    ${entity_id}=    Generate Random Entity Id    ${entity_id_prefix}

    Set Suite Variable    ${entity_id}

    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    url_type=${remote_url}

    Check Response Status Code    201    ${response.status_code}

    Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}



    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}

    Set Suite Variable    ${registration_id}

    ${registration_payload}=    Create ContextSourceRegistration Payload   

    ...    ${registration_id}

    ...    ${registration_payload_file_path}

    ${response1}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response1.status_code}

    





Delete Created Entity And Registration

    Delete Entity By Id    ${entity_id}     url_type=${remote_url}

    Delete Context Source Registration    ${registration_id} 



    
 No newline at end of file

TP/NGSI-LD/ContextSource/DistributedOperations/AdditiveInclusive/QueryEntity/056_02_01.robot

+6 −6
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ ${registration_payload_file_path} csourceRegistrations/context-source-regi 
*** Test Cases ***

*** Test Cases ***

056_02_01 Query The Context Consumer With Type and Attribute In Entity2

056_02_01 Query The Context Consumer With Type and Attribute In Entity2

    [Tags]    dist-ops    e-query    5_7_2

    [Tags]    dist-ops    e-query    5_7_2

    [Documentation]    Check that if one queries for attribute present in 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

    @{entities_id}=    Create List    ${entity_id2}

    @{entities_id}=    Create List    ${entity_id2}

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

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

    Check Response Status Code    200    ${response.status_code}

    Check Response Status Code    200    ${response.status_code}
@@ -32,13 +32,13 @@ ${registration_payload_file_path} csourceRegistrations/context-source-regi 
Setup Entities And Registration

Setup Entities And Registration

    ${entity_id}=    Generate Random Entity Id    ${entity_id_prefix}

    ${entity_id}=    Generate Random Entity Id    ${entity_id_prefix}

    Set Suite Variable    ${entity_id}

    Set Suite Variable    ${entity_id}

    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    url_type=${remote_url}

    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}

    Check Response Status Code    201    ${response.status_code}

    Check Response Status Code    201    ${response.status_code}

    Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}

    Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}





    ${entity_id2}=    Generate Random Entity Id    ${entity_id_prefix}

    ${entity_id2}=    Generate Random Entity Id    ${entity_id_prefix}

    Set Suite Variable    ${entity_id2}

    Set Suite Variable    ${entity_id2}

    ${response}=    Create Entity    ${entity_payload_filename2}    ${entity_id2}

    ${response}=    Create Entity    ${entity_payload_filename2}    ${entity_id2}    url_type=${remote_url}

    Check Response Status Code    201    ${response.status_code}

    Check Response Status Code    201    ${response.status_code}

    Check Response Headers Containing URI set to    ${entity_id2}    ${response.headers}

    Check Response Headers Containing URI set to    ${entity_id2}    ${response.headers}
@@ -54,7 +54,7 @@ Setup Entities And Registration 




Delete Created Entities And Registration

Delete Created Entities And Registration

    Delete Context Source Registration    ${registration_id}

    Delete Context Source Registration    ${registration_id}

    Delete Entity By Id    ${entity_id}    url_type=${remote_url}

    Delete Entity By Id    ${entity_id}

    Delete Entity By Id    ${entity_id2}

    Delete Entity By Id    ${entity_id2}    url_type=${remote_url}

TP/NGSI-LD/ContextSource/DistributedOperations/AdditiveInclusive/QueryEntity/056_02_02.robot

+5 −7
Original line number Original line Diff line number Diff line
@@ -19,14 +19,12 @@ ${registration_id_prefix} urn:ngsi-ld:Registration: 
${registration_payload_file_path}       csourceRegistrations/context-source-registration-vehicle-complete.jsonld

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





*** Test Cases ***

*** Test Cases ***

056_02_02 Query The Context Consumer With Type and Attribute In Both

056_02_02 Query The Context Consumer With Type and Attribute In Neither

    [Tags]    dist-ops    e-query    5_7_2

    [Tags]    dist-ops    e-query    5_7_2

    [Documentation]    Check that if one queries for attribute present in both entities, both of them get returned

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

    @{entities_id}=    Create List    ${entity_id}    ${entity_id2}

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

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

    Check Response Status Code    200    ${response.status_code}

    Check Response Status Code    200    ${response.status_code}

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

    Should Be Empty    ${response.json()}







*** Keywords ***

*** Keywords ***

Setup Entities And Registration

Setup Entities And Registration

TP/NGSI-LD/ContextSource/DistributedOperations/AdditiveInclusive/QueryEntity/056_02_03.robot

deleted100644 → 0
+0 −58
Original line number Original line Diff line number Diff line 
*** Settings ***

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



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

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

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

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

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource



Suite Setup         Setup Entities And Registration

Suite Teardown      Delete Created Entities And Registration



*** Variables ***

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

${entity_payload_filename}              vehicle-simple-attributes.jsonld

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

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

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



*** Test Cases ***

056_02_03 Query The Context Consumer With Type and Attribute In Neither

    [Tags]    dist-ops    e-query    5_7_2

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

    ${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 ***

Setup Entities And Registration

    ${entity_id}=    Generate Random Entity Id    ${entity_id_prefix}

    Set Suite Variable    ${entity_id}

    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    url_type=${remote_url}

    Check Response Status Code    201    ${response.status_code}

    Check Response Headers Containing URI set to    ${entity_id}    ${response.headers}



    ${entity_id2}=    Generate Random Entity Id    ${entity_id_prefix}

    Set Suite Variable    ${entity_id2}

    ${response}=    Create Entity    ${entity_payload_filename2}    ${entity_id2}

    Check Response Status Code    201    ${response.status_code}

    Check Response Headers Containing URI set to    ${entity_id2}    ${response.headers}



    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}

    Set Suite Variable    ${registration_id}

    ${registration_payload}=    Create ContextSourceRegistration Payload   

    ...    ${registration_id}

    ...    ${registration_payload_file_path}

    ${response1}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response1.status_code}

    





Delete Created Entities And Registration

    Delete Context Source Registration    ${registration_id} 

    Delete Entity By Id    ${entity_id}    url_type=${remote_url}

    Delete Entity By Id    ${entity_id2}