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

Merge branch 'fix/misc-minor-fixes' into 'develop'

fix: misc minor fixes in tests

See merge request !69
parents e503f7f6 282f8a80
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ Query several entities based on a list of properties
    @{entities_ids_to_be_compared}=    Create List    ${first_entity_id}    ${second_entity_id}
    @{entities_ids_to_be_compared}=    Create List    ${first_entity_id}    ${second_entity_id}
    ${entities_ids_to_be_retrieved}=    Catenate    SEPARATOR=,    ${first_entity_id}    ${second_entity_id}
    ${entities_ids_to_be_retrieved}=    Catenate    SEPARATOR=,    ${first_entity_id}    ${second_entity_id}
    ${entity_types_to_be_retrieved}=    Catenate    SEPARATOR=,    ${entity_type}
    ${entity_types_to_be_retrieved}=    Catenate    SEPARATOR=,    ${entity_type}
    ${response}=    Query Entities    entity_types=${entity_types_to_be_retrieved}    geoproperty=${geometry_property}
    ${response}=    Query Entities    entity_types=${entity_types_to_be_retrieved}    geoproperty=${geometry_property}  accept=${CONTENT_TYPE_LD_JSON}
    Check Response Status Code    200    ${response['status']}
    Check Response Status Code    200    ${response['status']}
    Check Response Body Containing List Containing Entity elements    ${expectation_filename}    ${entities_ids_to_be_compared}    ${response['body']}
    Check Response Body Containing List Containing Entity elements    ${expectation_filename}    ${entities_ids_to_be_compared}    ${response['body']}
    [Teardown]    Delete Entities    ${first_entity_id}    ${second_entity_id}
    [Teardown]    Delete Entities    ${first_entity_id}    ${second_entity_id}
+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource
${building_id_prefix}=    urn:ngsi-ld:Building:
${building_id_prefix}=    urn:ngsi-ld:Building:
${filename}=      building-minimal-sample.jsonld
${filename}=      building-minimal-sample.jsonld
${entity_type}=    https://ngsi-ld-test-suite/context#Building
${entity_type}=    https://ngsi-ld-test-suite/context#Building
${invalid_entity_id_pattern}=    invalid_entity_id_pattern*
${invalid_entity_id_pattern}=    invalid_entity_id_pattern**


*** Test Cases ***
*** Test Cases ***
Query several entities based on incorrect id pattern
Query several entities based on incorrect id pattern
+1 −1
Original line number Original line Diff line number Diff line
@@ -21,6 +21,6 @@ Create a batch of one entity using the default context with JSON content type
    Check Response Body Containing an Attribute set to    almostFull
    Check Response Body Containing an Attribute set to    almostFull
    Retrieve Entity by Id    ${entity_id}    context=${ngsild_test_suite_context}
    Retrieve Entity by Id    ${entity_id}    context=${ngsild_test_suite_context}
    # Attribute should not be compacted as we did not provide a context containing this term
    # Attribute should not be compacted as we did not provide a context containing this term
    Check Response Body Containing an Attribute set to    https://uri.etsi.org/ngsi-ld/default-context/almostFull
    Check Response Body Containing an Attribute set to    ngsi-ld:default-context/almostFull
    @{entities_ids_to_be_deleted}=    Create List    ${entity_id}
    @{entities_ids_to_be_deleted}=    Create List    ${entity_id}
    Batch Delete Entities    @{entities_ids_to_be_deleted}
    Batch Delete Entities    @{entities_ids_to_be_deleted}
+2 −2
Original line number Original line Diff line number Diff line
@@ -3,9 +3,9 @@ Documentation Check that you can update a batch of entities
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
Suite Setup       Setup Initial Entities
Test Setup       Setup Initial Entities
Test Template     Batch Update Entity Scenarios
Test Template     Batch Update Entity Scenarios
Suite Teardown    Delete Initial Entities
Test Teardown    Delete Initial Entities


*** Variable ***
*** Variable ***
${building_id_prefix}=    urn:ngsi-ld:Building:
${building_id_prefix}=    urn:ngsi-ld:Building:
+1 −1
Original line number Original line Diff line number Diff line
@@ -17,6 +17,6 @@ Create Subscription With Invalid Request
    [Documentation]    Check that you cannot create a subscription with an invalid request
    [Documentation]    Check that you cannot create a subscription with an invalid request
    [Tags]    sub-create    5_8_1
    [Tags]    sub-create    5_8_1
    Create Subscription From File    ${filename}
    Create Subscription From File    ${filename}
    Check RL Response Status Code Set To Expected Code    400
    Check RL Response Status Code Set To    400
    Check RL Response Body Containing ProblemDetails Element Containing Type Element set to    ${response}    ${ERROR_TYPE_BAD_REQUEST_DATA}
    Check RL Response Body Containing ProblemDetails Element Containing Type Element set to    ${response}    ${ERROR_TYPE_BAD_REQUEST_DATA}
    Check RL Response Body Containing ProblemDetails Element Containing Title Element    ${response}
    Check RL Response Body Containing ProblemDetails Element Containing Title Element    ${response}
Loading