From b25c5853310e8b8f358c550b7faac6a6ab55fd9b Mon Sep 17 00:00:00 2001 From: Benoit Orihuela Date: Tue, 3 Jun 2025 21:10:27 +0100 Subject: [PATCH] fix(temporal): attributes not matching temporal queries should not be part of the response (#31) --- .../021_01.robot | 13 ++--- .../021_02.robot | 10 ++-- .../021_03.robot | 10 ++-- .../021_04.robot | 10 ++-- .../021_05.robot | 10 ++-- .../021_06.robot | 8 ++-- .../021_07.robot | 10 ++-- .../021_08.robot | 10 ++-- .../021_09.robot | 8 ++-- .../021_10.robot | 47 ------------------- .../021_13.robot | 14 ++---- .../021_14.robot | 13 ++--- ...e-temporal-representation-020-04-01.jsonld | 3 +- ...resentation-languageproperty-020-17.jsonld | 4 +- ...oral-representation-property-020-17.jsonld | 4 +- ...oral-representation-property-020-19.jsonld | 1 - ...oral-representation-property-020-20.jsonld | 4 -- ...-representation-relationship-020-17.jsonld | 4 +- ...resentation-languageproperty-020-18.jsonld | 8 ---- ...lues-representation-property-020-18.jsonld | 8 ---- ...-representation-relationship-020-18.jsonld | 8 ---- ...s-temporal-representation-021-13-04.jsonld | 14 +----- ...s-temporal-representation-021-01-01.jsonld | 4 +- ...s-temporal-representation-021-01-02.jsonld | 4 +- ...s-temporal-representation-021-01-03.jsonld | 4 +- ...cles-temporal-representation-021-02.jsonld | 4 +- ...cles-temporal-representation-021-03.jsonld | 4 +- ...cles-temporal-representation-021-04.jsonld | 4 +- ...cles-temporal-representation-021-05.jsonld | 2 +- ...cles-temporal-representation-021-06.jsonld | 2 +- ...cles-temporal-representation-021-07.jsonld | 4 +- ...cles-temporal-representation-021-08.jsonld | 4 +- ...s-temporal-representation-021-09-01.jsonld | 2 +- ...s-temporal-representation-021-09-02.jsonld | 2 +- ...s-temporal-representation-021-13-01.jsonld | 8 +--- ...s-temporal-representation-021-13-02.jsonld | 8 +--- ...s-temporal-representation-021-13-03.jsonld | 8 +--- ...les-temporal-representation-021-14-01.json | 4 +- ...les-temporal-representation-021-14-02.json | 4 +- ...les-temporal-representation-021-14-03.json | 4 +- .../Consumption/021_01.json | 6 +-- .../Consumption/021_02.json | 6 +-- .../Consumption/021_03.json | 2 +- .../Consumption/021_04.json | 6 +-- .../Consumption/021_05.json | 6 +-- .../Consumption/021_06.json | 6 +-- .../Consumption/021_07.json | 6 +-- .../Consumption/021_08.json | 6 +-- .../Consumption/021_09.json | 4 +- .../Consumption/021_10.json | 38 --------------- .../Consumption/021_11.json | 6 +-- .../Consumption/021_12.json | 4 +- .../Consumption/021_13.json | 8 ++-- .../Consumption/021_14.json | 6 +-- .../test_ContextInformation_Consumption.py | 7 --- resources/ApiUtils/Common.resource | 5 ++ .../ContextInformationProvision.resource | 2 - resources/AssertionUtils.resource | 10 +--- resources/SubscriptionUtils.resource | 1 + 59 files changed, 113 insertions(+), 319 deletions(-) delete mode 100644 TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot delete mode 100644 doc/files/ContextInformation/Consumption/021_10.json create mode 100644 resources/ApiUtils/Common.resource diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot index 6bbe50687..943c1bda0 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -12,8 +13,6 @@ Test Template Query the temporal evolution of entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${bus_id_prefix}= urn:ngsi-ld:Bus: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${bus_payload_file}= 2020-08-bus-temporal-representation.jsonld @@ -44,29 +43,25 @@ Query the temporal evolution of entities ... endTimeAt=${endTimeAt} ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List - ... ${first_temporal_entity_representation_id} - ... ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} Setup Initial Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-01-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Test Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-01-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} Check Response Status Code 201 ${create_response2.status_code} Set Test Variable ${second_temporal_entity_representation_id} - ${third_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} + ${third_temporal_entity_representation_id}= Catenate ${BUS_ID_PREFIX}021-13-A ${create_response3}= Create Temporal Representation Of Entity ... ${bus_payload_file} ... ${third_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot index 513a15bb3..eba0fd5ad 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of certain attributes of entities +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -11,7 +12,6 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${expectation_file}= vehicles-temporal-representation-021-02.jsonld @@ -31,25 +31,21 @@ ${expectation_file}= vehicles-temporal-representation-021-02.json ... attrs=${temporal_attributes_to_be_retrieved} ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List - ... ${first_temporal_entity_representation_id} - ... ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-02-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Suite Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-02-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot index 40a59905b..91eef8135 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of the last N instances of entities attributes +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -11,7 +12,6 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation-multiple-instances.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${expectation_file}= vehicles-temporal-representation-021-03.jsonld @@ -30,25 +30,21 @@ ${expectation_file}= vehicles-temporal-representation-021-03.json ... lastN=${4} ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List - ... ${first_temporal_entity_representation_id} - ... ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-03-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Suite Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-03-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot index e247d8f6b..68bad1125 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities using a context +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -11,7 +12,6 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${expectation_file}= vehicles-temporal-representation-021-04.jsonld @@ -29,25 +29,21 @@ ${expectation_file}= vehicles-temporal-representation-021-04.json ... timeAt=2020-07-01T12:05:00Z ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List - ... ${first_temporal_entity_representation_id} - ... ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-04-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Suite Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-04-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot index e5eb38982..c36de8f73 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities matching the given type(s) +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -11,8 +12,6 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${bus_id_prefix}= urn:ngsi-ld:Bus: ${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${bus_payload_file}= 2020-08-bus-temporal-representation.jsonld ${expectation_file}= vehicles-temporal-representation-021-05.jsonld @@ -30,24 +29,21 @@ ${expectation_file}= vehicles-temporal-representation-021-05.jsonld ... timeAt=2020-07-01T12:05:00Z ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-05-A ${create_response1}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Suite Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${BUS_ID_PREFIX}021-05-A ${create_response2}= Create Temporal Representation Of Entity ... ${bus_payload_file} ... ${second_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot index 440f60807..35caab565 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities matching the given identifier(s) +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -11,7 +12,6 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${expectation_file}= vehicles-temporal-representation-021-06.jsonld @@ -31,23 +31,21 @@ ${expectation_file}= vehicles-temporal-representation-021-06.json ... timeAt=2020-07-01T12:05:00Z ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List ${first_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-06-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Suite Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-06-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot index 2a8e13ed5..84e6d1dab 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities matching the given id pattern +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -11,7 +12,6 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${expectation_file}= vehicles-temporal-representation-021-07.jsonld @@ -30,25 +30,21 @@ ${expectation_file}= vehicles-temporal-representation-021-07.json ... timeAt=2020-07-01T12:05:00Z ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List - ... ${first_temporal_entity_representation_id} - ... ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-07-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Suite Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-07-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot index 98f866c8d..0c0a39193 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities matching the given NGSI-LD query +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -11,7 +12,6 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${expectation_file}= vehicles-temporal-representation-021-08.jsonld @@ -28,25 +28,21 @@ ${expectation_file}= vehicles-temporal-representation-021-08.json ... timerel=after ... timeAt=2020-07-01T12:05:00Z ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List - ... ${first_temporal_entity_representation_id} - ... ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-08-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Suite Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-08-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot index a5faad6f5..9d388a2e0 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities matching the given NGSI-LD geo-query +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -12,7 +13,6 @@ Test Template Query the temporal evolution of entities matching the given *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-10-vehicle-temporal-representation-with-location.jsonld ${expectation_file}= vehicles-temporal-representation-021-09.jsonld @@ -43,21 +43,19 @@ Query the temporal evolution of entities matching the given NGSI-LD geo-query ... timeAt=2020-07-01T12:05:00Z ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-09-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Test Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-09-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot deleted file mode 100644 index 86ba75711..000000000 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot +++ /dev/null @@ -1,47 +0,0 @@ -*** Settings *** -Documentation Check that one can query the temporal evolution of entities matching the given NGSI-LD Context Source filter - -Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource -Resource ${EXECDIR}/resources/ApiUtils/ContextSourceRegistration.resource -Resource ${EXECDIR}/resources/AssertionUtils.resource -Resource ${EXECDIR}/resources/JsonUtils.resource -Resource ${EXECDIR}/resources/MockServerUtils.resource - -Test Setup Create Initial Context Source Registration and Mock Server -Test Teardown Delete Initial Context Source Registration and Mock Server - - -*** Variables *** -${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval.jsonld -${context_source_url}= http://${context_source_host}:${context_source_port} - - -*** Test Cases *** -021_10_01 Query the temporal evolution of entities matching the given NGSI-LD context source filter - [Documentation] Check that one can query the temporal evolution of entities matching the given NGSI-LD Context Source filter - [Tags] te-query 5_7_4 - ${entity_types_to_be_retrieved}= Catenate SEPARATOR=, Building - ${response}= Query Temporal Representation Of Entities - ... entity_types=${entity_types_to_be_retrieved} - ... csf=endpoint=="${context_source_url}" - ... timerel=after - ... timeAt=2020-07-01T12:05:00Z - ... context=${ngsild_test_suite_context} - Wait for redirected request - Check Response Status Code 200 ${response.status_code} - - -*** Keywords *** -Create Initial Context Source Registration and Mock Server - Start Context Source Mock Server - ${context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} - ${context_source_registration_payload}= Load Context Source Registration Sample With Reachable Context Source - ... ${context_source_registration_payload_file_path} - ... ${context_source_registration_id} - Create Context Source Registration ${context_source_registration_payload} - Set Suite Variable ${context_source_registration_id} - -Delete Initial Context Source Registration and Mock Server - Stop Context Source Mock Server - Delete Context Source Registration ${context_source_registration_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot index cf148abf1..f1a6e5d14 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities using the entityOperations method +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -12,8 +13,6 @@ Test Template Query the temporal evolution of entities using the entityOpe *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${bus_id_prefix}= urn:ngsi-ld:Bus: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${bus_payload_file}= 2020-08-bus-temporal-representation.jsonld @@ -41,30 +40,25 @@ Query the temporal evolution of entities using the entityOperations method ${response}= Query Temporal Representation Of Entities Via Post ... query_file_name=${payload_file} ... context=${ngsild_test_suite_context} - @{temporal_entities_representation_ids}= Create List - ... ${first_temporal_entity_representation_id} - ... ${second_temporal_entity_representation_id} - ... ${third_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-13-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Test Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-13-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} Check Response Status Code 201 ${create_response2.status_code} Set Test Variable ${second_temporal_entity_representation_id} - ${third_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} + ${third_temporal_entity_representation_id}= Catenate ${BUS_ID_PREFIX}021-13-A ${create_response3}= Create Temporal Representation Of Entity ... ${bus_payload_file} ... ${third_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot index 804a84e24..2143993e2 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Check that one can query the temporal evolution of entities with the simplified representation +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationConsumption.resource Resource ${EXECDIR}/resources/ApiUtils/TemporalContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource @@ -12,8 +13,6 @@ Test Template Query the temporal evolution of entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${bus_id_prefix}= urn:ngsi-ld:Bus: ${first_vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.jsonld ${bus_payload_file}= 2020-08-bus-temporal-representation.jsonld @@ -43,29 +42,25 @@ Query the temporal evolution of entities ... endTimeAt=${endTimeAt} ... context=${ngsild_test_suite_context} ... options=temporalValues - @{temporal_entities_representation_ids}= Create List - ... ${first_temporal_entity_representation_id} - ... ${second_temporal_entity_representation_id} Check Response Status Code 200 ${response.status_code} Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} - ... ${temporal_entities_representation_ids} ... ${response.json()} Setup Initial Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${first_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-14-A ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} Check Response Status Code 201 ${create_response1.status_code} Set Test Variable ${first_temporal_entity_representation_id} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Catenate ${VEHICLE_ID_PREFIX}021-14-B ${create_response2}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${second_temporal_entity_representation_id} Check Response Status Code 201 ${create_response2.status_code} Set Test Variable ${second_temporal_entity_representation_id} - ${third_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} + ${third_temporal_entity_representation_id}= Catenate ${BUS_ID_PREFIX}021-14-A ${create_response3}= Create Temporal Representation Of Entity ... ${bus_payload_file} ... ${third_temporal_entity_representation_id} diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01.jsonld index 2ef6fc8a7..1c88a9798 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01.jsonld @@ -12,6 +12,5 @@ "value":40, "observedAt":"2020-08-01T14:07:00Z" } - ], - "speed": [] + ] } \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-languageproperty-020-17.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-languageproperty-020-17.jsonld index e786bf3a4..fe6200ce9 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-representation-languageproperty-020-17.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-representation-languageproperty-020-17.jsonld @@ -8,7 +8,5 @@ "@none": "urn:ngsi-ld:null" }, "deletedAt": "2024-12-11T15:01:49.723294Z" - }, - "isParkedIn": [], - "fuelLevel": [] + } } \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-17.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-17.jsonld index 61e8c1812..fcfc7ad90 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-17.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-17.jsonld @@ -6,7 +6,5 @@ "value": "urn:ngsi-ld:null", "instanceId": "urn:ngsi-ld:Instance:901883e6-3c93-4a2f-8099-da1d72151f2a", "deletedAt": "2024-12-09T17:16:12.031483Z" - }, - "isParkedIn": [], - "name": [] + } } \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-19.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-19.jsonld index 42930839f..8023583c9 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-19.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-19.jsonld @@ -1,7 +1,6 @@ { "id": "urn:ngsi-ld:Vehicle:4413459323492023", "type": "Vehicle", - "fuelLevel": [], "scope": { "type": "Property", "value": [], diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-20.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-20.jsonld index cf5f41aba..cb89cccc0 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-20.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-representation-property-020-20.jsonld @@ -1,10 +1,6 @@ { "id": "urn:ngsi-ld:Vehicle:3998258693070791", "type": "Vehicle", - "fuelLevel": { - "type": "Property", - "values": [] - }, "scope": { "type": "Property", "values": [ diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-relationship-020-17.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-relationship-020-17.jsonld index 95b180056..e3768ab04 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-representation-relationship-020-17.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-representation-relationship-020-17.jsonld @@ -6,7 +6,5 @@ "object": "urn:ngsi-ld:null", "instanceId": "urn:ngsi-ld:Instance:5be942ce-3ea5-4701-8d1d-6b29897f246f", "deletedAt": "2024-12-11T11:02:49.270530Z" - }, - "fuelLevel": [], - "name": [] + } } \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicle-temporal-values-representation-languageproperty-020-18.jsonld b/data/temporalEntities/expectations/vehicle-temporal-values-representation-languageproperty-020-18.jsonld index b0954e0db..4c88975d8 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-values-representation-languageproperty-020-18.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-values-representation-languageproperty-020-18.jsonld @@ -13,13 +13,5 @@ "2024-12-11T16:21:08.388531Z" ] ] - }, - "fuelLevel": { - "type": "Property", - "values": [] - }, - "isParkedIn": { - "type": "Relationship", - "objects": [] } } \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicle-temporal-values-representation-property-020-18.jsonld b/data/temporalEntities/expectations/vehicle-temporal-values-representation-property-020-18.jsonld index ab89abcb1..493f817bf 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-values-representation-property-020-18.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-values-representation-property-020-18.jsonld @@ -9,13 +9,5 @@ "2024-12-11T15:19:24.514781Z" ] ] - }, - "isParkedIn": { - "type": "Relationship", - "objects": [] - }, - "name": { - "type": "LanguageProperty", - "languageMaps": [] } } \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicle-temporal-values-representation-relationship-020-18.jsonld b/data/temporalEntities/expectations/vehicle-temporal-values-representation-relationship-020-18.jsonld index 7ae19b047..885436895 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-values-representation-relationship-020-18.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-values-representation-relationship-020-18.jsonld @@ -9,13 +9,5 @@ "2024-12-11T15:19:24.696152Z" ] ] - }, - "name": { - "type": "LanguageProperty", - "languageMaps": [] - }, - "fuelLevel": { - "type": "Property", - "values": [] } } \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicles-bus-temporal-representation-021-13-04.jsonld b/data/temporalEntities/expectations/vehicles-bus-temporal-representation-021-13-04.jsonld index 13ed6526a..2b5a90bed 100644 --- a/data/temporalEntities/expectations/vehicles-bus-temporal-representation-021-13-04.jsonld +++ b/data/temporalEntities/expectations/vehicles-bus-temporal-representation-021-13-04.jsonld @@ -1,12 +1,6 @@ [ { - "id": "urn:ngsi-ld:Vehicle:8312244306646236", - "type": "Vehicle", - "speed": [], - "fuelLevel": [] - }, - { - "id": "urn:ngsi-ld:Vehicle:6947937731280818", + "id": "urn:ngsi-ld:Vehicle:021-13-B", "type": "Vehicle", "speed": [ { @@ -48,11 +42,5 @@ "observedAt": "2020-09-01T14:07:00Z" } ] - }, - { - "id": "urn:ngsi-ld:Bus:8760704607054204", - "type": "Bus", - "speed": [], - "fuelLevel": [] } ] \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01.jsonld index cdb6290ac..0af8dcbd5 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-01-A", "type":"Vehicle", "fuelLevel":[ { @@ -28,7 +28,7 @@ ] }, { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-01-B", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02.jsonld index cb63a4193..0cd44456a 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-01-A", "type":"Vehicle", "fuelLevel":[ { @@ -38,7 +38,7 @@ ] }, { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-01-B", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-03.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-03.jsonld index 60eee90a3..24812b14d 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-03.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-03.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-01-A", "type":"Vehicle", "fuelLevel":[ { @@ -28,7 +28,7 @@ ] }, { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-01-B", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-02.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-02.jsonld index 105bf3a1c..50fdc95b5 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-02.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-02.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-02-A", "type":"Vehicle", "speed":[ { @@ -21,7 +21,7 @@ ] }, { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-02-B", "type":"Vehicle", "speed":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-03.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-03.jsonld index d7af771b5..f264823e2 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-03.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-03.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-03-A", "type":"Vehicle", "speed":[ { @@ -48,7 +48,7 @@ ] }, { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-03-B", "type":"Vehicle", "speed":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-04.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-04.jsonld index 5044fa081..c5d41a338 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-04.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-04.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-04-A", "type":"Vehicle", "fuelLevel":[ { @@ -38,7 +38,7 @@ ] }, { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-04-B", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-05.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-05.jsonld index 94f0976af..e5167d5e5 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-05.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-05.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Bus:randomUUID", + "id":"urn:ngsi-ld:Bus:021-05-A", "type":"Bus", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-06.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-06.jsonld index ea0a97e4b..d91549845 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-06.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-06.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-06-A", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-07.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-07.jsonld index 5044fa081..1717de85e 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-07.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-07.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-07-A", "type":"Vehicle", "fuelLevel":[ { @@ -38,7 +38,7 @@ ] }, { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-07-B", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-08.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-08.jsonld index 0e177cd50..435b396db 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-08.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-08.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-08-A", "type":"Vehicle", "fuelLevel":[ { @@ -38,7 +38,7 @@ ] }, { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-08-B", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01.jsonld index f72267e5c..9597f725c 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-09-B", "type":"Vehicle", "speed":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02.jsonld index f72267e5c..9597f725c 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-09-B", "type":"Vehicle", "speed":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01.jsonld index 224342c63..c43ca4da5 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01.jsonld @@ -1,12 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", - "type":"Vehicle", - "fuelLevel": [], - "speed": [] - }, - { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-13-B", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02.jsonld index 4ae3b0a37..c31170e32 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02.jsonld @@ -1,6 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-13-A", "type":"Vehicle", "fuelLevel":[ { @@ -36,11 +36,5 @@ "observedAt":"2020-08-01T12:07:00Z" } ] - }, - { - "id":"urn:ngsi-ld:Vehicle:randomUUID", - "type":"Vehicle", - "fuelLevel": [], - "speed": [] } ] \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-03.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-03.jsonld index 20dfc082f..deac5ffe4 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-03.jsonld +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-03.jsonld @@ -1,12 +1,6 @@ [ { - "id":"urn:ngsi-ld:Vehicle:randomUUID", - "type":"Vehicle", - "fuelLevel": [], - "speed": [] - }, - { - "id":"urn:ngsi-ld:Vehicle:randomUUID", + "id":"urn:ngsi-ld:Vehicle:021-13-B", "type":"Vehicle", "fuelLevel":[ { diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01.json b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01.json index 229b21fe3..e6e26f88f 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01.json +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01.json @@ -1,6 +1,6 @@ [ { - "id": "urn:ngsi-ld:Vehicle:randomUUID", + "id": "urn:ngsi-ld:Vehicle:021-14-A", "type": "Vehicle", "speed": { "type": "Property", @@ -30,7 +30,7 @@ } }, { - "id": "urn:ngsi-ld:Vehicle:randomUUID", + "id": "urn:ngsi-ld:Vehicle:021-14-B", "type": "Vehicle", "speed": { "type": "Property", diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02.json b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02.json index 6b0c8547b..0448fc450 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02.json +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02.json @@ -1,6 +1,6 @@ [ { - "id": "urn:ngsi-ld:Vehicle:randomUUID", + "id": "urn:ngsi-ld:Vehicle:021-14-A", "type": "Vehicle", "speed": { "type": "Property", @@ -38,7 +38,7 @@ } }, { - "id": "urn:ngsi-ld:Vehicle:randomUUID", + "id": "urn:ngsi-ld:Vehicle:021-14-B", "type": "Vehicle", "speed": { "type": "Property", diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-03.json b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-03.json index 0450f26ea..12b615540 100644 --- a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-03.json +++ b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-03.json @@ -1,6 +1,6 @@ [ { - "id": "urn:ngsi-ld:Vehicle:randomUUID", + "id": "urn:ngsi-ld:Vehicle:021-14-A", "type": "Vehicle", "speed": { "type": "Property", @@ -30,7 +30,7 @@ } }, { - "id": "urn:ngsi-ld:Vehicle:randomUUID", + "id": "urn:ngsi-ld:Vehicle:021-14-B", "type": "Vehicle", "speed": { "type": "Property", diff --git a/doc/files/ContextInformation/Consumption/021_01.json b/doc/files/ContextInformation/Consumption/021_01.json index 95fa9f622..56a66102e 100644 --- a/doc/files/ContextInformation/Consumption/021_01.json +++ b/doc/files/ContextInformation/Consumption/021_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Query the temporal evolution of entities", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file '${EMPTY}'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-01-01.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '${timeAt}' and\n Query Parameter: endTimeAt set to '${endTimeAt}' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Query the temporal evolution of entities", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file '${EMPTY}'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-01-02.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'before' and\n Query Parameter: timeAt set to '${timeAt}' and\n Query Parameter: endTimeAt set to '${endTimeAt}' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" @@ -59,7 +59,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Query the temporal evolution of entities", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file '2020-09-01T13:06:00Z'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-01-03.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'between' and\n Query Parameter: timeAt set to '${timeAt}' and\n Query Parameter: endTimeAt set to '${endTimeAt}' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_02.json b/doc/files/ContextInformation/Consumption/021_02.json index d03c732fd..1cb30b007 100644 --- a/doc/files/ContextInformation/Consumption/021_02.json +++ b/doc/files/ContextInformation/Consumption/021_02.json @@ -1,6 +1,6 @@ { "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_02", - "test_objective": "Check that you can query the temporal evolution of certain attributes of entities", + "test_objective": "Check that one can query the temporal evolution of certain attributes of entities", "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", "config_id": "", "parent_release": "v1.3.1", @@ -18,7 +18,7 @@ { "name": "021_02_01 Query the temporal evolution of certain attributes of entities", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_02_01", - "doc": "Check that you can query the temporal evolution of certain attributes of entities", + "doc": "Check that one can query the temporal evolution of certain attributes of entities", "tags": [ "5_7_4", "te-query" @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-02.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-02.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: attrs set to '${temporal_attributes_to_be_retrieved}' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_03.json b/doc/files/ContextInformation/Consumption/021_03.json index 6f2450cbb..baf7d2765 100644 --- a/doc/files/ContextInformation/Consumption/021_03.json +++ b/doc/files/ContextInformation/Consumption/021_03.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-03.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-03.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: lastN set to '4' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_04.json b/doc/files/ContextInformation/Consumption/021_04.json index 0790c8ac4..c75e2e7ec 100644 --- a/doc/files/ContextInformation/Consumption/021_04.json +++ b/doc/files/ContextInformation/Consumption/021_04.json @@ -1,6 +1,6 @@ { "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_04", - "test_objective": "Check that you can query the temporal evolution of entities using a context", + "test_objective": "Check that one can query the temporal evolution of entities using a context", "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", "config_id": "", "parent_release": "v1.3.1", @@ -18,7 +18,7 @@ { "name": "021_04_01 Query the temporal evolution of entities using a context", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_04_01", - "doc": "Check that you can query the temporal evolution of entities using a context", + "doc": "Check that one can query the temporal evolution of entities using a context", "tags": [ "5_7_4", "te-query" @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-04.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-04.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_05.json b/doc/files/ContextInformation/Consumption/021_05.json index b2f80cf1b..d941f7742 100644 --- a/doc/files/ContextInformation/Consumption/021_05.json +++ b/doc/files/ContextInformation/Consumption/021_05.json @@ -1,6 +1,6 @@ { "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_05", - "test_objective": "Check that you can query the temporal evolution of entities matching the given type(s)", + "test_objective": "Check that one can query the temporal evolution of entities matching the given type(s)", "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", "config_id": "", "parent_release": "v1.3.1", @@ -18,7 +18,7 @@ { "name": "021_05_01 Query the temporal evolution of entities matching the given type(s)", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_05_01", - "doc": "Check that you can query the temporal evolution of entities matching the given type(s)", + "doc": "Check that one can query the temporal evolution of entities matching the given type(s)", "tags": [ "5_7_4", "te-query" @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-05.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-05.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_06.json b/doc/files/ContextInformation/Consumption/021_06.json index 0e21e6d8d..f724337e7 100644 --- a/doc/files/ContextInformation/Consumption/021_06.json +++ b/doc/files/ContextInformation/Consumption/021_06.json @@ -1,6 +1,6 @@ { "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_06", - "test_objective": "Check that you can query the temporal evolution of entities matching the given identifier(s)", + "test_objective": "Check that one can query the temporal evolution of entities matching the given identifier(s)", "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", "config_id": "", "parent_release": "v1.3.1", @@ -18,7 +18,7 @@ { "name": "021_06_01 Query the temporal evolution of entities matching the given identifier(s)", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_06_01", - "doc": "Check that you can query the temporal evolution of entities matching the given identifier(s)", + "doc": "Check that one can query the temporal evolution of entities matching the given identifier(s)", "tags": [ "5_7_4", "te-query" @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-06.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-06.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: entity_ids set to '${entity_ids_to_be_retrieved}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_07.json b/doc/files/ContextInformation/Consumption/021_07.json index 8bf6f1a9f..ec749ee1a 100644 --- a/doc/files/ContextInformation/Consumption/021_07.json +++ b/doc/files/ContextInformation/Consumption/021_07.json @@ -1,6 +1,6 @@ { "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_07", - "test_objective": "Check that you can query the temporal evolution of entities matching the given id pattern", + "test_objective": "Check that one can query the temporal evolution of entities matching the given id pattern", "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", "config_id": "", "parent_release": "v1.3.1", @@ -18,7 +18,7 @@ { "name": "021_07_01 Query the temporal evolution of entities matching the given id pattern", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_07_01", - "doc": "Check that you can query the temporal evolution of entities matching the given id pattern", + "doc": "Check that one can query the temporal evolution of entities matching the given id pattern", "tags": [ "5_7_4", "te-query" @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-07.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-07.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: entity_id_pattern set to 'urn:ngsi-ld:Vehicle:.*' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_08.json b/doc/files/ContextInformation/Consumption/021_08.json index 5a0bda2eb..c24173188 100644 --- a/doc/files/ContextInformation/Consumption/021_08.json +++ b/doc/files/ContextInformation/Consumption/021_08.json @@ -1,6 +1,6 @@ { "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_08", - "test_objective": "Check that you can query the temporal evolution of entities matching the given NGSI-LD query", + "test_objective": "Check that one can query the temporal evolution of entities matching the given NGSI-LD query", "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", "config_id": "", "parent_release": "v1.3.1", @@ -18,7 +18,7 @@ { "name": "021_08_01 Query the temporal evolution of entities matching the given NGSI-LD query", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_08_01", - "doc": "Check that you can query the temporal evolution of entities matching the given NGSI-LD query", + "doc": "Check that one can query the temporal evolution of entities matching the given NGSI-LD query", "tags": [ "5_7_4", "te-query" @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-08.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-08.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: ngsild_query set to 'speed>90' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_09.json b/doc/files/ContextInformation/Consumption/021_09.json index 846a6b2f2..ce68611e5 100644 --- a/doc/files/ContextInformation/Consumption/021_09.json +++ b/doc/files/ContextInformation/Consumption/021_09.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Temporal Entities", "teardown": "Delete Initial Temporal Entities", "template": "Query the temporal evolution of entities matching the given NGSI-LD geo-query", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-09.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-09.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: georel set to 'near;maxDistance==2000' and\n Query Parameter: geometry set to 'Point' and\n Query Parameter: coordinates set to '[-8.503,41.202]' and\n Query Parameter: geoproperty set to '${EMPTY}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" @@ -43,7 +43,7 @@ "setup": "Setup Initial Temporal Entities", "teardown": "Delete Initial Temporal Entities", "template": "Query the temporal evolution of entities matching the given NGSI-LD geo-query", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-09.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-09.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: georel set to 'within' and\n Query Parameter: geometry set to 'Polygon' and\n Query Parameter: coordinates set to '[[[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-13.503,32.57],[-13.503,47.202]]]' and\n Query Parameter: geoproperty set to 'location' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/021_10.json b/doc/files/ContextInformation/Consumption/021_10.json deleted file mode 100644 index 17082eaaa..000000000 --- a/doc/files/ContextInformation/Consumption/021_10.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_10", - "test_objective": "Check that you can query the temporal evolution of entities matching the given NGSI-LD Context Source filter", - "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", - "config_id": "", - "parent_release": "v1.3.1", - "clauses": [ - "5.7.4" - ], - "pics_selection": "", - "keywords": [ - "Create Initial Context Source Registration and Mock Server", - "Delete Initial Context Source Registration and Mock Server" - ], - "teardown": "None", - "initial_condition": "with {\n the SUT containing a Context Source Registration of a context source (CS1) \n providing temporal information of two entities of type Building between 2020-08-01T22:07:00Z and 2021-08-01T21:07:00Z\n and CS1 containing two temporal entities of type Building and temporal evolution of those entities in the mentioned interval.\n}", - "test_cases": [ - { - "name": "021_10_01 Query the temporal evolution of entities matching the given NGSI-LD context source filter", - "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_10_01", - "doc": "Check that you can query the temporal evolution of entities matching the given NGSI-LD Context Source filter", - "tags": [ - "5_7_4", - "te-query" - ], - "setup": "Create Initial Context Source Registration and Mock Server", - "teardown": "Delete Initial Context Source Registration and Mock Server", - "template": null, - "then": "then {\n the SUT sends a valid Response for the operation:\n Query Temporal Representation Of Entities with Response Status Code set to 200\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: csf set to 'endpoint' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-07-01T12:05:00Z' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'\n}", - "http_verb": "GET", - "endpoint": "temporal/entities" - } - ], - "permutations": [], - "robotpath": "ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities", - "robotfile": "021_10" -} \ No newline at end of file diff --git a/doc/files/ContextInformation/Consumption/021_11.json b/doc/files/ContextInformation/Consumption/021_11.json index 52059da0a..3f20ca86a 100644 --- a/doc/files/ContextInformation/Consumption/021_11.json +++ b/doc/files/ContextInformation/Consumption/021_11.json @@ -1,6 +1,6 @@ { "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_11", - "test_objective": "Check that you can query the temporal evolution of entities with a limit to the number of entities to be retrieved", + "test_objective": "Check that one can query the temporal evolution of entities with a limit to the number of entities to be retrieved", "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", "config_id": "", "parent_release": "v1.3.1", @@ -19,7 +19,7 @@ { "name": "021_11_01 Query Some entities", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_11_01", - "doc": "Check that you can query the temporal evolution of entities with a limit to the number of entities to be retrieved", + "doc": "Check that one can query the temporal evolution of entities with a limit to the number of entities to be retrieved", "tags": [ "5_7_4", "te-query" @@ -35,7 +35,7 @@ { "name": "021_11_02 Query All entities", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_11_02", - "doc": "Check that you can query the temporal evolution of entities with a limit to the number of entities to be retrieved", + "doc": "Check that one can query the temporal evolution of entities with a limit to the number of entities to be retrieved", "tags": [ "5_7_4", "te-query" diff --git a/doc/files/ContextInformation/Consumption/021_12.json b/doc/files/ContextInformation/Consumption/021_12.json index 3ecf62918..84573005e 100644 --- a/doc/files/ContextInformation/Consumption/021_12.json +++ b/doc/files/ContextInformation/Consumption/021_12.json @@ -1,6 +1,6 @@ { "tp_id": "TP/NGSI-LD/CI/Cons/TE/021_12", - "test_objective": "Check that you cannot query the temporal evolution of entities with an invalid request or invalid request content", + "test_objective": "Check that one cannot query the temporal evolution of entities with an invalid request or invalid request content", "reference": "ETSI GS CIM 009 V1.3.1 [], clause 5.7.4", "config_id": "", "parent_release": "v1.3.1", @@ -18,7 +18,7 @@ { "name": "021_12_01 Query the temporal evolution of entities with an invalid request", "permutation_tp_id": "TP/NGSI-LD/CI/Cons/TE/021_12_01", - "doc": "Check that you cannot query the temporal evolution of entities with an invalid request", + "doc": "Check that one cannot query the temporal evolution of entities with an invalid request", "tags": [ "5_7_4", "te-query" diff --git a/doc/files/ContextInformation/Consumption/021_13.json b/doc/files/ContextInformation/Consumption/021_13.json index 1d95211db..462ef705f 100644 --- a/doc/files/ContextInformation/Consumption/021_13.json +++ b/doc/files/ContextInformation/Consumption/021_13.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Temporal Entities", "teardown": "Delete Initial Temporal Entities", "template": "Query the temporal evolution of entities using the entityOperations method", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities Via Post with Response Status Code set to 200 and\n Query Temporal Representation Of Entities Via Post with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-13-01.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities Via Post with Response Status Code set to 200 and\n Query Temporal Representation Of Entities Via Post with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-13-01.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entityOperations/query'\n method set to 'POST'\n Query Temporal Representation of Entities Via POST Request: and\n Query Parameter: query_file_name set to 'entity-operations-after-query.jsonld' and\n Query Parameter: Link set to '<$https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld>; rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\"' and\n Query Parameter: content_type set to 'application/json'\n}", "http_verb": "POST", "endpoint": "temporal/entityOperations/query" @@ -43,7 +43,7 @@ "setup": "Setup Initial Temporal Entities", "teardown": "Delete Initial Temporal Entities", "template": "Query the temporal evolution of entities using the entityOperations method", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities Via Post with Response Status Code set to 200 and\n Query Temporal Representation Of Entities Via Post with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-13-02.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities Via Post with Response Status Code set to 200 and\n Query Temporal Representation Of Entities Via Post with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-13-02.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entityOperations/query'\n method set to 'POST'\n Query Temporal Representation of Entities Via POST Request: and\n Query Parameter: query_file_name set to 'entity-operations-before-query.jsonld' and\n Query Parameter: Link set to '<$https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld>; rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\"' and\n Query Parameter: content_type set to 'application/json'\n}", "http_verb": "POST", "endpoint": "temporal/entityOperations/query" @@ -59,7 +59,7 @@ "setup": "Setup Initial Temporal Entities", "teardown": "Delete Initial Temporal Entities", "template": "Query the temporal evolution of entities using the entityOperations method", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities Via Post with Response Status Code set to 200 and\n Query Temporal Representation Of Entities Via Post with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-13-03.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities Via Post with Response Status Code set to 200 and\n Query Temporal Representation Of Entities Via Post with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-13-03.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entityOperations/query'\n method set to 'POST'\n Query Temporal Representation of Entities Via POST Request: and\n Query Parameter: query_file_name set to 'entity-operations-between-query.jsonld' and\n Query Parameter: Link set to '<$https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld>; rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\"' and\n Query Parameter: content_type set to 'application/json'\n}", "http_verb": "POST", "endpoint": "temporal/entityOperations/query" @@ -75,7 +75,7 @@ "setup": "Setup Initial Temporal Entities", "teardown": "Delete Initial Temporal Entities", "template": "Query the temporal evolution of entities using the entityOperations method", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities Via Post with Response Status Code set to 200 and\n Query Temporal Representation Of Entities Via Post with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-bus-temporal-representation-021-13-04.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities Via Post with Response Status Code set to 200 and\n Query Temporal Representation Of Entities Via Post with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-bus-temporal-representation-021-13-04.jsonld'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entityOperations/query'\n method set to 'POST'\n Query Temporal Representation of Entities Via POST Request: and\n Query Parameter: query_file_name set to 'entity-operations-after-query-two-entities.jsonld' and\n Query Parameter: Link set to '<$https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld>; rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\"' and\n Query Parameter: content_type set to 'application/json'\n}", "http_verb": "POST", "endpoint": "temporal/entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/021_14.json b/doc/files/ContextInformation/Consumption/021_14.json index 1798f42e2..9c015889f 100644 --- a/doc/files/ContextInformation/Consumption/021_14.json +++ b/doc/files/ContextInformation/Consumption/021_14.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Query the temporal evolution of entities", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file '${EMPTY}'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-14-01.json'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '${timeAt}' and\n Query Parameter: endTimeAt set to '${endTimeAt}' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\n Query Parameter: options set to 'temporalValues'\n}", "http_verb": "GET", "endpoint": "temporal/entities" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Query the temporal evolution of entities", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file '${EMPTY}'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-14-02.json'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'before' and\n Query Parameter: timeAt set to '${timeAt}' and\n Query Parameter: endTimeAt set to '${endTimeAt}' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\n Query Parameter: options set to 'temporalValues'\n}", "http_verb": "GET", "endpoint": "temporal/entities" @@ -59,7 +59,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Query the temporal evolution of entities", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file '2020-09-01T13:06:00Z'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Temporal Representation Of Entities with Response Status Code set to 200 and\n Query Temporal Representation Of Entities with Request response body containing a list that contains Entity Temporal Elements\n compared with file 'vehicles-temporal-representation-021-14-03.json'\n and using the list of entity ids define in '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities'\n method set to 'GET'\n Query Temporal Representation of Entities and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: timerel set to 'between' and\n Query Parameter: timeAt set to '${timeAt}' and\n Query Parameter: endTimeAt set to '${endTimeAt}' and\n Query Parameter: context set to 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\n Query Parameter: options set to 'temporalValues'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/tests/test_ContextInformation_Consumption.py b/doc/tests/test_ContextInformation_Consumption.py index 0b6c64937..a2de70689 100644 --- a/doc/tests/test_ContextInformation_Consumption.py +++ b/doc/tests/test_ContextInformation_Consumption.py @@ -420,13 +420,6 @@ class TestCIConsumptions(TestCase): self.common_function(robot_file=robot_file, expected_value=expected_value, difference_file=difference_file) - def test_021_10(self): - robot_file = f'{self.folder_test_suites}/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot' - expected_value = f'{self.folder_test_suites}/doc/files/ContextInformation/Consumption/021_10.json' - difference_file = f'{self.folder_test_suites}/doc/results/out_021_10.json' - - self.common_function(robot_file=robot_file, expected_value=expected_value, difference_file=difference_file) - def test_021_11(self): robot_file = f'{self.folder_test_suites}/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot' expected_value = f'{self.folder_test_suites}/doc/files/ContextInformation/Consumption/021_11.json' diff --git a/resources/ApiUtils/Common.resource b/resources/ApiUtils/Common.resource new file mode 100644 index 000000000..7d55b8eb6 --- /dev/null +++ b/resources/ApiUtils/Common.resource @@ -0,0 +1,5 @@ +*** Variables *** +${BUILDING_ID_PREFIX} urn:ngsi-ld:Building: +${BUS_ID_PREFIX} urn:ngsi-ld:Bus: +${CITY_ID_PREFIX} urn:ngsi-ld:City: +${VEHICLE_ID_PREFIX} urn:ngsi-ld:Vehicle: diff --git a/resources/ApiUtils/ContextInformationProvision.resource b/resources/ApiUtils/ContextInformationProvision.resource index defb0c4f1..fea283f78 100755 --- a/resources/ApiUtils/ContextInformationProvision.resource +++ b/resources/ApiUtils/ContextInformationProvision.resource @@ -24,8 +24,6 @@ ${BATCH_MERGE_ENDPOINT_PATH} entityOperations/merge ${ENTITIES_ENDPOINT_PATH} entities/ -${BUILDING_ID_PREFIX} urn:ngsi-ld:Building: - ${CONTENT_TYPE_JSON} application/json ${CONTENT_TYPE_LD_JSON} application/ld+json ${CONTENT_TYPE_MERGE_PATCH_JSON} application/merge-patch+json diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 9026e800e..5e4991c57 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -232,17 +232,9 @@ Check Response Body Containing EntityTemporal element Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing List Containing EntityTemporal elements - [Arguments] ${filename} ${temporal_entities_representation_ids} ${response_body} + [Arguments] ${filename} ${response_body} ${temporal_entities_representation_payload}= Load JSON From File ... ${EXECDIR}/data/temporalEntities/expectations/${filename} - ${index}= Set Variable 0 - FOR ${temporal_entity_representation_id} IN @{temporal_entities_representation_ids} - ${temporal_entities_representation_payload}= Update Value To JSON - ... ${temporal_entities_representation_payload} - ... $.[${index}]..id - ... ${temporal_entity_representation_id} - ${index}= Evaluate ${index} + 1 - END ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${temporal_entities_representation_payload} ... ${response_body} diff --git a/resources/SubscriptionUtils.resource b/resources/SubscriptionUtils.resource index 60101652c..84bba3cf9 100644 --- a/resources/SubscriptionUtils.resource +++ b/resources/SubscriptionUtils.resource @@ -1,6 +1,7 @@ *** Settings *** Documentation Common keywords used in setup steps for subscriptions +Resource ${EXECDIR}/resources/ApiUtils/Common.resource Resource ${EXECDIR}/resources/ApiUtils/ContextInformationSubscription.resource Resource ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource Resource ${EXECDIR}/resources/AssertionUtils.resource -- GitLab