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

fix(046): misc errors in the implementation of the 046_XX series of Test Cases

parent dab34688
Loading
Loading
Loading
Loading
+2 −4
Original line number Original line Diff line number Diff line
@@ -4,8 +4,6 @@ Resource ${EXECDIR}/resources/ApiUtils.resource
Resource          ${EXECDIR}/resources/AssertionUtils.resource
Resource          ${EXECDIR}/resources/AssertionUtils.resource
Resource          ${EXECDIR}/resources/JsonUtils.resource
Resource          ${EXECDIR}/resources/JsonUtils.resource
Resource          ${EXECDIR}/resources/NotificationUtils.resource
Resource          ${EXECDIR}/resources/NotificationUtils.resource
# Suite Setup       Setup Initial Subscriptions
# Suite Teardown    Delete Initial Subscriptions
Suite Setup    Before Test
Suite Setup    Before Test
Suite Teardown    After Test
Suite Teardown    After Test


@@ -53,11 +51,11 @@ Check that a notification is only sent if status is active
    Add Initial Entity
    Add Initial Entity
    Setup Initial Subscriptions
    Setup Initial Subscriptions


    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}
    Update Entity Attributes    ${entity_id}    ${fragment_filename}    ${CONTENT_TYPE_LD_JSON}


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


    Output  ${notification}
    Should be Equal    ${subscription_id}    ${notification}[subscriptionId]
    Should be Equal    ${subscription_id}    ${notification}[subscriptionId]
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be Equal    5    ${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]    
    Should be Equal    ${5}    ${notification}[data][0][airQualityLevel][value]    
+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ Check that a notification is sent on the timeinterval
    Should Not Be Empty    ${notification}[data]    Notification data should not be empty
    Should Not Be Empty    ${notification}[data]    Notification data should not be empty
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be True    '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4.0' or '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4'
    Should be True    '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4.0' or '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4'
    Should be Equal    Building1    ${notification}[data][0][name][value] 
    Should be Equal    Eiffel Tower    ${notification}[data][0][name][value] 






+2 −2
Original line number Original line Diff line number Diff line
*** Settings ***
*** Settings ***
Documentation     A notification with all all subscribed Entities will be included if query or geoquery are not defined.
Documentation     A notification with all subscribed Entities will be included if query or geoquery are not defined.
Resource          ${EXECDIR}/resources/ApiUtils.resource
Resource          ${EXECDIR}/resources/ApiUtils.resource
Resource          ${EXECDIR}/resources/AssertionUtils.resource
Resource          ${EXECDIR}/resources/AssertionUtils.resource
Resource          ${EXECDIR}/resources/JsonUtils.resource
Resource          ${EXECDIR}/resources/JsonUtils.resource
@@ -56,7 +56,7 @@ Check that a notification is sent with all entities
    Should Not Be Empty    ${notification}[data]    Notification data should not be empty
    Should Not Be Empty    ${notification}[data]    Notification data should not be empty
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be True    '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4.0' or '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4'
    Should be True    '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4.0' or '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4'
    Should be Equal    Building1    ${notification}[data][0][name][value]
    Should be Equal    Eiffel Tower    ${notification}[data][0][name][value]




+3 −3
Original line number Original line Diff line number Diff line
@@ -58,8 +58,8 @@ Check that a notification is sent with all entities
    Dictionary Should Contain Key    ${notification}    data
    Dictionary Should Contain Key    ${notification}    data
    Should Not Be Empty    ${notification}[data]    Notification data should not be empty
    Should Not Be Empty    ${notification}[data]    Notification data should not be empty
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be True    '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4.0' or '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4'
    Should be Equal    ${5}     ${notification}[data][0][airQualityLevel][value]
    Should be Equal    Building1    ${notification}[data][0][name][value]
    Should be Equal    Eiffel Tower    ${notification}[data][0][name][value]






+1 −1
Original line number Original line Diff line number Diff line
@@ -59,4 +59,4 @@ Check that a notification is sent with all entities
    Should Not Be Empty    ${notification}[data]    Notification data should not be empty
    Should Not Be Empty    ${notification}[data]    Notification data should not be empty
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be Equal    ${entity_id}    ${notification}[data][0][id]
    Should be True    '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4.0' or '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4'
    Should be True    '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4.0' or '${notification}[data][0][https://ngsi-ld-test-suite/context#airQualityLevel][value]'=='4'
    Should be Equal    Building1    ${notification}[data][0][name][value]
    Should be Equal    Eiffel Tower    ${notification}[data][0][name][value]
Loading