Commit cec56868 authored by Andrea Il Grande's avatar Andrea Il Grande
Browse files

updated test cases

parent f11bbf6f
Loading
Loading
Loading
Loading
+17 −8
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Resource ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.re
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
Resource            ${EXECDIR}/resources/AssertionUtils.resource
Resource            ${EXECDIR}/resources/JsonUtils.resource
Resource            ${EXECDIR}/resources/MockServerUtils.resource

Test Setup         Setup Entity On Remote And Registration
Test Teardown      Delete Created Entity And Registration
@@ -20,19 +21,27 @@ ${registration_payload_file_path} csourceRegistrations/context-source-regi

*** Test Cases ***
D011_01_01_inc Query The Context Broker With Type
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_7_2
    [Documentation]    Check that if one queries the Context Broker for type, entity with matching type on a Context Source gets returned
    @{entities_id}=    Create List    ${entity_id}
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_7_2
    Set Stub Reply    GET   /ngsi-ld/v1/entities?type=Vehicle   200
    ${response}=    Query Entities    entity_types=Vehicle    context=${ngsild_test_suite_context}
    
    Wait for redirected request
    
    ${received_request}=    Get Request Url
    Log To Console    ${received_request}
    ${stub_count}=    Get Stub Count    GET    /ngsi-ld/v1/entities?type=Vehicle
    Should Be True    ${stub_count} > 0
    Check Response Status Code    200    ${response.status_code}
    Check Response Body Containing Entities URIS set to    ${entities_id}    ${response.json()}
    # @{entities_id}=    Create List    ${entity_id}
    # Check Response Body Containing Entities URIS set to    ${entities_id}    ${response.json()}

*** Keywords ***
Setup Entity On Remote And Registration
    ${entity_id}=    Generate Random Entity Id    ${entity_id_prefix}
    Set Suite Variable    ${entity_id}
    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    base_url=${remote_url}
    Check Response Status Code    201    ${response.status_code}
    # ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    base_url=${remote_url}
    # Check Response Status Code    201    ${response.status_code}

    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
    Set Suite Variable    ${registration_id}
@@ -41,11 +50,11 @@ Setup Entity On Remote And Registration
    ...    ${registration_payload_file_path}
    ${response1}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response1.status_code}
    
    Start Context Source Mock Server


Delete Created Entity And Registration
    Delete Context Source Registration    ${registration_id}
    Delete Entity By Id    ${entity_id}    base_url=${remote_url}

    # Delete Entity By Id    ${entity_id}    base_url=${remote_url}
    Stop Context Source Mock Server
    
 No newline at end of file
+7 −6
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Resource ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.re
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
Resource            ${EXECDIR}/resources/AssertionUtils.resource
Resource            ${EXECDIR}/resources/JsonUtils.resource
Resource            ${EXECDIR}/resources/MockServerUtils.resource

Test Setup         Setup Entity On Remote And Registration
Test Teardown      Delete Created Entity And Registration
@@ -31,8 +32,8 @@ D011_01_02_inc Query The Context Broker With Type And Missing Attribute
Setup Entity On Remote And Registration
    ${entity_id}=    Generate Random Entity Id    ${entity_id_prefix}
    Set Suite Variable    ${entity_id}
    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    base_url=${remote_url}
    Check Response Status Code    201    ${response.status_code}
    # ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    base_url=${remote_url}
    # Check Response Status Code    201    ${response.status_code}

    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
    Set Suite Variable    ${registration_id}
@@ -41,11 +42,11 @@ Setup Entity On Remote And Registration
    ...    ${registration_payload_file_path}
    ${response1}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response1.status_code}
    Start Context Source Mock Server



Delete Created Entity And Registration
    Delete Entity By Id    ${entity_id}     base_url=${remote_url}
    # Delete Entity By Id    ${entity_id}     base_url=${remote_url}
    Delete Context Source Registration    ${registration_id} 

    
 No newline at end of file
    Stop Context Source Mock Server
+19 −8
Original line number Diff line number Diff line
@@ -7,30 +7,39 @@ Resource ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.re
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
Resource            ${EXECDIR}/resources/AssertionUtils.resource
Resource            ${EXECDIR}/resources/JsonUtils.resource
Resource            ${EXECDIR}/resources/MockServerUtils.resource

Test Setup         Setup Entity On Remote And Registration
Test Teardown      Delete Created Entity And Registration

*** Variables ***
${entity_id_prefix}                       urn:ngsi-ld:Vehicle:
${entity_payload_filename}                vehicle-simple-attributes.jsonld
${entity_payload_filename}                vehicle-simple-attributes.json
${registration_id_prefix}                 urn:ngsi-ld:Registration:
${registration_payload_file_path}         csourceRegistrations/context-source-registration-vehicle-complete.jsonld

