Commit f818272e authored by Ken Zangelin's avatar Ken Zangelin
Browse files

fix(subscriptions): check the broker-set members instead of ignoring them (#99)

parent 43e16bd0

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

+2 −2
Changes for TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ ${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

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

    ${subscription}=    Check Subscription Broker Members    ${expected_subscription}    ${response1.json()}

    Check Created Resource Set To    ${expected_subscription}    ${subscription}





*** Keywords ***

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

+2 −1
Changes for TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_06.robot: 2 added lines, 1 removed line.
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()}

    ${subscription}=    Check Subscription Broker Members    ${expected_subscription}    ${response1.json()}

    Check Created Resource Set To    ${expected_subscription}    ${subscription}





*** Keywords ***

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

+0 −2
Changes for TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -23,12 +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

    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

+0 −4
Changes for TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -31,12 +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

    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
@@ -50,12 +48,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

    Check Response Body Containing Subscription element

    ...    ${expected_expanded_subscription_payload_file_path}

    ...    ${subscription_id}

    ...    ${response1.json()}

    ...    ${ignore_keys}





*** Keywords ***

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

+3 −7
Changes for TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot: 3 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -32,15 +32,11 @@ ${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}

    ...    jsonldContext

    ...    timesFailed

    ...    timesSent

    ...    notificationTrigger

    ${retrieved}=    Check Subscription Broker Members    ${subscription}    ${response1.json()}

    ${ignored_attributes}=    Create List    ${status_regex_expr}

    Check Updated Resource Set To

    ...    updated_resource=${subscription}

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

    ...    response_body=${retrieved}

    ...    ignored_keys=${ignored_attributes}