Commit 37873813 authored by kzangeli's avatar kzangeli
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'origin/fix/subscription-config-notification-results' into integration/all-fixes
parents f7c78f94 d73544df

TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource 




*** Variables ***

${expected_status_code}=        503

${expected_status_code}=        504

${building_filename}=           building-unretrievable-context.jsonld

${subscription_filename}=       subscriptions/subscription-unretrievable-context.jsonld

${tea_filename}=                bus-temporal-representation-unretrievable-context.jsonld

TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot

+4 −1
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ ${subscription_expectation_file_path}= subscriptions/expectations/subscript 
    ...    id=${subscription_id}

    ...    accept=${CONTENT_TYPE_LD_JSON}

    ...    context=${ngsild_test_suite_context}

    ${ignore_keys}=    Create List    jsonldContext    timesFailed    timesSent    notificationTrigger

    # Ignore the broker-computed Additional Members of NotificationParams (lastNotification/

    # lastSuccess/lastFailure/timesSent/timesFailed/status) — non-deterministic, present

    # only after a notification has been delivered.

    ${ignore_keys}=    Create List    jsonldContext    notificationTrigger    ${notification_result_regex_expr}

    Check Created Resource Set To    ${expected_subscription}    ${response1.json()}    ${ignore_keys}

TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_07.robot

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ ${unavailable_jsonldContext_subscription_file_path}= subscriptions/subscripti 
    ${invalid_jsonldContext_subscription_file_path}    ${ERROR_TYPE_BAD_REQUEST_DATA}    400

028_07_02 Subscription With Unavailable jsonldContext

    [Tags]    sub-create    5_8_1    since_v1.7.1

    ${unavailable_jsonldContext_subscription_file_path}    ${ERROR_TYPE_LD_CONTEXT_NOT_AVAILABLE}    503

    ${unavailable_jsonldContext_subscription_file_path}    ${ERROR_TYPE_LD_CONTEXT_NOT_AVAILABLE}    504





*** Keywords ***

TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot

+4 −1
Original line number Diff line number Diff line
@@ -23,7 +23,10 @@ ${expectation_file_path}= subscriptions/expectations/subscriptions 
    ...    id=${subscription_id}

    ...    context=${ngsild_test_suite_context}

    Check Response Status Code    200    ${response.status_code}

    ${ignore_keys}=    Create List    jsonldContext    timesFailed    timesSent    notificationTrigger

    # Ignore the broker-computed Additional Members of NotificationParams (lastNotification/

    # lastSuccess/lastFailure/timesSent/timesFailed/status) — non-deterministic, present

    # only after a notification has been delivered.

    ${ignore_keys}=    Create List    jsonldContext    notificationTrigger    ${notification_result_regex_expr}

    Check Response Body Containing Subscription element

    ...    ${expectation_file_path}

    ...    ${subscription_id}

TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot

+8 −2
Original line number Diff line number Diff line
@@ -31,7 +31,10 @@ ${expected_expanded_subscription_payload_file_path}= subscriptions/expectatio 
    ${response1}=    Retrieve Subscription

    ...    id=${subscription_id}

    ...    context=${ngsild_test_suite_context}

    ${ignore_keys}=    Create List    jsonldContext    timesFailed    timesSent    notificationTrigger

    # Ignore the broker-computed Additional Members of NotificationParams (lastNotification/

    # lastSuccess/lastFailure/timesSent/timesFailed/status) — non-deterministic, present

    # only after a notification has been delivered.

    ${ignore_keys}=    Create List    jsonldContext    notificationTrigger    ${notification_result_regex_expr}

    Check Response Body Containing Subscription element

    ...    ${expected_subscription_payload_file_path}

    ...    ${subscription_id}
@@ -50,7 +53,10 @@ ${expected_expanded_subscription_payload_file_path}= subscriptions/expectatio 
    Check Response Body Is Empty    ${response}

    ${response1}=    Retrieve Subscription

    ...    id=${subscription_id}

    ${ignore_keys}=    Create List    jsonldContext    timesFailed    timesSent    notificationTrigger

    # Ignore the broker-computed Additional Members of NotificationParams (lastNotification/

    # lastSuccess/lastFailure/timesSent/timesFailed/status) — non-deterministic, present

    # only after a notification has been delivered.

    ${ignore_keys}=    Create List    jsonldContext    notificationTrigger    ${notification_result_regex_expr}

    Check Response Body Containing Subscription element

    ...    ${expected_expanded_subscription_payload_file_path}

    ...    ${subscription_id}