*** Test Cases ***
D010_01_inc Retrieve entity on a Context Source from the Context Broker
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_7_1
    [Documentation]    Check that if one retrieves entity living on a Context Source from a Context Broker, entity gets returned
    [Tags]    since_v1.6.1    dist-ops    4_3_3    cf_06    additive-inclusive    4_3_6_2    5_7_1

    ${entity_body}=    Load Entity    ${entity_payload_filename}    ${entity_id}
    Set Stub Reply    GET    /ngsi-ld/v1/entities/${entity_id}    200    ${entity_body}
    ${response}=    Retrieve Entity By Id    ${entity_id}    context=${ngsild_test_suite_context}

    Wait for redirected request

    ${stub_count}=    Get Stub Count    GET    /ngsi-ld/v1/entities/${entity_id}
    Should Be True    ${stub_count} > 0
    
    Check Response Status Code    200    ${response.status_code}
    Check JSON Value In Response Body    ['id']    ${entity_id}    ${response.json()}

*** Keywords ***
Setup Entity On Remote And Registration
    ${entity_id}=    Generate Random Entity Id    ${entity_id_prefix}
    Set Suite Variable    ${entity_id}
    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    base_url=${remote_url}
    Check Response Status Code    201    ${response.status_code}
    # ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    base_url=${remote_url}
    # Check Response Status Code    201    ${response.status_code}

    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
    Set Suite Variable    ${registration_id}
@@ -39,9 +48,11 @@ Setup Entity On Remote And Registration
    ...    ${registration_payload_file_path}
    ${response1}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response1.status_code}
    Start Context Source Mock Server



Delete Created Entity And Registration
    Delete Entity By Id    ${entity_id}    base_url=${remote_url}
    Delete Context Source Registration    ${registration_id}
    # Delete Entity By Id    ${entity_id}    base_url=${remote_url}
    Stop Context Source Mock Server    
 No newline at end of file
+8 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Resource ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.re
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
Resource            ${EXECDIR}/resources/AssertionUtils.resource
Resource            ${EXECDIR}/resources/JsonUtils.resource
Resource            ${EXECDIR}/resources/MockServerUtils.resource

Test Setup         Setup Entity On Remote And Registration
Test Teardown      Delete Created Entity And Registration
@@ -29,8 +30,8 @@ D010_02_inc Retrieve entity on a Context Source from the Context Broker with loc
Setup Entity On Remote And Registration
    ${entity_id}=    Generate Random Entity Id    ${entity_id_prefix}
    Set Suite Variable    ${entity_id}
    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    base_url=${remote_url}
    Check Response Status Code    201    ${response.status_code}
    # ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}    base_url=${remote_url}
    # Check Response Status Code    201    ${response.status_code}

    ${registration_id}=    Generate Random Entity Id    ${registration_id_prefix}
    Set Suite Variable    ${registration_id}
@@ -39,9 +40,11 @@ Setup Entity On Remote And Registration
    ...    ${registration_payload_file_path}
    ${response1}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response1.status_code}
    Start Context Source Mock Server



Delete Created Entity And Registration
    Delete Entity By Id    ${entity_id}    base_url=${remote_url}
    # Delete Entity By Id    ${entity_id}    base_url=${remote_url}
    Delete Context Source Registration    ${registration_id}
    Stop Context Source Mock Server
 No newline at end of file
+8 −12
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ D001_01_inc Create Entity On Both Context Broker and Context Source
    ${response}=    Create Entity    ${entity_payload_filename}    ${entity_id}
    Check Response Status Code    201    ${response.status_code}

    # Works after adding these two lines in venv/lib/python3.12/site-packages/HttpCtrl/http_handler.py
    #    at line 86-87:
    #    request = Request(host, port, method, self.path, self.headers, body)
    #    RequestStorage().push(request)
    Wait for redirected request

    ${request_payload}=    Get Request Body
@@ -42,12 +38,12 @@ D001_01_inc Create Entity On Both Context Broker and Context Source
    Log    ${request_headers}

    @{entities_id}=    Create List    ${entity_id}
    ${payload_list}    Evaluate    [$payload]
    Check Response Body Containing Entities URIS set to    ${entities_id}    ${payload_list}

    ${response_query}=    Query Entities    entity_types=Vehicle    local=true    context=${ngsild_test_suite_context}
    Check Response Status Code    200    ${response_query.status_code}
    Check Response Body Containing Entities URIS set to    ${entities_id}    ${response_query.json()}
    ${response_query_remote}=    Query Entities    entity_types=Vehicle    base_url=${remote_url}
    Check Response Body Containing Entities URIS set to    ${entities_id}    ${response_query_remote.json()}

    
*** Keywords ***
Setup Entity Id And Registration
@@ -60,10 +56,10 @@ Setup Entity Id And Registration
    ...    ${registration_id}
    ...    ${registration_payload_file_path}
    ...    entity_id=${entity_id}
    ${response1}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response1.status_code}
    Start Context Source Mock Server
    ${response}=    Create Context Source Registration With Return    ${registration_payload}
    Check Response Status Code    201    ${response.status_code}
    
    Start Context Source Mock Server
Delete Created Entities And Registration
    Delete Context Source Registration    ${registration_id}
    Delete Entity By Id    ${entity_id}
Loading