Commit 49ab68ef authored by Benedetta Arena's avatar Benedetta Arena
Browse files

fix: resolve more conflicts

parents 7451e429 1327171c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ${content_type}= application/json
    ...    ${id}
    ...    ${CONTENT_TYPE_LD_JSON}
    Check Response Status Code    201    ${response.status_code}
    ${response}=    Query Entity
    ${response}=    Retrieve Entity
    ...    id=${id}
    ...    context=${ngsild_test_suite_context}
    ...    accept=*/*
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ ${status_code}= 406
    [Documentation]    Verify throwing 406 HTTP status code (Not Acceptable Media Type) if the "Accept" header does not imply "application/json" nor "application/ld+json" (get /entities/{entityId})
    [Tags]    e-query    cb-noacceptable-medtype    6_3_4
    ${entity_id}=    Generate Random Building Entity Id
    ${response}=    Query Entity
    ${response}=    Retrieve Entity
    ...    id=${entity_id}
    ...    accept=${accept}
    Check Response Status Code    ${status_code}    ${response.status_code}
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ${expectation_filename}= building-simple-attributes.jsonld
018_01_01 Get An Entity By Id
    [Documentation]    Check that one can get an entity by id
    [Tags]    e-retrieve    5_7_1
    ${response}=    Query Entity
    ${response}=    Retrieve Entity
    ...    id=${entity_id}
    ...    accept=${CONTENT_TYPE_LD_JSON}

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ ${attribute_subcategory}= https://ngsi-ld-test-suite/context#subCatego
    ...    ${attribute_airqualitylevel}
    ...    ${attribute_subcategory}

    ${response}=    Query Entity
    ${response}=    Retrieve Entity
    ...    id=${entity_id}
    ...    accept=${CONTENT_TYPE_LD_JSON}
    ...    attrs=${attributes_to_be_retrieved}
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Get Entity With Invalid Id
    [Documentation]    Check that one cannot get an entity with invalid/missing id
    [Tags]    e-retrieve    5_7_1
    [Arguments]    ${entity_id}    ${expected_status_code}    ${problem_type}
    ${response}=    Query Entity
    ${response}=    Retrieve Entity
    ...    id=${entity_id}
    ...    accept=${CONTENT_TYPE_LD_JSON}
    Check Response Status Code    ${expected_status_code}    ${response.status_code}
Loading