Commit e5f05698 authored by Benjamin Hebgen's avatar Benjamin Hebgen
Browse files

Merge branch 'fix/subretrieve' into 'develop' 

Fix/subretrieve

See merge request !193
parents ba36a1e2 32c27421

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

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

    ...    accept=${CONTENT_TYPE_LD_JSON}

    ...    context=${ngsild_test_suite_context}

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

    ${ignore_keys}=    Create List    "jsonldContext"    "timesFailed"    "timesSent"    "notificationTrigger"

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





*** Keywords ***

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

+2 −0
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ ${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"

    Check Response Body Containing Subscription element

    ...    ${expectation_file_path}

    ...    ${subscription_id}

    ...    ${response.json()}

    ...    ${ignore_keys}





*** Keywords ***

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

+2 −0
Original line number Diff line number Diff line
@@ -31,10 +31,12 @@ ${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"

    Check Response Body Containing Subscription element

    ...    ${expected_subscription_payload_file_path}

    ...    ${subscription_id}

    ...    ${response1.json()}

    ...    ${ignore_keys}



029_05_02 Update Subscription With Term to Uri Expansion without Context

    [Documentation]    Check that one can update a subcription: Term to URI expansion of Attribute names shall be observed

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

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ ${subscription_update_fragment_file_path}= subscriptions/fragments/subscrip 
    ...    id=${subscription_id}

    ...    accept=${CONTENT_TYPE_LD_JSON}

    ...    context=${ngsild_test_suite_context}

    ${ignored_attributes}=    Create List    ${status_regex_expr}    notificationTrigger

    ${ignored_attributes}=    Create List    ${status_regex_expr}    "jsonldContext"    "timesFailed"    "timesSent"    "notificationTrigger"

    Check Updated Resource Set To

    ...    updated_resource=${subscription}

    ...    response_body=${response1.json()}

doc/analysis/checks.py

+2 −2
Original line number Diff line number Diff line
@@ -306,8 +306,8 @@ class Checks: 
                'position': [0, 1]

            },

            'Check Response Body Containing Subscription element': {

                'params': ['filename', 'subscription_id', 'response_body'],

                'position': [0, 1, 2]

                'params': ['filename', 'subscription_id', 'response_body', 'additional_ignored_keys'],

                'position': [0, 1, 2, 3]

            },

            'Wait for notification': {

                'params': ['timeout'],