Commit 5ff82a58 authored by thomas Bousselin's avatar thomas Bousselin Committed by Andrea Il Grande
Browse files

feat: 1.6.1 for CSR create-retrieve-delete (33-35-36)

parent be1cd5e4

TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot

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



Test Setup          Setup Initial Context Source Registrations

Test Teardown       Delete Created Context Source Registrations





*** Variables ***
@@ -37,6 +36,3 @@ Setup Initial Context Source Registrations 
    ${create_response}=    Create Context Source Registration With Return    ${updated_payload}

    Check Response Status Code    201    ${create_response.status_code}

    Set Test Variable    ${registration_id}
 


Delete Created Context Source Registrations

    Delete Context Source Registration    ${registration_id}

TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot→TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01.robot

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



Suite Teardown      Delete Created Context Source Registrations

Test Template       Create Context Source Registration





*** Variables ***
@@ -16,14 +17,30 @@ ${registration_payload_file_path}= csourceRegistrations/context-source-regi 


*** Test Cases ***

033_01_01 Create Context Source Registration With Specific Date Expiration Date

    [Tags]    csr-create    5_9_2    since_v1.6.1

    csourceRegistrations/context-source-registration-with-expiration.jsonld

033_01_02 Create Context Source Registration That Never Expires

    [Tags]    csr-create    5_9_2    since_v1.6.1

    csourceRegistrations/context-source-registration.jsonld

033_01_03 Create Context Source Registration With Non Default Mode And Operations

    [Tags]    csr-create    5_9_2    since_v1.6.1

    csourceRegistrations/context-source-registration-with-mode-and-operations.jsonld

033_01_04 Create Context Source Registration With Location

    [Tags]    csr-create    5_9_2    since_v1.6.1

    csourceRegistrations/context-source-registration-location.jsonld





*** Keywords ***

Create Context Source Registration

    [Documentation]    Check that one can create a context source registration with specific ID and expiration date

    [Tags]    csr-create    5_9_2

    [Arguments]    ${registration_payload_file_path}

    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}

    Set Suite Variable    ${registration_id}

    ${payload}=    Load JSON From File    ${EXECDIR}/data/${registration_payload_file_path}

    ${registration_payload}=    Update Value To JSON    ${payload}    $..id    ${registration_id}

    ${response}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response.status_code}

    Check Response Headers Containing URI set to    ${registration_id}    ${response.headers}

    ${response1}=    Retrieve Context Source Registration

    ...    context_source_registration_id=${registration_id}

    ...    context=${ngsild_test_suite_context}
@@ -31,7 +48,5 @@ ${registration_payload_file_path}= csourceRegistrations/context-source-regi 
    ${ignored_attributes}=    Create List    ${status_regex_expr}

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





*** Keywords ***

Delete Created Context Source Registrations

    Delete Context Source Registration    ${registration_id}

TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot→TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_11.robot

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ ${registration_payload_file_path}= csourceRegistrations/context-source-regi 




*** Test Cases ***

033_01_03 Create Context Source Registration Without Specifying an ID

033_11 Create Context Source Registration Without Specifying an ID

    [Documentation]    Check that one can create a context source registration without specifying an ID

    [Tags]    csr-create    5_9_2

    [Tags]    csr-create    5_9_2    since_v1.6.1

    ${payload}=    Load JSON From File    ${EXECDIR}/data/${registration_payload_file_path}

    ${response}=    Create Context Source Registration With Return    ${payload}

    Check Response Status Code    201    ${response.status_code}

TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot→TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_12.robot

+13 −7
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Check that one can create a context source registration that never expires

Documentation       Check that one can create a context source registration without default mode and operations



Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextSourceDiscovery.resource
@@ -11,17 +11,19 @@ Suite Teardown Delete Created Context Source Registrations 


*** Variables ***

${registration_id_prefix}=              urn:ngsi-ld:Registration:

${registration_payload_file_path}=      csourceRegistrations/context-source-registration.jsonld

${registration_payload_file_path}=      csourceRegistrations/context-source-registration-without-mode-operations.jsonld





*** Test Cases ***

033_01_02 Create Context Source Registration That Never Expires

    [Documentation]    Check that one can create a context source registration that never expires

    [Tags]    csr-create    5_9_2

033_12 Create Context Source Registration Without Mode And Operation

    [Documentation]    Check that one can create a context source registration without mode and operations

    [Tags]    csr-create    5_9_2    since_v1.6.1

    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}

    Set Suite Variable    ${registration_id}

    ${payload}=    Load JSON From File    ${EXECDIR}/data/${registration_payload_file_path}



    ${registration_payload}=    Update Value To JSON    ${payload}    $..id    ${registration_id}



    ${response}=    Create Context Source Registration With Return    ${registration_payload}

    Check Response Status Code    201    ${response.status_code}

    Check Response Headers Containing URI set to    ${registration_id}    ${response.headers}
@@ -29,8 +31,12 @@ ${registration_payload_file_path}= csourceRegistrations/context-source-regi 
    ...    context_source_registration_id=${registration_id}

    ...    context=${ngsild_test_suite_context}

    ...    accept=${CONTENT_TYPE_LD_JSON}

    ${ignored_attributes}=    Create List    ${status_regex_expr}

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



    ${ignored_attributes}=    Create List    ${status_regex_expr}    mode    operations

    ${expected_payload}=    Add Object To Json    ${registration_payload}    $.mode    inclusive

    ${operations}=    Create List    federationOps

    ${expected_payload}=    Add Object To Json    ${expected_payload}    $.operations    ${operations}

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





*** Keywords ***

data/csourceRegistrations/context-source-registration-csourceProperty.jsonld

+0 −4
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 
         ]

      }

   ],

   "location":{

     "type":"Point",

     "coordinates":[-8.521,41.2]

   },

   "endpoint":"http://my.csource.org:1026",

   "csourceProperty1": "aValue",

   "csourceProperty2": "anotherValue",