Commit 4e0984d3 authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

Merge branch 'fix/incorrect-link-headers' into 'develop' 

fix: incorrect Link headers in API utils keywords

See merge request cim/ngsi-ld-test-suite!72
parents d0fa29ae 7a9e9298

resources/ApiUtils.resource

+2 −2
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ Query Entity 
    &{headers}=  Create Dictionary

    &{headers}=  Create Dictionary

    &{params}=  Create Dictionary

    &{params}=  Create Dictionary

    Run Keyword If     ${accept_length}>0       Set To Dictionary   ${headers}   Accept    ${accept}

    Run Keyword If     ${accept_length}>0       Set To Dictionary   ${headers}   Accept    ${accept}

    Run Keyword If     '${context}'!=''       Set To Dictionary   ${headers}    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type=${accept}

    Run Keyword If     '${context}'!=''       Set To Dictionary   ${headers}    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

    Run Keyword If     ${attrs_length}>0       Set To Dictionary   ${params}       attrs=${attrs}

    Run Keyword If     ${attrs_length}>0       Set To Dictionary   ${params}       attrs=${attrs}

    Run Keyword If     '${geoproperty}'!=''       Set To Dictionary   ${params}    geoproperty=${geoproperty}

    Run Keyword If     '${geoproperty}'!=''       Set To Dictionary   ${params}    geoproperty=${geoproperty}

    Run Keyword If     ${options_length}>0       Set To Dictionary   ${params}       options=${options}

    Run Keyword If     ${options_length}>0       Set To Dictionary   ${params}       options=${options}
@@ -77,7 +77,7 @@ Query Entities 
    &{headers}=  Create Dictionary

    &{headers}=  Create Dictionary

    &{params}=  Create Dictionary

    &{params}=  Create Dictionary

    Run Keyword If     ${accept_length}>0       Set To Dictionary   ${headers}   Accept    ${accept}

    Run Keyword If     ${accept_length}>0       Set To Dictionary   ${headers}   Accept    ${accept}

    Run Keyword If     '${context}'!=''       Set To Dictionary   ${headers}    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type=${accept}

    Run Keyword If     '${context}'!=''       Set To Dictionary   ${headers}    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

    Run Keyword If     ${attrs_length}>0       Set To Dictionary   ${params}       attrs=${attrs}

    Run Keyword If     ${attrs_length}>0       Set To Dictionary   ${params}       attrs=${attrs}

    Run Keyword If     '${geoproperty}'!=''       Set To Dictionary   ${params}    geoproperty=${geoproperty}

    Run Keyword If     '${geoproperty}'!=''       Set To Dictionary   ${params}    geoproperty=${geoproperty}

    Run Keyword If     ${options_length}>0       Set To Dictionary   ${params}       options=${options}

    Run Keyword If     ${options_length}>0       Set To Dictionary   ${params}       options=${options}