Commit 3186b1fb authored by lopesg's avatar lopesg
Browse files

fixed more merge conflicts

parent 8654de39

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

+0 −5
Original line number Diff line number Diff line
@@ -20,13 +20,8 @@ ${attribute_subcategory}= https://ngsi-ld-test-suite/context#subCategory 
    ${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_03_02.robot

+0 −5
Original line number Diff line number Diff line
@@ -18,13 +18,8 @@ Get an entity if an attribute is not known to the system 
    ${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_not_known}

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

=======

    ${attributes_to_be_retrieved}=  Catenate    SEPARATOR=,     ${attribute_not_known}

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

>>>>>>> develop

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

    Check Response Body Containing ProblemDetails Element Containing Type Element set to      ${response}     ${ERROR_TYPE_RESOURCE_NOT_FOUND}

    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response}

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

+0 −4
Original line number Diff line number Diff line
@@ -11,11 +11,7 @@ ${parking_id_prefix}= urn:ngsi-ld:OffStreetParking: 
${building_filename}=  building-minimal-sample.jsonld

${vehicle_filename}=  vehicle-simple-attributes-sample.jsonld

${parking_filename}=  parking-simple-attributes-sample.jsonld

<<<<<<< HEAD

${expectation_filename}=  vehicle-parking-sample-expectation.json

=======

${expectation_filename}=  two-types-vehicle-offstreetparking-expectation.jsonld

>>>>>>> develop

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