Commit b5bfd0d7 authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

fixup: regressions introduced in sub-retrieve (develop) 

- Unknown keyword used when concatenating lists
- Ignored keys must not be surrounded by double quoted
parent bcf356c3

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

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ${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_keys}=    Create List    jsonldContext    timesFailed    timesSent    notificationTrigger

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

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ ${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_keys}=    Create List    jsonldContext    timesFailed    timesSent    notificationTrigger

    Check Response Body Containing Subscription element

    ...    ${expectation_file_path}

    ...    ${subscription_id}

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ ${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_keys}=    Create List    jsonldContext    timesFailed    timesSent    notificationTrigger

    Check Response Body Containing Subscription element

    ...    ${expected_subscription_payload_file_path}

    ...    ${subscription_id}

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

+6 −1
Original line number Diff line number Diff line
@@ -32,7 +32,12 @@ ${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"

    ${ignored_attributes}=    Create List

    ...    ${status_regex_expr}

    ...    jsonldContext

    ...    timesFailed

    ...    timesSent

    ...    notificationTrigger

    Check Updated Resource Set To

    ...    updated_resource=${subscription}

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

resources/AssertionUtils.resource

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ Check Response Body Containing Subscription element 
    ${subscription}=    Update Value To JSON    ${subscription_payload}    $..id    ${subscription_id}

    ${ignored_keys}=    Create List    ${context_regex_expr}

    IF    ${additional_ignored_keys} != None

        Extend List    ${ignored_keys}    ${additional_ignored_keys}

        ${ignored_keys}=    Combine Lists    ${ignored_keys}    ${additional_ignored_keys}

    END

    ${comparison_result}=    Compare Dictionaries Ignoring Keys

    ...    ${subscription}