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

fix: PR comments + some errors in 033 test

parent 5ff82a58
Loading
Loading
Loading
Loading
+12 −7
Original line number Diff line number Diff line
@@ -15,29 +15,29 @@ ${registration_id_prefix}= urn:ngsi-ld:Registration:
${registration_payload_file_path}=      csourceRegistrations/context-source-registration-with-expiration.jsonld


*** Test Cases ***
*** Test Cases ***    FILENAME    HAS_MODE
033_01_01 Create Context Source Registration With Specific Date Expiration Date
    [Tags]    csr-create    5_9_2    since_v1.6.1
    [Tags]    csr-create    5_9_2
    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
    [Tags]    csr-create    5_9_2
    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
    csourceRegistrations/context-source-registration-with-mode-and-operations.jsonld    ${True}
033_01_04 Create Context Source Registration With Location
    [Tags]    csr-create    5_9_2    since_v1.6.1
    [Tags]    csr-create    5_9_2
    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
    [Arguments]    ${registration_payload_file_path}
    [Arguments]    ${registration_payload_file_path}    ${has_mode}=${False}
    ${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}
    ${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}
@@ -46,6 +46,11 @@ Create Context Source Registration
    ...    context=${ngsild_test_suite_context}
    ...    accept=${CONTENT_TYPE_LD_JSON}
    ${ignored_attributes}=    Create List    ${status_regex_expr}

    IF    ${has_mode} == ${False}
        Append To List    ${ignored_attributes}    mode    operations
    END

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

Delete Created Context Source Registrations
+4 −4
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ ${registration_payload_file_path}= csourceRegistrations/context-source-regi


*** Test Cases ***
033_02_01 Create a context source registration with invalid JSON file
    [Documentation]    Create a context source registration with invalid JSON file
033_02_01 Create a context source registration with invalid content
    [Documentation]    Check that one cannot create a context source with invalid content
    [Tags]    csr-create    5_9_2
    ${subscription_payload}=    Get File    ${EXECDIR}/data/${registration_payload_file_path}
    ${csr_payload}=    Load JSON From File    ${EXECDIR}/data/${registration_payload_file_path}
    ${response}=    Create Context Source Registration
    ...    ${subscription_payload}
    ...    ${csr_payload}
    Check Response Status Code    400    ${response.status_code}
    Check Response Body Type When Using Session Request    ${response.json()}    ${ERROR_TYPE_BAD_REQUEST_DATA}
    Check Response Body Title When Using Session Request    ${response.json()}
+4 −2
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ ${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}
    Check Response Body Containing Context Source Registration element
    ...    ${registration_payload_file_path}
    ...    ${registration_id}
    ...    ${response1.json()}


*** Keywords ***
+2 −5
Original line number Diff line number Diff line
@@ -32,11 +32,8 @@ ${registration_payload_file_path}= csourceRegistrations/context-source-regi
    ...    context=${ngsild_test_suite_context}
    ...    accept=${CONTENT_TYPE_LD_JSON}

    ${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}
    ${ignored_attributes}=    Create List    ${status_regex_expr}    mode    operations    timesSent    timesFailed
    Check Created Resource Set To    ${registration_payload}    ${response1.json()}    ${ignored_attributes}


*** Keywords ***
+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@
   "operations": ["queryEntity","queryTemporal","updateOps"],
   "endpoint": "http://my.csource.org:1026",
   "@context": [
      "https://easy-global-market.github.io/ngsild-api-data-models/ngsildTestSuite/ngsildTestSuiteV1.8-compound.jsonld"
      "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
   ]
}
 No newline at end of file
Loading