From 48d5019f68047862bcc67f2d650b2887756a3020 Mon Sep 17 00:00:00 2001 From: Gustavo Lopes Date: Tue, 9 Mar 2021 14:54:07 +0000 Subject: [PATCH] renamed data files --- .../Consumption/Entity/018_01_01.robot | 2 +- .../Consumption/Entity/018_01_02.robot | 2 +- .../Consumption/Entity/018_01_03.robot | 2 +- .../Consumption/Entity/018_04.robot | 2 +- .../Consumption/Entity/018_05.robot | 2 +- .../Consumption/Entity/019_01_01.robot | 2 +- .../Consumption/Entity/019_01_02.robot | 2 +- .../Consumption/Entity/019_01_03.robot | 2 +- .../Consumption/Entity/019_01_04.robot | 2 +- .../Consumption/Entity/019_01_05.robot | 2 +- .../Consumption/Entity/019_02_01.robot | 2 +- .../Consumption/Entity/019_02_02.robot | 2 +- .../Consumption/Entity/019_02_03.robot | 2 +- .../Consumption/Entity/019_02_04.robot | 2 +- .../Consumption/Entity/019_02_05.robot | 2 +- .../Consumption/Entity/019_04.robot | 2 +- .../Consumption/Entity/019_05.robot | 2 +- .../Consumption/Entity/019_06.robot | 2 +- .../Provision/EntityAttributes/010_01.robot | 10 ++++----- .../Provision/EntityAttributes/010_02.robot | 6 ++--- .../Provision/EntityAttributes/010_03.robot | 2 +- .../Provision/EntityAttributes/011_01.robot | 8 +++---- .../Provision/EntityAttributes/011_02.robot | 6 ++--- .../Provision/EntityAttributes/011_03.robot | 2 +- .../Provision/EntityAttributes/012_01.robot | 6 ++--- .../Provision/EntityAttributes/012_02.robot | 12 +++++----- .../Provision/EntityAttributes/012_03.robot | 10 ++++----- .../Provision/TemporalEntity/014_01.robot | 2 +- .../Provision/TemporalEntity/014_02.robot | 2 +- .../Provision/TemporalEntity/014_03.robot | 2 +- .../Provision/TemporalEntity/016_01.robot | 2 +- .../Provision/TemporalEntity/016_02.robot | 2 +- .../Provision/TemporalEntity/016_03.robot | 2 +- .../033_01_01.robot | 2 +- .../033_01_02.robot | 2 +- .../033_01_03.robot | 2 +- .../033_02.robot | 6 ++--- .../033_03.robot | 2 +- .../033_06.robot | 2 +- .../033_07.robot | 2 +- .../033_09.robot | 2 +- .../035_01.robot | 2 +- .../035_02.robot | 2 +- .../035_03.robot | 2 +- .../034_01.robot | 4 ++-- .../034_02.robot | 12 +++++----- .../034_03.robot | 2 +- ...source-registration-invalid-sample.jsonld} | 2 +- ...gistration-invalid-structure-sample.jsonld | 7 ++++++ ...t-source-registration-no-id-sample.jsonld} | 2 +- ...egistration-past-expiration-sample.jsonld} | 2 +- ...-source-registration-simple-sample.jsonld} | 2 +- ...egistration-with-expiration-sample.jsonld} | 2 +- ...registration-different-type-sample.jsonld} | 2 +- ...gistration-invalid-structure-sample.jsonld | 7 ------ ...sonld => add-attribute-expectation.jsonld} | 0 ...lding-attributes-query-expectation.jsonld} | 2 +- ...ding-geoproperty-query-expectation.jsonld} | 0 ...cation-attribute-sample-expectation.jsonld | 22 ------------------- ...ld => building-minimal-expectation.jsonld} | 0 ...ding-simple-attributes-expectation.jsonld} | 0 ...imple-attributes-query-expectation.jsonld} | 0 ...-attributes-simplified-expectation.jsonld} | 0 ...hicle-offstreetparking-expectation.jsonld} | 0 ...ehicle-speed-datasetid-expectation.jsonld} | 0 ...id-attributes-sample-expectation-04.jsonld | 0 ...-sample.jsonld => invalid-fragment.jsonld} | 3 +-- ... vehicle-attribute-to-add-fragment.jsonld} | 0 ...e.jsonld => vehicle-empty-fragment.jsonld} | 0 ...sonld => vehicle-isparked-fragment.jsonld} | 0 ...speed-different-datasetid-fragment.jsonld} | 0 ...-datasetid-different-type-fragment.jsonld} | 0 ...cle-speed-equal-datasetid-fragment.jsonld} | 0 ...e-speed-invalid-datasetid-fragment.jsonld} | 0 ...le-speed-two-datasetid-01-fragment.jsonld} | 0 ...le-speed-two-datasetid-02-fragment.jsonld} | 0 ...le-speed-two-datasetid-03-fragment.jsonld} | 0 ...le-speed-two-datasetid-04-fragment.jsonld} | 0 ... vehicle-speed-wrong-name-fragment.jsonld} | 0 ...vehicle-speed-two-datasetid-sample.jsonld} | 0 ...oral-representation-fragment-sample.jsonld | 14 ------------ ...temporal-intanceid-update-fragment.jsonld} | 0 ...e-temporal-representation-fragment.jsonld} | 0 ...ion-without-context-fragment-sample.jsonld | 19 ---------------- 84 files changed, 92 insertions(+), 148 deletions(-) rename data/csourceRegistrations/{registration-invalid-sample.jsonld => context-source-registration-invalid-sample.jsonld} (85%) create mode 100644 data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld rename data/csourceRegistrations/{registration-no-id-sample.jsonld => context-source-registration-no-id-sample.jsonld} (84%) rename data/csourceRegistrations/{registration-past-expiration-sample.jsonld => context-source-registration-past-expiration-sample.jsonld} (85%) rename data/csourceRegistrations/{registration-sample.jsonld => context-source-registration-simple-sample.jsonld} (85%) rename data/csourceRegistrations/{registration-with-expiration-sample.jsonld => context-source-registration-with-expiration-sample.jsonld} (85%) rename data/csourceRegistrations/{registration-different-type-sample.jsonld => fragments/context-source-registration-different-type-sample.jsonld} (84%) delete mode 100644 data/csourceRegistrations/registration-invalid-structure-sample.jsonld rename data/entities/expectations/{vehicle-attributes-sample-append-expectation-02.jsonld => add-attribute-expectation.jsonld} (100%) rename data/entities/expectations/{building-attributes-query-sample-expectation.jsonld => building-attributes-query-expectation.jsonld} (89%) rename data/entities/expectations/{building-location-attribute-sample-expectation-query-geoproperty.jsonld => building-geoproperty-query-expectation.jsonld} (100%) delete mode 100644 data/entities/expectations/building-location-attribute-sample-expectation.jsonld rename data/entities/expectations/{building-minimal-sample-expectation.jsonld => building-minimal-expectation.jsonld} (100%) rename data/entities/expectations/{building-simple-attributes-sample-expectation.jsonld => building-simple-attributes-expectation.jsonld} (100%) rename data/entities/expectations/{building-simple-attributes-sample-expectation-query-attributes.jsonld => building-simple-attributes-query-expectation.jsonld} (100%) rename data/entities/expectations/{building-simple-attributes-sample-expectation-simplified.jsonld => building-simple-attributes-simplified-expectation.jsonld} (100%) rename data/entities/expectations/{vehicle-parking-sample-expectation.jsonld => two-types-vehicle-offstreetparking-expectation.jsonld} (100%) rename data/entities/expectations/{vehicle-two-datasetid-attributes-sample-expectation-03.jsonld => vehicle-speed-datasetid-expectation.jsonld} (100%) delete mode 100644 data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-04.jsonld rename data/entities/fragmentEntities/{invalid-vehicle-fragment-datasetid-sample.jsonld => invalid-fragment.jsonld} (77%) rename data/entities/fragmentEntities/{vehicle-fragment-same-datasetid-sample.jsonld => vehicle-attribute-to-add-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-fragment-all-empty-sample.jsonld => vehicle-empty-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-fragment-empty-datasetid-sample.jsonld => vehicle-isparked-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-fragment-different-datasetid-sample.jsonld => vehicle-speed-different-datasetid-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-fragment-equal-datasetid-different-type-sample.jsonld => vehicle-speed-equal-datasetid-different-type-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-fragment-equal-datasetid-sample.jsonld => vehicle-speed-equal-datasetid-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-fragment-invalid-datasetid-sample.jsonld => vehicle-speed-invalid-datasetid-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-two-datasetid-attributes-sample-01.jsonld => vehicle-speed-two-datasetid-01-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-two-datasetid-attributes-sample-02.jsonld => vehicle-speed-two-datasetid-02-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-two-datasetid-attributes-sample-03.jsonld => vehicle-speed-two-datasetid-03-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-two-datasetid-attributes-sample-04.jsonld => vehicle-speed-two-datasetid-04-fragment.jsonld} (100%) rename data/entities/fragmentEntities/{vehicle-fragment-attribute-name-missing-sample.jsonld => vehicle-speed-wrong-name-fragment.jsonld} (100%) rename data/entities/{vehicle-datasetid-attributes-sample.jsonld => vehicle-speed-two-datasetid-sample.jsonld} (100%) delete mode 100644 data/temporalEntities/fragments/vehicle-simplified-temporal-representation-fragment-sample.jsonld rename data/temporalEntities/fragments/{vehicle-temporal-intanceid-update-sample.jsonld => vehicle-temporal-intanceid-update-fragment.jsonld} (100%) rename data/temporalEntities/fragments/{vehicle-temporal-representation-fragment-sample.jsonld => vehicle-temporal-representation-fragment.jsonld} (100%) delete mode 100644 data/temporalEntities/fragments/vehicle-temporal-representation-without-context-fragment-sample.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot index 381f3b60..24656459 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation.jsonld +${expectation_filename}= building-simple-attributes-expectation.jsonld *** Test Cases *** 018_01_01_Get an entity by id diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot index 4fe17c79..0c6c80fd 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-query-attributes.jsonld +${expectation_filename}= building-simple-attributes-query-expectation.jsonld ${attribute_airqualitylevel}= https://ngsi-ld-test-suite/context#airQualityLevel ${attribute_subcategory}= https://ngsi-ld-test-suite/context#subCategory diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot index 8ccd23fa..d3f20c15 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-location-attribute-sample-expectation-query-geoproperty.jsonld +${expectation_filename}= building-geoproperty-query-expectation.jsonld ${geometry_property}= location *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_04.robot index 366e2126..d8e6cbdd 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_04.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-simplified.jsonld +${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld ${options_parameter}= keyValues *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_05.robot index d7e60109..27f28091 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_05.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-simplified.jsonld +${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld ${options_parameter}= keyValues ${accept_header}= application/geo+json diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_01.robot index d3f04514..920357a9 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_02.robot index 956bbd04..8d734a8e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_02.robot @@ -11,7 +11,7 @@ ${parking_id_prefix}= urn:ngsi-ld:OffStreetParking: ${building_filename}= building-minimal-sample.jsonld ${vehicle_filename}= vehicle-simple-attributes-sample.jsonld ${parking_filename}= parking-simple-attributes-sample.jsonld -${expectation_filename}= vehicle-parking-sample-expectation.jsonld +${expectation_filename}= two-types-vehicle-offstreetparking-expectation.jsonld ${building_entity_type}= https://ngsi-ld-test-suite/context#Building ${vehicle_entity_type}= https://ngsi-ld-test-suite/context#Vehicle ${parking_entity_type}= https://ngsi-ld-test-suite/context#OffStreetParking diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_03.robot index ac17db40..42ab2226 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${entity_id_pattern}= urn:ngsi-ld:Building:.* diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot index 1fc43211..6c03ee7e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld ${filename2}= building-minimal-sample.jsonld -${expectation_filename}= building-attributes-query-sample-expectation.jsonld +${expectation_filename}= building-attributes-query-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${attribute_airqualitylevel}= https://ngsi-ld-test-suite/context#airQualityLevel ${attribute_subcategory}= https://ngsi-ld-test-suite/context#subCategory diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_05.robot index c196f7df..9b6bfb83 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_05.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-location-attribute-sample-expectation-query-geoproperty.jsonld +${expectation_filename}= building-geoproperty-query-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${geometry_property}= location diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_01.robot index 597ccab9..eb6b1258 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot index a6d724e9..69e3adab 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot @@ -11,7 +11,7 @@ ${parking_id_prefix}= urn:ngsi-ld:OffStreetParking: ${building_filename}= building-minimal-sample.jsonld ${vehicle_filename}= vehicle-simple-attributes-sample.jsonld ${parking_filename}= parking-simple-attributes-sample.jsonld -${expectation_filename}= vehicle-parking-sample-expectation.jsonld +${expectation_filename}= two-types-vehicle-offstreetparking-expectation.jsonld ${building_entity_type}= https://ngsi-ld-test-suite/context#Building ${vehicle_entity_type}= https://ngsi-ld-test-suite/context#Vehicle ${parking_entity_type}= https://ngsi-ld-test-suite/context#OffStreetParking diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot index 3b0aeed3..5f8b2de2 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${entity_id_pattern}= urn:ngsi-ld:Building:.* diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_04.robot index aa46bdac..024e289b 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_04.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${attribute_airqualitylevel}= https://ngsi-ld-test-suite/context#airQualityLevel ${attribute_subcategory}= https://ngsi-ld-test-suite/context#subCategory diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_05.robot index da47aa14..9abc975d 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_05.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${geometry_property}= location diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot index 5622a072..1b4d8caf 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-simplified.jsonld +${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld ${options_parameter}= keyValues ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot index 08bef2dc..be2e37ad 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-simplified.jsonld +${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${accept_header}= application/geo+json diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_06.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_06.robot index fa326ffd..9f6639ef 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_06.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${limit}= 2 diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_01.robot index 721dc0af..e0f9e842 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_01.robot @@ -8,13 +8,13 @@ Test Template Append Attributes *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-datasetid-attributes-sample.jsonld +${filename}= vehicle-speed-two-datasetid-sample.jsonld *** Test Cases *** STATUS_CODE OVERWRITE FRAGMENT_FILENAME EXPECTATION_FILENAME -010_01_01_Append entity attributes 204 ${EMPTY} vehicle-fragment-same-datasetid-sample.jsonld ${EMPTY} -010_01_02_Append entity attributes 207 noOverwrite vehicle-fragment-same-datasetid-sample.jsonld vehicle-attributes-sample-append-expectation-02.jsonld -010_01_03_Append entity attributes 204 ${EMPTY} vehicle-fragment-different-datasetid-sample.jsonld ${EMPTY} -010_01_04_Append entity attributes 204 noOverwrite vehicle-fragment-different-datasetid-sample.jsonld ${EMPTY} +010_01_01_Append entity attributes 204 ${EMPTY} vehicle-attribute-to-add-fragment.jsonld ${EMPTY} +010_01_02_Append entity attributes 207 noOverwrite vehicle-attribute-to-add-fragment.jsonld add-attribute-expectation.jsonld +010_01_03_Append entity attributes 204 ${EMPTY} vehicle-speed-different-datasetid-fragment.jsonld ${EMPTY} +010_01_04_Append entity attributes 204 noOverwrite vehicle-speed-different-datasetid-fragment.jsonld ${EMPTY} *** Keywords *** Append Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_02.robot index db4e7325..acd9ea6e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_02.robot @@ -6,10 +6,10 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-datasetid-attributes-sample.jsonld -${fragment_filename}= vehicle-fragment-same-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid-sample.jsonld +${fragment_filename}= vehicle-attribute-to-add-fragment.jsonld ${status_code}= 400 -${invalid_fragment_filename}= invalid-vehicle-fragment-datasetid-sample.jsonld +${invalid_fragment_filename}= invalid-fragment.jsonld *** Test Cases *** #010_02_01_Append entity attributes if the entity Id is not present diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_03.robot index e84799b5..3459d6d0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_03.robot @@ -6,7 +6,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${fragment_filename}= vehicle-fragment-same-datasetid-sample.jsonld +${fragment_filename}= vehicle-attribute-to-add-fragment.jsonld *** Test Cases *** Append entity attributes when the entity id is not known to the system diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_01.robot index e2bad05c..cc7f73d4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_01.robot @@ -11,10 +11,10 @@ ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-two-datasetid-attributes-sample.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_FILENAME -011_01_01_Check that you can update existing attributes with no datasetId 204 vehicle-two-datasetid-attributes-sample-01.jsonld ${EMPTY} -011_01_02_Check that you can update existing attributes with the datasetId 204 vehicle-two-datasetid-attributes-sample-02.jsonld ${EMPTY} -011_01_03_Check that you can update only some attributes while others failed 207 vehicle-two-datasetid-attributes-sample-03.jsonld vehicle-two-datasetid-attributes-sample-expectation-03.jsonld -011_01_04_Check that you cannot change the type of the attribute 204 vehicle-two-datasetid-attributes-sample-04.jsonld ${EMPTY} +011_01_01_Check that you can update existing attributes with no datasetId 204 vehicle-speed-two-datasetid-01-fragment.jsonld ${EMPTY} +011_01_02_Check that you can update existing attributes with the datasetId 204 vehicle-speed-two-datasetid-02-fragment.jsonld ${EMPTY} +011_01_03_Check that you can update only some attributes while others failed 207 vehicle-speed-two-datasetid-03-fragment.jsonld vehicle-speed-datasetid-expectation.jsonld +011_01_04_Check that you cannot change the type of the attribute 204 vehicle-speed-two-datasetid-04-fragment.jsonld ${EMPTY} *** Keywords *** Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_02.robot index 2bcc4482..bbe3cec0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_02.robot @@ -9,11 +9,11 @@ ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: *** Test Cases *** 011_02_01_Update an attribute if the Entity Id is not present - Update Attributes ${EMPTY} vehicle-two-datasetid-attributes-sample.jsonld vehicle-two-datasetid-attributes-sample-01.jsonld + Update Attributes ${EMPTY} vehicle-two-datasetid-attributes-sample.jsonld vehicle-speed-two-datasetid-01-fragment.jsonld 011_02_02_Update an attribute if the Entity Id is not a valid URI - Update Attributes thisisaninvaliduri vehicle-two-datasetid-attributes-sample.jsonld vehicle-two-datasetid-attributes-sample-01.jsonld + Update Attributes thisisaninvaliduri vehicle-two-datasetid-attributes-sample.jsonld vehicle-speed-two-datasetid-01-fragment.jsonld 011_02_03_Update entity attributes with invalid entity fragments - Update entity attributes with invalid entity fragments vehicle-datasetid-attributes-sample.jsonld invalid-vehicle-fragment-datasetid-sample.jsonld + Update entity attributes with invalid entity fragments vehicle-speed-two-datasetid-sample.jsonld invalid-fragment.jsonld *** Keywords *** Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_03.robot index e8816488..f309554e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_03.robot @@ -6,7 +6,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${fragment_filename}= vehicle-two-datasetid-attributes-sample-01.jsonld +${fragment_filename}= vehicle-speed-two-datasetid-01-fragment.jsonld *** Test Cases *** Update entity attributes when the entity id is not known to the system diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_01.robot index 3ca99501..76718a5b 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_01.robot @@ -8,12 +8,12 @@ Test Template Update Attributes *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-datasetid-attributes-sample.jsonld +${filename}= vehicle-speed-two-datasetid-sample.jsonld ${status_code}= 204 *** Test Cases *** FRAGMENT_FILENAME ATTRIBUTE_ID -012_01_01_Check that you can partially update an attribute vehicle-fragment-empty-datasetid-sample.jsonld isParked -012_01_02_Check that you can partially update an attribute by specifying the datasetId vehicle-fragment-equal-datasetid-sample.jsonld speed +012_01_01_Check that you can partially update an attribute vehicle-isparked-fragment.jsonld isParked +012_01_02_Check that you can partially update an attribute by specifying the datasetId vehicle-speed-equal-datasetid-fragment.jsonld speed *** Keywords *** Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_02.robot index 9204ca02..8444f5f2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_02.robot @@ -13,12 +13,12 @@ ${filename}= vehicle-two-datasetid-attributes-sample.jsonld ${status_code}= 400 *** Test Cases *** ENTITY_ID ATTRIBUTE_ID FRAGMENT_FILENAME -012_02_01_Make a partial attribute update if the Entity Id is not present ${EMPTY} speed vehicle-fragment-equal-datasetid-sample.jsonld -012_02_02_Make a partial attribute update if the Entity Id is not a valid URI thisisaninvaliduri speed vehicle-fragment-equal-datasetid-sample.jsonld -012_02_03_Make a partial attribute update if the Attribute Name is not present ${valid_entity_id} speed vehicle-fragment-attribute-name-missing-sample.jsonld -012_02_04_Make a partial attribute update if the Attribute Id is invalid ${valid_entity_id} invalid vehicle-fragment-equal-datasetid-sample.jsonld -012_02_05_Make a partial attribute update if the Attribute type does not match ${valid_entity_id} speed vehicle-fragment-equal-datasetid-different-type-sample.jsonld -012_02_06_Make a partial attribute update if the entity fragment is empty ${valid_entity_id} speed vehicle-fragment-all-empty-sample.jsonld +012_02_01_Make a partial attribute update if the Entity Id is not present ${EMPTY} speed vehicle-speed-equal-datasetid-fragment.jsonld +012_02_02_Make a partial attribute update if the Entity Id is not a valid URI thisisaninvaliduri speed vehicle-speed-equal-datasetid-fragment.jsonld +012_02_03_Make a partial attribute update if the Attribute Name is not present ${valid_entity_id} speed vehicle-speed-wrong-name-fragment.jsonld +012_02_04_Make a partial attribute update if the Attribute Id is invalid ${valid_entity_id} invalid vehicle-speed-equal-datasetid-fragment.jsonld +012_02_05_Make a partial attribute update if the Attribute type does not match ${valid_entity_id} speed vehicle-speed-equal-datasetid-different-type-fragment.jsonld +012_02_06_Make a partial attribute update if the entity fragment is empty ${valid_entity_id} speed empty-fragment.jsonld *** Keywords *** Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_03.robot index f3b4ab17..b7ec1196 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_03.robot @@ -9,15 +9,15 @@ Test Template Partial Update Attributes *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-datasetid-attributes-sample.jsonld +${filename}= vehicle-speed-two-datasetid-sample.jsonld ${status_code}= 404 ${attribute_id}= speed *** Test Cases *** ENTITY_ID FRAGMENT_FILENAME -012_03_01_Partial update when the Entity Id is not known to the system ${not_found_entity_id} vehicle-fragment-same-datasetid-sample.jsonld -012_03_02_Partial update when no default instance and no datasetId specified ${valid_entity_id} vehicle-fragment-invalid-datasetid-sample.jsonld -012_03_03_Partial update when no instance with the datasetId specified ${valid_entity_id} vehicle-fragment-empty-datasetid-sample.jsonld -012_03_04_Partial update when no instance with the attrId specified ${valid_entity_id} vehicle-fragment-attribute-name-missing-sample.jsonld +012_03_01_Partial update when the Entity Id is not known to the system ${not_found_entity_id} vehicle-attribute-to-add-fragment.jsonld +012_03_02_Partial update when no default instance and no datasetId specified ${valid_entity_id} vehicle-speed-invalid-datasetid-fragment.jsonld.jsonld +012_03_03_Partial update when no instance with the datasetId specified ${valid_entity_id} vehicle-isparked-fragment.jsonld +012_03_04_Partial update when no instance with the attrId specified ${valid_entity_id} vehicle-speed-wrong-name-fragment.jsonld *** Keywords *** Partial Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_01.robot index e30995ff..254950a7 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-representation-fragment-sample.jsonld +${fragment_filename}= vehicle-temporal-representation-fragment.jsonld *** Test Cases *** 014_01_02_Add an attribute to a temporal entity with simple temporal properties diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_02.robot index 7eb7acc9..33327658 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-representation-fragment-sample.jsonld +${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 400 *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_03.robot index 1ca7648a..1b99ecae 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-representation-fragment-sample.jsonld +${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 404 *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_01.robot index a27641f8..53df2e11 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-intanceid-update-sample.jsonld +${fragment_filename}= vehicle-temporal-intanceid-update-fragment.jsonld ${attributeId}= speed *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_02.robot index 99d5d0f7..d53614c8 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_02.robot @@ -10,7 +10,7 @@ Test Template Partially Update Temporal Entity *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-intanceid-update-sample.jsonld +${fragment_filename}= vehicle-temporal-intanceid-update-fragment.jsonld ${status_code}= 400 *** Test Cases *** TEMPORAL_ENTITY_ID ATTRIBUTE_ID INSTANCE_ID diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_03.robot index 60debbb9..8037375f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_03.robot @@ -10,7 +10,7 @@ Test Template Partially Update Temporal Entity *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-intanceid-update-sample.jsonld +${fragment_filename}= vehicle-temporal-intanceid-update-fragment.jsonld ${status_code}= 404 *** Test Cases *** TEMPORAL_ENTITY_ID ATTRIBUTE_ID INSTANCE_ID diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot index 48beab75..43ef87ed 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/registration-with-expiration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-with-expiration-sample.jsonld *** Test Case *** Create Context Source Registration With Specific Date Expiration Date diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot index a45c6ec9..55dabb2e 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-simple-sample.jsonld *** Test Case *** Create Context Source Registration That Never Expires diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot index 32d8e4f0..aa59c63b 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/registration-no-id-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-no-id-sample.jsonld *** Test Case *** Create Context Source Registration Without A Sprecified ID diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot index 29742cca..b906d86b 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot @@ -6,15 +6,15 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= registration-invalid-sample.jsonld +${registration_payload_file_path}= context-source-registration-invalid-sample.jsonld *** Test Cases *** 033_02_01_Create a context source registration with invalid JSON file Create a context source registration with invalid JSON file 033_02_02_Create a context source registration with a different data structure than CsourRegistration data type - Create Context Source With Invalid Content csourceRegistrations/registration-invalid-structure-sample.jsonld + Create Context Source With Invalid Content csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld 033_02_03_Create a context source registration with a date in the past - Create Context Source With Invalid Content csourceRegistrations/registration-past-expiration-sample.jsonld + Create Context Source With Invalid Content csourceRegistrations/context-source-registration-past-expiration-sample.jsonld *** Keywords *** Create Context Source With Invalid Content diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_03.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_03.robot index 4274214e..69783222 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= csourceRegistrations/registration-sample.jsonld +${filename}= csourceRegistrations/context-source-registration-simple-sample.jsonld *** Test Cases *** Create a context source registration that already exists diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_06.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_06.robot index c79245ee..fcdaa412 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_06.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_06.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-context-source-registration-simple-sample.jsonld *** Test Case *** Create one context source registration containing a JSON-LD @context with a JSON content type diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot index 17057c04..e47a4400 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-context-source-registration-simple-sample.jsonld *** Test Case *** Create one context source registration using a JSON-LD @context obtained from the request payload diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_09.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_09.robot index 1c6c0058..a7e8f6b3 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_09.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_09.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-context-source-registration-simple-sample.jsonld *** Test Case *** Create one context source registration with a Link header and a JSON-LD content type diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot index 59485637..aa79d926 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= registration-sample.jsonld +${registration_payload_file_path}= context-source-registration-simple-sample.jsonld *** Test Case *** Delete a context source registration by id diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot index 479a314a..f70d18b1 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot @@ -8,7 +8,7 @@ Test Template Delete Context Source *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= registration-sample.jsonld +${filename}= context-source-registration-simple-sample.jsonld *** Test Case *** INVALID_REGISTRATION_ID 035_02_01_Delete a Context Source Registration if the Id is not present ${EMPTY} diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot index b9406805..b40e6f94 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= registration-sample.jsonld +${registration_payload_file_path}= context-source-registration-simple-sample.jsonld *** Test Case *** Delete a context source registration by id diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot index 26c54f63..3488c445 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot @@ -10,8 +10,8 @@ Test Template Update Context Source ${registration_id_prefix}= urn:ngsi-ld:Registration: *** Test Case *** FILENAME UPDATE_FILENAME -034_01_01_Update a context source registration by id registration-sample.jsonld registration-with-expiration-sample.jsonld -034_01_02_Update a context source registration to never expire registration-with-expiration-sample.jsonld registration-sample.jsonld +034_01_01_Update a context source registration by id context-source-registration-simple-sample.jsonld context-source-registration-with-expiration-sample.jsonld +034_01_02_Update a context source registration to never expire context-source-registration-with-expiration-sample.jsonld context-source-registration-simple-sample.jsonld *** Keywords *** Update Context Source diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot index 08e3a176..5157844f 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot @@ -8,18 +8,18 @@ Suite Setup Setup Initial Entities *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= registration-sample.jsonld -${registration_payload_file_path}= registration-invalid-sample.jsonld +${filename}= context-source-registration-simple-sample.jsonld +${registration_payload_file_path}= context-source-registration-invalid-sample.jsonld *** Test Case *** 034_02_01_Update a context source registration by id if the Id is not present - Update Context Source ${EMPTY} registration-with-expiration-sample.jsonld + Update Context Source ${EMPTY} fragments/context-source-registration-different-type-sample.jsonld 034_02_02_Update a context source registration by id if the Id is not a valid URI - Update Context Source invalidURI registration-with-expiration-sample.jsonld + Update Context Source invalidURI fragments/context-source-registration-different-type-sample.jsonld 034_02_03_Update a context source registration if the request body is not of the same data type - Update Context Source ${valid_registration_id} registration-different-type-sample.jsonld + Update Context Source ${valid_registration_id} fragments/context-source-registration-different-type-sample.jsonld 034_02_04_Update a context source registration if you attempt to remove a mandatory property - Update Context Source ${valid_registration_id} registration-invalid-structure-sample.jsonld + Update Context Source ${valid_registration_id} context-source-registration-invalid-structure-sample.jsonld 034_02_05_Update a context source registration if the request body is invalid Update a context source registration if the request body is invalid diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot index 9bdb1b5c..fffb4366 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot @@ -6,7 +6,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= registration-sample.jsonld +${filename}= context-source-registration-simple-sample.jsonld *** Test Case *** Update a context source registration by id if the id is not known to the system diff --git a/data/csourceRegistrations/registration-invalid-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld similarity index 85% rename from data/csourceRegistrations/registration-invalid-sample.jsonld rename to data/csourceRegistrations/context-source-registration-invalid-sample.jsonld index b0ffbb3e..1c01a4b4 100644 --- a/data/csourceRegistrations/registration-invalid-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld new file mode 100644 index 00000000..28176c46 --- /dev/null +++ b/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld @@ -0,0 +1,7 @@ +{ + "id": "urn:ngsi-ld:ContextSourceRegistration:randomUUID", + "type": "ContextSourceRegistration", + "@context": [ + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" + ] +} \ No newline at end of file diff --git a/data/csourceRegistrations/registration-no-id-sample.jsonld b/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld similarity index 84% rename from data/csourceRegistrations/registration-no-id-sample.jsonld rename to data/csourceRegistrations/context-source-registration-no-id-sample.jsonld index f2abff25..04ed167a 100644 --- a/data/csourceRegistrations/registration-no-id-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld @@ -37,6 +37,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-past-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld similarity index 85% rename from data/csourceRegistrations/registration-past-expiration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld index f9f76264..4f449784 100644 --- a/data/csourceRegistrations/registration-past-expiration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld @@ -39,6 +39,6 @@ }, "expiresAt": " 2018-11-29T14:53:15Z", "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-sample.jsonld b/data/csourceRegistrations/context-source-registration-simple-sample.jsonld similarity index 85% rename from data/csourceRegistrations/registration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-simple-sample.jsonld index 956aeda4..096c701b 100644 --- a/data/csourceRegistrations/registration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-simple-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-with-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld similarity index 85% rename from data/csourceRegistrations/registration-with-expiration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld index bb9ae210..6e0a40b5 100644 --- a/data/csourceRegistrations/registration-with-expiration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld @@ -39,6 +39,6 @@ }, "expiresAt": " 2025-11-29T14:53:15Z", "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-different-type-sample.jsonld b/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld similarity index 84% rename from data/csourceRegistrations/registration-different-type-sample.jsonld rename to data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld index 80945e1f..d15dfb55 100644 --- a/data/csourceRegistrations/registration-different-type-sample.jsonld +++ b/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-invalid-structure-sample.jsonld b/data/csourceRegistrations/registration-invalid-structure-sample.jsonld deleted file mode 100644 index cc6bf6c3..00000000 --- a/data/csourceRegistrations/registration-invalid-structure-sample.jsonld +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "urn:ngsi-ld:ContextSourceRegistration:randomUUID", - "type": "ContextSourceRegistration", - "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" - ] -} \ No newline at end of file diff --git a/data/entities/expectations/vehicle-attributes-sample-append-expectation-02.jsonld b/data/entities/expectations/add-attribute-expectation.jsonld similarity index 100% rename from data/entities/expectations/vehicle-attributes-sample-append-expectation-02.jsonld rename to data/entities/expectations/add-attribute-expectation.jsonld diff --git a/data/entities/expectations/building-attributes-query-sample-expectation.jsonld b/data/entities/expectations/building-attributes-query-expectation.jsonld similarity index 89% rename from data/entities/expectations/building-attributes-query-sample-expectation.jsonld rename to data/entities/expectations/building-attributes-query-expectation.jsonld index e3ffe113..77216ca0 100644 --- a/data/entities/expectations/building-attributes-query-sample-expectation.jsonld +++ b/data/entities/expectations/building-attributes-query-expectation.jsonld @@ -1,6 +1,6 @@ { - "id": "urn:ngsi-ld:Building:4279250905792670", + "id": "urn:ngsi-ld:Building:randomUUID", "type": "https://ngsi-ld-test-suite/context#Building", "https://ngsi-ld-test-suite/context#airQualityLevel": { "type": "Property", diff --git a/data/entities/expectations/building-location-attribute-sample-expectation-query-geoproperty.jsonld b/data/entities/expectations/building-geoproperty-query-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-location-attribute-sample-expectation-query-geoproperty.jsonld rename to data/entities/expectations/building-geoproperty-query-expectation.jsonld diff --git a/data/entities/expectations/building-location-attribute-sample-expectation.jsonld b/data/entities/expectations/building-location-attribute-sample-expectation.jsonld deleted file mode 100644 index b4f0f8b2..00000000 --- a/data/entities/expectations/building-location-attribute-sample-expectation.jsonld +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "urn:ngsi-ld:Building:randomUUID", - "type": "https://ngsi-ld-test-suite/context#Building", - "name": { - "type": "Property", - "value": "Eiffel Tower" - }, - "https://ngsi-ld-test-suite/context#subCategory": { - "type": "Property", - "value": ["tourism"] - }, - "location": { - "type": "GeoProperty", - "value": { - "type": "Point", - "coordinates": [13.3986, 52.5547] - } - }, - "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" - ] -} \ No newline at end of file diff --git a/data/entities/expectations/building-minimal-sample-expectation.jsonld b/data/entities/expectations/building-minimal-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-minimal-sample-expectation.jsonld rename to data/entities/expectations/building-minimal-expectation.jsonld diff --git a/data/entities/expectations/building-simple-attributes-sample-expectation.jsonld b/data/entities/expectations/building-simple-attributes-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-expectation.jsonld rename to data/entities/expectations/building-simple-attributes-expectation.jsonld diff --git a/data/entities/expectations/building-simple-attributes-sample-expectation-query-attributes.jsonld b/data/entities/expectations/building-simple-attributes-query-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-expectation-query-attributes.jsonld rename to data/entities/expectations/building-simple-attributes-query-expectation.jsonld diff --git a/data/entities/expectations/building-simple-attributes-sample-expectation-simplified.jsonld b/data/entities/expectations/building-simple-attributes-simplified-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-expectation-simplified.jsonld rename to data/entities/expectations/building-simple-attributes-simplified-expectation.jsonld diff --git a/data/entities/expectations/vehicle-parking-sample-expectation.jsonld b/data/entities/expectations/two-types-vehicle-offstreetparking-expectation.jsonld similarity index 100% rename from data/entities/expectations/vehicle-parking-sample-expectation.jsonld rename to data/entities/expectations/two-types-vehicle-offstreetparking-expectation.jsonld diff --git a/data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-03.jsonld b/data/entities/expectations/vehicle-speed-datasetid-expectation.jsonld similarity index 100% rename from data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-03.jsonld rename to data/entities/expectations/vehicle-speed-datasetid-expectation.jsonld diff --git a/data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-04.jsonld b/data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-04.jsonld deleted file mode 100644 index e69de29b..00000000 diff --git a/data/entities/fragmentEntities/invalid-vehicle-fragment-datasetid-sample.jsonld b/data/entities/fragmentEntities/invalid-fragment.jsonld similarity index 77% rename from data/entities/fragmentEntities/invalid-vehicle-fragment-datasetid-sample.jsonld rename to data/entities/fragmentEntities/invalid-fragment.jsonld index 00a0cd6b..7fc26d82 100644 --- a/data/entities/fragmentEntities/invalid-vehicle-fragment-datasetid-sample.jsonld +++ b/data/entities/fragmentEntities/invalid-fragment.jsonld @@ -13,7 +13,6 @@ "value": "BMW" }, "@context": [ - "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-fragment-same-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-attribute-to-add-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-same-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-attribute-to-add-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-all-empty-sample.jsonld b/data/entities/fragmentEntities/vehicle-empty-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-all-empty-sample.jsonld rename to data/entities/fragmentEntities/vehicle-empty-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-empty-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-isparked-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-empty-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-isparked-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-different-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-different-datasetid-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-different-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-different-datasetid-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-equal-datasetid-different-type-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-different-type-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-equal-datasetid-different-type-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-equal-datasetid-different-type-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-equal-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-equal-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-equal-datasetid-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-invalid-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-invalid-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-01.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-01-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-01.jsonld rename to data/entities/fragmentEntities/vehicle-speed-two-datasetid-01-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-02.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-02-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-02.jsonld rename to data/entities/fragmentEntities/vehicle-speed-two-datasetid-02-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-03.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-03-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-03.jsonld rename to data/entities/fragmentEntities/vehicle-speed-two-datasetid-03-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-04.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-04-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-04.jsonld rename to data/entities/fragmentEntities/vehicle-speed-two-datasetid-04-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-attribute-name-missing-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-attribute-name-missing-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld diff --git a/data/entities/vehicle-datasetid-attributes-sample.jsonld b/data/entities/vehicle-speed-two-datasetid-sample.jsonld similarity index 100% rename from data/entities/vehicle-datasetid-attributes-sample.jsonld rename to data/entities/vehicle-speed-two-datasetid-sample.jsonld diff --git a/data/temporalEntities/fragments/vehicle-simplified-temporal-representation-fragment-sample.jsonld b/data/temporalEntities/fragments/vehicle-simplified-temporal-representation-fragment-sample.jsonld deleted file mode 100644 index 28242dc7..00000000 --- a/data/temporalEntities/fragments/vehicle-simplified-temporal-representation-fragment-sample.jsonld +++ /dev/null @@ -1,14 +0,0 @@ -{ - "added_attribute": { - "type": "Property", - "values": [ - [121,"2018-08-01T12:03:00Z"], - [80,"2018-08-01T12:05:00Z"], - [100,"2018-08-01T12:07:00Z"] - ] - }, - "@context":[ - "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld" - ] -} \ No newline at end of file diff --git a/data/temporalEntities/fragments/vehicle-temporal-intanceid-update-sample.jsonld b/data/temporalEntities/fragments/vehicle-temporal-intanceid-update-fragment.jsonld similarity index 100% rename from data/temporalEntities/fragments/vehicle-temporal-intanceid-update-sample.jsonld rename to data/temporalEntities/fragments/vehicle-temporal-intanceid-update-fragment.jsonld diff --git a/data/temporalEntities/fragments/vehicle-temporal-representation-fragment-sample.jsonld b/data/temporalEntities/fragments/vehicle-temporal-representation-fragment.jsonld similarity index 100% rename from data/temporalEntities/fragments/vehicle-temporal-representation-fragment-sample.jsonld rename to data/temporalEntities/fragments/vehicle-temporal-representation-fragment.jsonld diff --git a/data/temporalEntities/fragments/vehicle-temporal-representation-without-context-fragment-sample.jsonld b/data/temporalEntities/fragments/vehicle-temporal-representation-without-context-fragment-sample.jsonld deleted file mode 100644 index 922b0d31..00000000 --- a/data/temporalEntities/fragments/vehicle-temporal-representation-without-context-fragment-sample.jsonld +++ /dev/null @@ -1,19 +0,0 @@ -{ - "added_attribute":[ - { - "type":"Property", - "value":120, - "observedAt":"2020-09-01T12:03:00Z" - }, - { - "type":"Property", - "value":80, - "observedAt":"2020-09-01T12:05:00Z" - }, - { - "type":"Property", - "value":100, - "observedAt":"2020-09-01T12:07:00Z" - } - ] -} \ No newline at end of file -- GitLab