Commit 769dc54d authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

refactor: add keyword to build context link (fix #1)

parent 40fbe500

TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot

+3 −2
Original line number Diff line number Diff line 
*** Settings ***

Documentation       The Notification content shall be JSON by default.



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

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

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

Resource            ${EXECDIR}/resources/AssertionUtils.resource
@@ -18,7 +19,6 @@ ${building_id_prefix} urn:ngsi-ld:Building: 
${entity_building_filepath}             building-simple-attributes.jsonld

${fragment_filename}                    airQualityLevel-fragment.jsonld

${notification_server_send_url}         http://${notification_server_host}:${notification_server_port}/notify

${expected_header_links}                <${ngsild_test_suite_context}>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"





*** Test Cases ***
@@ -30,7 +30,8 @@ ${expected_header_links} <${ngsild_test_suite_context}>; rel="htt 


    ${notification}    ${headers}=    Wait for notification    timeout=${10}



    Dictionary Should Contain Item    ${headers}    Link    ${expected_header_links}

    ${expected_header_link}=    Build Context Link    ${ngsild_test_suite_context}

    Dictionary Should Contain Item    ${headers}    Link    ${expected_header_link}

    Dictionary Should Not Contain Key    ${notification}[data][0]    @context

TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot

+2 −5
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Check that one can retrieve a context source registration subscription



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

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

Resource            ${EXECDIR}/resources/AssertionUtils.resource

Resource            ${EXECDIR}/resources/JsonUtils.resource
@@ -23,11 +24,7 @@ ${expectation_file_path}= csourceSubscriptions/expectations/subscr 
    ...    subscription_id=${subscription_id}

    ...    context=${ngsild_test_suite_context}



    ${expected_link_header}=    CATENATE

    ...    SEPARATOR=

    ...    <

    ...    ${ngsild_test_suite_context}

    ...    >; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"

    ${expected_link_header}=    Build Context Link    ${ngsild_test_suite_context}



    Check Response Status Code    200    ${response.status_code}

    Check Response Reason set to    ${response.reason}    OK

resources/ApiUtils/Common.resource

+6 −0
Original line number Diff line number Diff line
@@ -3,3 +3,9 @@ ${BUILDING_ID_PREFIX} urn:ngsi-ld:Building: 
${BUS_ID_PREFIX}            urn:ngsi-ld:Bus:

${CITY_ID_PREFIX}           urn:ngsi-ld:City:

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





*** Keywords ***

Build Context Link

    [Arguments]    ${context}

    RETURN    <${context}>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"

resources/ApiUtils/ContextInformationConsumption.resource

+17 −8
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Library ${EXECDIR}/libraries/logUtils.py 
Library         Collections

Library         OperatingSystem

Library         RequestsLibrary

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





*** Variables ***
@@ -54,9 +55,10 @@ Query Entities 
        Set To Dictionary    ${headers}    Accept    ${accept}

    END

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    IF    ${attrs_length}>0    Set To Dictionary    ${params}    attrs=${attrs}

    IF    '${geoproperty}'!=''
@@ -106,9 +108,10 @@ Query Entities Via POST 
    Set To Dictionary    ${headers}    Content-Type    ${content_type}

    Set To Dictionary    ${headers}    Accept    ${accept}

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    &{body}=    Create Dictionary

    Set To Dictionary    ${body}    type=Query
@@ -148,9 +151,10 @@ Query Entity 
        Set To Dictionary    ${headers}    Accept    ${accept}

    END

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    IF    ${attrs_length}>0    Set To Dictionary    ${params}    attrs=${attrs}

    IF    '${geometryProperty}'!=''
@@ -177,9 +181,10 @@ Retrieve Attribute 
        Set To Dictionary    ${headers}    Accept    ${accept}

    END

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${response}=    GET

    ...    url=${url}/${ATTRIBUTES_ENDPOINT_PATH}/${attribute_name}
@@ -197,9 +202,10 @@ Retrieve Attributes 
        Set To Dictionary    ${headers}    Accept    ${accept}

    END

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    Set To Dictionary    ${params}    details=${details}

    ${response}=    GET
@@ -222,9 +228,10 @@ Retrieve Entity by Id 
    ${options_length}=    Get Length    ${options}

    Set To Dictionary    ${headers}    Accept    ${accept}

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    IF    '${local}'!=''    Set To Dictionary    ${params}    local=${local}

    IF    ${options_length}>0
@@ -246,9 +253,10 @@ Retrieve Entity Type 
        Set To Dictionary    ${headers}    Accept    ${accept}

    END

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${response}=    GET

    ...    url=${url}/${ENTITIES_TYPES_ENDPOINT_PATH}/${type}
@@ -266,9 +274,10 @@ Retrieve Entity Types 
        Set To Dictionary    ${headers}    Accept    ${accept}

    END

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    Set To Dictionary    ${params}    details=${details}

    ${response}=    GET

resources/ApiUtils/ContextInformationProvision.resource

+17 −8
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Library RequestsLibrary 
Library         OperatingSystem

Library         Collections

Library         JSONLibrary

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

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

Resource        ${EXECDIR}/resources/JsonUtils.resource
@@ -74,9 +75,10 @@ Batch Create Entities 
        Set To Dictionary    ${headers}    Accept    ${accept}

    END

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${response}=    POST

    ...    url=${url}/${BATCH_CREATE_ENDPOINT_PATH}
@@ -188,9 +190,10 @@ Create Entity Selecting Content Type 
        Set To Dictionary    ${headers}    Accept=${accept}

    END

    IF    '${context}'!='${EMPTY}'

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${response}=    POST

    ...    url=${url}/${ENTITIES_ENDPOINT_PATH}
@@ -216,9 +219,10 @@ Delete Entity Attributes 
    [Arguments]    ${entityId}    ${attributeId}    ${datasetId}    ${deleteAll}    ${context}=${EMPTY}

    &{headers}=    Create Dictionary    Content-Type=${CONTENT_TYPE_JSON}

    IF    '${context}'!='${EMPTY}'

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    @{params}=    Create List

    IF    '${datasetId}'!=''
@@ -259,9 +263,10 @@ Partial Update Entity Attributes 
        Set To Dictionary    ${headers}    Accept    ${accept}

    END

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${fragment_payload}=    Load JSON From File    ${EXECDIR}/data/entities/fragmentEntities/${fragment_filename}

    ${response}=    PATCH
@@ -295,9 +300,10 @@ Replace Entity 
    ...    entity_id=${entity_id}

    &{headers}=    Create Dictionary    Content-Type=${content_type}

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${response}=    PUT

    ...    url=${url}/${ENTITIES_ENDPOINT_PATH}${entity_id}
@@ -315,9 +321,10 @@ Replace Entity Selecting Content Type 
    ...    ${context}=${EMPTY}

    &{headers}=    Create Dictionary    Content-Type=${content_type}

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${response}=    PUT

    ...    url=${url}/${ENTITIES_ENDPOINT_PATH}${entity_id}
@@ -337,9 +344,10 @@ Merge Entity 
    ${entity}=    Update Value To JSON    ${entity_payload}    $.id    ${entity_id}

    &{headers}=    Create Dictionary    Content-Type=${content_type}

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${response}=    PATCH

    ...    url=${url}/${ENTITIES_ENDPOINT_PATH}${entity_id}
@@ -358,9 +366,10 @@ Replace Attribute Selecting Content Type 
    ...    ${context}=${EMPTY}

    &{headers}=    Create Dictionary    Content-Type=${content_type}

    IF    '${context}'!=''

        ${context_link}=    Build Context Link    ${context}

        Set To Dictionary

        ...    ${headers}

        ...    Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json"

        ...    Link=${context_link}

    END

    ${response}=    PUT

    ...    url=${url}/${ENTITIES_ENDPOINT_PATH}${entity_id}/attrs/${attr_id}