Commit 613ad4e8 authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

fix(037_11): replace page by offset in pagination query

parent 3d92105e

TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot

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


Test Setup          Setup Initial Context Source Registrations

Test Teardown       Delete Created Context Source Registrations

Test Template       Query Context Source Registration With Limit And Page Parameters

Test Template       Query Context Source Registration With Limit And Offset Parameters





*** Variables ***
@@ -18,27 +18,27 @@ ${second_context_source_registration_payload_file_path}= csourceRegistrations 
${third_context_source_registration_payload_file_path}=     csourceRegistrations/context-source-registration-detailed-information-sample.jsonld





*** Test Cases ***    LIMIT    PAGE    EXPECTED_NUMBER    PREV_LINK    NEXT_LINK

*** Test Cases ***    LIMIT    OFFSET    EXPECTED_NUMBER    PREV_LINK    NEXT_LINK

037_11_01 Query Second Subscription

    [Tags]    csr-query    5_10_2

    ${1}    ${2}    ${1}    </ngsi-ld/v1/csourceRegistrations?type=Building&limit=1&page=1>;rel="prev";type="application/ld+json"    </ngsi-ld/v1/csourceSubscriptions?type=Building&limit=1&page=3>;rel="next";type="application/ld+json"

    ${1}    ${2}    ${1}    </ngsi-ld/v1/csourceRegistrations?type=Building&limit=1&offset=1>;rel="prev";type="application/ld+json"    </ngsi-ld/v1/csourceSubscriptions?type=Building&limit=1&offset=3>;rel="next";type="application/ld+json"

037_11_02 Query Last Subscription

    [Tags]    csr-query    5_10_2

    ${2}    ${2}    ${1}    </ngsi-ld/v1/csourceRegistrations?type=Building&limit=2&page=1>;rel="prev";type="application/ld+json"    ${EMPTY}

    ${2}    ${2}    ${1}    </ngsi-ld/v1/csourceRegistrations?type=Building&limit=2&offset=0>;rel="prev";type="application/ld+json"    ${EMPTY}

037_11_03 Query All Subscriptions

    [Tags]    csr-query    5_10_2

    ${15}    ${1}    ${3}    ${EMPTY}    ${EMPTY}

    ${15}    ${0}    ${2}    ${EMPTY}    ${EMPTY}





*** Keywords ***

Query Context Source Registration With Limit And Page Parameters

Query Context Source Registration With Limit And Offset Parameters

    [Documentation]    Check that you can query context source registrations with providing page and limit parameters, pagination logic shall be in place as mandated by clause 5.5.9.

    [Arguments]    ${limit}    ${page}    ${expected_number}    ${prev_link}    ${next_link}

    [Arguments]    ${limit}    ${offset}    ${expected_number}    ${prev_link}    ${next_link}

    ${response}=    Query Context Source Registrations

    ...    context=${ngsild_test_suite_context}

    ...    type=Building

    ...    limit=${limit}

    ...    page=${page}

    ...    offset=${offset}

    Check Response Status Code    200    ${response.status_code}

    Check Response Body Containing Number Of Entities

    ...    ContextSourceRegistration

resources/ApiUtils/ContextSourceDiscovery.resource

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Query Context Source Registrations 
    ...    ${timerel}=${EMPTY}

    ...    ${timeAt}=${EMPTY}

    ...    ${limit}=${EMPTY}

    ...    ${page}=${EMPTY}

    ...    ${offset}=${EMPTY}

    ...    ${accept}=${EMPTY}



    &{headers}=    Create Dictionary
@@ -69,7 +69,7 @@ Query Context Source Registrations 
    END

    IF    '${timeAt}'!=''    Set To Dictionary    ${params}    timeAt=${timeAt}

    IF    '${limit}'!=''    Set To Dictionary    ${params}    limit=${limit}

    IF    '${page}'!=''    Set To Dictionary    ${params}    page=${page}

    IF    '${offset}'!=''    Set To Dictionary    ${params}    offset=${offset}



    ${response}=    GET

    ...    url=${url}/${CONTEXT_SOURCE_REGISTRATION_ENDPOINT_PATH}
@@ -94,7 +94,7 @@ Query Context Source Registrations With Return 
    ...    ${timerel}=${EMPTY}

    ...    ${timeAt}=${EMPTY}

    ...    ${limit}=${EMPTY}

    ...    ${page}=${EMPTY}

    ...    ${offset}=${EMPTY}

    ...    ${accept}=${EMPTY}



    &{headers}=    Create Dictionary
@@ -129,7 +129,7 @@ Query Context Source Registrations With Return 
    END

    IF    '${timeAt}'!=''    Set To Dictionary    ${params}    timeAt=${timeAt}

    IF    '${limit}'!=''    Set To Dictionary    ${params}    limit=${limit}

    IF    '${page}'!=''    Set To Dictionary    ${params}    page=${page}

    IF    '${offset}'!=''    Set To Dictionary    ${params}    offset=${offset}



    ${response}=    GET

    ...    url=${url}/${CONTEXT_SOURCE_REGISTRATION_ENDPOINT_PATH}