Commit 8691f1d8 authored by lopesg's avatar lopesg
Browse files

fixed merge conflicts

parents eb650098 bfe2a6a1

TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot

+2 −2
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ Resource ${EXECDIR}/resources/JsonUtils.resource 
*** Variable ***

${building_id_prefix}=  urn:ngsi-ld:Building:

${filename}=  building-simple-attributes-sample.jsonld

${expectation_filename}=  building-simple-attributes-sample-expectation.jsonld

${expectation_filename}=  building-simple-attributes-expectation.jsonld



*** Test Cases ***                               

018_01_01_Get an entity by id

    [Documentation]  Check that you can get an entity by id

    [Tags]  mandatory

    [Tags]  /entities/{entityId}    5_7_1



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

    ${request}    ${response}=    Create Entity Selecting Content Type  ${filename}     ${entity_id}    ${CONTENT_TYPE_LD_JSON}

TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot

+7 −2
Original line number Diff line number Diff line
@@ -7,21 +7,26 @@ Resource ${EXECDIR}/resources/JsonUtils.resource 
*** Variable ***

${building_id_prefix}=  urn:ngsi-ld:Building:

${filename}=  building-simple-attributes-sample.jsonld

${expectation_filename}=  building-simple-attributes-sample-expectation-query-attributes.jsonld

${expectation_filename}=  building-simple-attributes-query-expectation.jsonld

${attribute_airqualitylevel}=  https://ngsi-ld-test-suite/context#airQualityLevel

${attribute_subcategory}=  https://ngsi-ld-test-suite/context#subCategory



*** Test Cases ***                               

018_01_02_Query some attributes from an entity

    [Documentation]  Check that you can query some attributes from an entity

    [Tags]  mandatory

    [Tags]  /entities/{entityId}    5_7_1



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

    ${request}    ${response}=    Create Entity Selecting Content Type  ${filename}     ${entity_id}    ${CONTENT_TYPE_LD_JSON}

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



<<<<<<< HEAD

    ${attributes_to_be_retrieved}=  Create List      ${attribute_airqualitylevel}  ${attribute_subcategory}

    ${request}    ${response}=    Query Entity    ${entity_id}    ${CONTENT_TYPE_LD_JSON}    attrs=${attributes_to_be_retrieved}

=======

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

    ${response}=    Query Entity    ${entity_id}    ${CONTENT_TYPE_LD_JSON}    attrs=${attributes_to_be_retrieved}

>>>>>>> develop

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

    Check Response Body Containing Entity element    ${expectation_filename}    ${entity_id}    ${response['body']}

TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ Resource ${EXECDIR}/resources/JsonUtils.resource 
*** Variable ***

${building_id_prefix}=  urn:ngsi-ld:Building:

${filename}=  building-location-attribute-sample.jsonld

${expectation_filename}=  building-location-attribute-sample-expectation-query-geoproperty.jsonld

${expectation_filename}=  building-geoproperty-query-expectation.jsonld

${geometry_property}=  location



*** Test Cases ***                               

018_01_03_Query the geometry property from an entity

    [Documentation]  Check that you can query the geometry property from an entity

    [Tags]  mandatory

    [Tags]  /entities/{entityId}    5_7_1



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

    ${request}    ${response}=    Create Entity Selecting Content Type  ${filename}     ${entity_id}    ${CONTENT_TYPE_LD_JSON}

TP/NGSI-LD/ContextInformation/Consumption/Entity/018_02.robot

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Test Template Get Entity With Invalid/Missing Id 
Get Entity With Invalid/Missing Id

    [Arguments]  ${entity_id}    ${expected_status_code}    ${problem_type}

    [Documentation]  Check that you cannot get an entity with invalid/missing id

    [Tags]  mandatory

    [Tags]  /entities/{entityId}    5_7_1



    ${request}    ${response}=    Query Entity    ${entity_id}    ${CONTENT_TYPE_LD_JSON}

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

TP/NGSI-LD/ContextInformation/Consumption/Entity/018_03_01.robot

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: 
*** Test Cases ***                                                 

Get an entity if the Entity Id is not known to the system           

    [Documentation]  Check that you cannot get an entity if the entity id or attributes are not known to the system

    [Tags]  mandatory

    [Tags]  /entities/{entityId}    5_6_6



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

    ${request}    ${response}=    Query Entity    ${entity_id}    ${CONTENT_TYPE_LD_JSON}