Commit 9fd9d65a authored by Ranim Naimi's avatar Ranim Naimi
Browse files

removed unnecessary attributes from entities samples

parent 48a54b42
Loading
Loading
Loading
Loading
+15 −17
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource

Suite Setup         Setup Initial Entities
Suite Teardown      Delete Initial Entities
Test Template       Query entities with multiple types using Entity Type Selection Language
Test Template       Query entities using Entity Type Selection Language


*** Variables ***
@@ -16,30 +16,28 @@ ${entity_id_prefix} urn:ngsi-ld:MultiTypes:
${first_entity_filename}                building-simple-attributes-sample.jsonld
${second_entity_filename}               building-with-different-type-sample.jsonld
${third_entity_filename}                building-with-two-types-sample.jsonld
${first_entity_type}            Building
${second_entity_type}           Parking
${third_entity_type}            TouristDestination
${options_parameter}            keyValues
${building_entity_type}                 Building
${parking_entity_type}                  Parking
${tourist_destination_entity_type}      TouristDestination


*** Test Cases ***    ENTITY_TYPES_SELECTION    EXPECTED_ENTITIES_IDS    EXPECTED_LENGTH
019_08_01 entities first query    ${first_entity_type}    ${first_expected_entities_ids}    2
019_08_02 entities second query    (${first_entity_type};${third_entity_type})    ${third_entity_id_as_a_list}    1
019_08_03 entities third query    ${first_entity_type},${second_entity_type}    ${second_expected_entities_ids}    3
019_08_04 entities fourth query    ${second_entity_type},${third_entity_type}    ${third_expected_entities_ids}    2
019_08_05 entities fifth query    (${first_entity_type};${second_entity_type}),${third_entity_type}    ${third_entity_id_as_a_list}   1
019_08_01 query with one type    ${building_entity_type}    ${first_expected_entities_ids}    2
019_08_02 query with the AND operator    (${building_entity_type};${tourist_destination_entity_type})    ${third_entity_id_as_a_list}    1
019_08_03 query with the OR operator    ${building_entity_type},${parking_entity_type}    ${second_expected_entities_ids}    3
019_08_04 different query with the OR operator    ${parking_entity_type},${tourist_destination_entity_type}    ${third_expected_entities_ids}    2
019_08_05 query with two operators    (${building_entity_type};${parking_entity_type}),${tourist_destination_entity_type}    ${third_entity_id_as_a_list}    1


*** Keywords ***
Query entities using Entity Type Selection Language
    [Documentation]    Query entities with Entity Type Selection Language.
    [Tags]    e-query    4_17
    [Tags]    e-query    4_17    5_7_2
    [Arguments]    ${entity_types_selection}    ${expected_entities_ids}    ${expected_length}

    ${response}=    Query Entities
    ...    entity_types=${entity_types_selection}
    ...    context=${ngsild_test_suite_context}
    ...    options=${options_parameter}

    Check Response Status Code    200    ${response.status_code}
    Check Response Body Containing Entities URIS set to
+1 −14
Original line number Diff line number Diff line
@@ -5,20 +5,7 @@
        "type": "Property",
        "value": "Eiffel Tower"
    },
    "subCategory": {
        "type": "Property",
        "value": "tourism"
    },
    "airQualityLevel": {
        "type": "Property",
        "value": 4,
        "unitCode": "C62",
        "observedAt": "2020-09-09T16:40:00.000Z"
    },
    "almostFull": {
        "type": "Property",
        "value": false
    },

    "@context": [
        "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
]
+0 −14
Original line number Diff line number Diff line
@@ -5,20 +5,6 @@
        "type": "Property",
        "value": "Eiffel Tower"
    },
    "subCategory": {
        "type": "Property",
        "value": "tourism"
    },
    "airQualityLevel": {
        "type": "Property",
        "value": 4,
        "unitCode": "C62",
        "observedAt": "2020-09-09T16:40:00.000Z"
    },
    "almostFull": {
        "type": "Property",
        "value": false
    },
    "@context": [
        "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
]