From 24ea523f563939576dd34fb43d94baa45a9fbfdc Mon Sep 17 00:00:00 2001 From: ranim-n Date: Mon, 15 Jul 2024 11:29:40 +0200 Subject: [PATCH 1/3] reviewing and refactoring test data files --- .../VerifyGETWithoutAccept/045_01.robot | 8 +++---- .../VerifyLdContextNotAvailable/043_01.robot | 8 +++---- .../VerifyMergePatchJson/044_01.robot | 2 +- .../VerifyMergePatchJson/044_02.robot | 4 ++-- .../VerifyUnsupportedMediaType/048_01.robot | 10 ++++----- .../027_01.robot | 2 +- .../027_02.robot | 4 ++-- .../RetrieveAvailableAttributes/025_01.robot | 6 ++--- .../024_01.robot | 2 +- .../024_02.robot | 4 ++-- .../RetrieveAvailableEntityTypes/022_01.robot | 8 +++---- .../026_01.robot | 6 ++--- .../023_01.robot | 8 +++---- .../Entity/QueryEntities/019_01_01.robot | 4 ++-- .../Entity/QueryEntities/019_01_02.robot | 8 +++---- .../Entity/QueryEntities/019_01_03.robot | 4 ++-- .../Entity/QueryEntities/019_01_04.robot | 6 ++--- .../Entity/QueryEntities/019_01_05.robot | 4 ++-- .../Entity/QueryEntities/019_02_01.robot | 4 ++-- .../Entity/QueryEntities/019_02_02.robot | 6 ++--- .../Entity/QueryEntities/019_02_03.robot | 4 ++-- .../Entity/QueryEntities/019_02_04.robot | 6 ++--- .../Entity/QueryEntities/019_02_05.robot | 6 ++--- .../Entity/QueryEntities/019_03_01.robot | 2 +- .../Entity/QueryEntities/019_03_02.robot | 4 ++-- .../Entity/QueryEntities/019_03_03.robot | 2 +- .../Entity/QueryEntities/019_03_04.robot | 2 +- .../Entity/QueryEntities/019_03_05.robot | 2 +- .../Entity/QueryEntities/019_04.robot | 4 ++-- .../Entity/QueryEntities/019_05.robot | 2 +- .../Entity/QueryEntities/019_06.robot | 2 +- .../Entity/QueryEntities/019_07.robot | 4 ++-- .../Entity/QueryEntities/019_08.robot | 6 ++--- .../Entity/RetrieveEntity/018_01_01.robot | 4 ++-- .../Entity/RetrieveEntity/018_01_02.robot | 4 ++-- .../Entity/RetrieveEntity/018_01_03.robot | 4 ++-- .../Entity/RetrieveEntity/018_03_02.robot | 2 +- .../Entity/RetrieveEntity/018_04.robot | 4 ++-- .../Entity/RetrieveEntity/018_05.robot | 2 +- .../Entity/RetrieveEntity/018_06.robot | 6 ++--- .../Entity/RetrieveEntity/018_07.robot | 2 +- .../021_01.robot | 16 +++++++------- .../021_02.robot | 12 +++++----- .../021_03.robot | 12 +++++----- .../021_04.robot | 12 +++++----- .../021_05.robot | 10 ++++----- .../021_06.robot | 12 +++++----- .../021_07.robot | 12 +++++----- .../021_08.robot | 12 +++++----- .../021_09.robot | 16 +++++++------- .../021_10.robot | 2 +- .../021_11.robot | 12 +++++----- .../021_12.robot | 6 ++--- .../021_13.robot | 14 ++++++------ .../021_14.robot | 16 +++++++------- .../020_01.robot | 8 +++---- .../020_02.robot | 8 +++---- .../020_03.robot | 8 +++---- .../020_04.robot | 12 +++++----- .../020_05.robot | 10 ++++----- .../020_08.robot | 6 ++--- .../020_09.robot | 6 ++--- .../020_10.robot | 8 +++---- .../020_11.robot | 14 ++++++------ .../020_12.robot | 10 ++++----- .../CreateBatchOfEntities/003_01.robot | 8 +++---- .../CreateBatchOfEntities/003_02.robot | 8 +++---- .../CreateBatchOfEntities/003_03.robot | 4 ++-- .../CreateBatchOfEntities/003_04.robot | 4 ++-- .../CreateBatchOfEntities/003_05.robot | 4 ++-- .../CreateBatchOfEntities/003_06.robot | 2 +- .../CreateBatchOfEntities/003_07.robot | 4 ++-- .../CreateBatchOfEntities/003_08.robot | 2 +- .../CreateBatchOfEntities/003_09.robot | 2 +- .../CreateBatchOfEntities/003_10.robot | 4 ++-- .../DeleteBatchOfEntities/006_01.robot | 4 ++-- .../DeleteBatchOfEntities/006_02.robot | 2 +- .../DeleteBatchOfEntities/006_03.robot | 4 ++-- .../DeleteBatchOfEntities/006_04.robot | 2 +- .../UpdateBatchOfEntities/005_01.robot | 8 +++---- .../UpdateBatchOfEntities/005_02.robot | 8 +++---- .../UpdateBatchOfEntities/005_03.robot | 8 +++---- .../UpdateBatchOfEntities/005_04.robot | 4 ++-- .../UpsertBatchOfEntities/004_01.robot | 6 ++--- .../UpsertBatchOfEntities/004_02.robot | 10 ++++----- .../UpsertBatchOfEntities/004_03.robot | 10 ++++----- .../UpsertBatchOfEntities/004_04.robot | 8 +++---- .../UpsertBatchOfEntities/004_05.robot | 6 ++--- .../UpsertBatchOfEntities/004_06.robot | 4 ++-- .../UpsertBatchOfEntities/004_07.robot | 4 ++-- .../Entities/CreateEntity/001_01.robot | 8 +++---- .../Entities/CreateEntity/001_02.robot | 6 ++--- .../Entities/CreateEntity/001_03.robot | 2 +- .../Entities/CreateEntity/001_04.robot | 2 +- .../Entities/CreateEntity/001_05.robot | 2 +- .../Entities/CreateEntity/001_06.robot | 2 +- .../Entities/CreateEntity/001_07.robot | 2 +- .../Entities/CreateEntity/001_08.robot | 2 +- .../Entities/CreateEntity/001_09.robot | 2 +- .../Entities/CreateEntity/001_10.robot | 2 +- .../Entities/DeleteEntity/002_01.robot | 2 +- .../AppendEntityAttributes/010_01.robot | 6 ++--- .../AppendEntityAttributes/010_02.robot | 2 +- .../AppendEntityAttributes/010_04.robot | 6 ++--- .../AppendEntityAttributes/010_05.robot | 2 +- .../AppendEntityAttributes/010_06.robot | 4 ++-- .../AppendEntityAttributes/010_07.robot | 4 ++-- .../DeleteEntityAttribute/013_01.robot | 8 +++---- .../DeleteEntityAttribute/013_02.robot | 2 +- .../DeleteEntityAttribute/013_03.robot | 2 +- .../DeleteEntityAttribute/013_04.robot | 2 +- .../PartialAttributeUpdate/012_01.robot | 6 ++--- .../PartialAttributeUpdate/012_02.robot | 2 +- .../PartialAttributeUpdate/012_03.robot | 2 +- .../PartialAttributeUpdate/012_04.robot | 4 ++-- .../UpdateEntityAttributes/011_01.robot | 8 +++---- .../UpdateEntityAttributes/011_02.robot | 2 +- .../UpdateEntityAttributes/011_04.robot | 4 ++-- .../UpdateEntityAttributes/011_05.robot | 6 ++--- .../007_01.robot | 4 ++-- .../007_02.robot | 4 ++-- .../007_03.robot | 4 ++-- .../009_01.robot | 2 +- .../008_01.robot | 6 ++--- .../AddAttributes/014_01.robot | 4 ++-- .../AddAttributes/014_02.robot | 2 +- .../AddAttributes/014_03.robot | 2 +- .../AddAttributes/014_04.robot | 2 +- .../DeleteAttribute/015_01.robot | 8 +++---- .../DeleteAttribute/015_02.robot | 2 +- .../DeleteAttribute/015_03.robot | 2 +- .../DeleteAttributeInstance/017_01.robot | 4 ++-- .../DeleteAttributeInstance/017_02.robot | 2 +- .../DeleteAttributeInstance/017_03.robot | 2 +- .../016_01.robot | 4 ++-- .../016_02.robot | 2 +- .../016_03.robot | 2 +- .../CreateSubscription/028_01.robot | 4 ++-- .../CreateSubscription/028_02.robot | 4 ++-- .../CreateSubscription/028_03.robot | 2 +- .../CreateSubscription/028_04.robot | 2 +- .../CreateSubscription/028_05.robot | 4 ++-- .../DeleteSubscription/032_03.robot | 2 +- .../QuerySubscriptions/031_01.robot | 8 +++---- .../QuerySubscriptions/031_02.robot | 6 ++--- .../RetrieveSubscription/030_03.robot | 4 ++-- .../046_01.robot | 2 +- .../046_02.robot | 4 ++-- .../046_03.robot | 2 +- .../046_04.robot | 2 +- .../046_05.robot | 2 +- .../046_07.robot | 2 +- .../046_08.robot | 2 +- .../046_09.robot | 2 +- .../046_10.robot | 2 +- .../046_11.robot | 2 +- .../046_12.robot | 2 +- .../046_13.robot | 2 +- .../046_14.robot | 2 +- .../046_15.robot | 4 ++-- .../046_16_01.robot | 2 +- .../046_16_02.robot | 2 +- .../UpdateSubscription/029_01.robot | 2 +- .../UpdateSubscription/029_02.robot | 2 +- .../UpdateSubscription/029_03.robot | 4 ++-- .../UpdateSubscription/029_04.robot | 4 ++-- .../UpdateSubscription/029_05.robot | 8 +++---- .../UpdateSubscription/029_06.robot | 4 ++-- .../UpdateSubscription/029_07.robot | 4 ++-- .../UpdateSubscription/029_08.robot | 4 ++-- .../UpdateSubscription/029_09.robot | 4 ++-- .../UpdateSubscription/029_10.robot | 6 ++--- .../UpdateSubscription/029_11.robot | 4 ++-- .../037_01.robot | 8 +++---- .../037_04.robot | 4 ++-- .../037_05.robot | 4 ++-- .../037_06.robot | 6 ++--- .../037_07.robot | 4 ++-- .../037_08.robot | 4 ++-- .../037_09.robot | 8 +++---- .../037_10.robot | 10 ++++----- .../037_11.robot | 6 ++--- .../036_03.robot | 2 +- .../036_04.robot | 2 +- .../036_05.robot | 2 +- .../035_01.robot | 2 +- .../035_02.robot | 2 +- .../035_03.robot | 2 +- .../RegisterContextSource/033_01_01.robot | 2 +- .../RegisterContextSource/033_01_02.robot | 2 +- .../RegisterContextSource/033_01_03.robot | 2 +- .../RegisterContextSource/033_02.robot | 2 +- .../RegisterContextSource/033_03.robot | 2 +- .../RegisterContextSource/033_04.robot | 2 +- .../RegisterContextSource/033_05.robot | 2 +- .../RegisterContextSource/033_06.robot | 2 +- .../RegisterContextSource/033_07.robot | 2 +- .../RegisterContextSource/033_08.robot | 2 +- .../RegisterContextSource/033_09.robot | 2 +- .../RegisterContextSource/033_10.robot | 4 ++-- .../034_01.robot | 4 ++-- .../034_02.robot | 10 ++++----- .../034_03.robot | 2 +- .../034_04.robot | 4 ++-- .../034_05.robot | 4 ++-- .../034_06.robot | 6 ++--- .../047_01.robot | 4 ++-- .../047_02.robot | 6 ++--- .../047_03.robot | 4 ++-- .../047_04.robot | 4 ++-- .../047_05.robot | 4 ++-- .../047_06.robot | 4 ++-- .../047_07.robot | 8 +++---- .../047_08.robot | 6 ++--- .../047_09.robot | 6 ++--- .../047_10.robot | 4 ++-- .../047_11.robot | 6 ++--- .../047_12.robot | 4 ++-- .../047_13.robot | 4 ++-- .../047_14.robot | 4 ++-- .../047_15.robot | 4 ++-- .../047_16.robot | 12 +++++----- .../038_01.robot | 2 +- .../038_02.robot | 2 +- .../038_03.robot | 2 +- .../038_04.robot | 2 +- .../038_05.robot | 2 +- .../038_06.robot | 2 +- .../038_07.robot | 2 +- .../038_08.robot | 8 +++---- .../038_09.robot | 2 +- .../042_01.robot | 2 +- .../041_01.robot | 6 ++--- .../041_02.robot | 8 +++---- .../041_03.robot | 6 ++--- .../040_01.robot | 4 ++-- .../039_01.robot | 4 ++-- .../039_02.robot | 2 +- .../039_03.robot | 2 +- .../039_04.robot | 6 ++--- .../039_05.robot | 4 ++-- ...stration-building-and-bus-entities.jsonld} | 0 ...t-source-registration-bus-entities.jsonld} | 0 ...ource-registration-csourceProperty.jsonld} | 0 ...-registration-detailed-information.jsonld} | 0 ...ext-source-registration-invalid-json.json} | 0 ...rce-registration-invalid-structure.jsonld} | 0 ... context-source-registration-invalid.json} | 0 ...ontext-source-registration-invalid.jsonld} | 0 ...ntext-source-registration-location.jsonld} | 0 ...ce-registration-managementInterval.jsonld} | 0 ... context-source-registration-no-id.jsonld} | 0 ...e-registration-observationInterval.jsonld} | 0 ...ource-registration-past-expiration.jsonld} | 0 ...registration-unretrievable-context.jsonld} | 0 ...urce-registration-vehicle-entities.jsonld} | 0 ...ource-registration-with-expiration.jsonld} | 0 ...n-with-only-properties-information.jsonld} | 0 ....json => context-source-registration.json} | 0 ...nld => context-source-registration.jsonld} | 0 ... context-source-registrations-037-01.json} | 0 ... context-source-registrations-037-04.json} | 0 ...ntext-source-registrations-037-05-01.json} | 0 ...ntext-source-registrations-037-05-02.json} | 0 ... context-source-registrations-037-06.json} | 0 ... context-source-registrations-037-07.json} | 0 ... context-source-registrations-037-08.json} | 0 ...ntext-source-registrations-037-09-01.json} | 0 ...ntext-source-registrations-037-09-02.json} | 0 ...ntext-source-registrations-037-10-01.json} | 0 ...ntext-source-registrations-037-10-02.json} | 0 ...ntext-source-registrations-037-10-03.json} | 0 ...source-registration-different-type.jsonld} | 0 ...urce-registration-update-information.json} | 0 ...> context-source-registration-update.json} | 0 ...ctation.json => subscriptions-035-01.json} | 0 ...ctation.json => subscriptions-040-01.json} | 0 ...le.json => subscription-bus-entities.json} | 0 ...son => subscription-expiresAt-update.json} | 0 ...json => subscription-isActive-update.json} | 0 ... => subscription-update-invalid-json.json} | 0 ...cription-update-invalid-notification.json} | 0 ... => subscription-update-invalid-type.json} | 0 ...e-sample.json => subscription-update.json} | 0 ...mple.jsonld => subscription-update.jsonld} | 0 ...ubscription-vehicle-and-bus-entities.json} | 0 ...son => subscription-vehicle-entities.json} | 0 ...bscription-empty-watchedAttributes.jsonld} | 0 ...ple.jsonld => subscription-expired.jsonld} | 0 ...e.jsonld => subscription-expiresAt.jsonld} | 0 ...scription-geoQ-without-geoproperty.jsonld} | 0 ...sample.jsonld => subscription-geoQ.jsonld} | 0 ...le.jsonld => subscription-inactive.jsonld} | 0 ...onld => subscription-invalid-query.jsonld} | 0 ...sonld => subscription-invalid-type.jsonld} | 0 ...> subscription-temporalQ-createdAt.jsonld} | 0 ... subscription-temporalQ-modifiedAt.jsonld} | 0 ... subscription-temporalQ-observedAt.jsonld} | 0 ...sonld => subscription-timeInterval.jsonld} | 0 ... subscription-unreachable-endpoint.jsonld} | 0 ... => subscription-watchedAttributes.jsonld} | 0 ... subscription-without-notification.jsonld} | 0 ...tion-sample.jsonld => subscription.jsonld} | 0 .../{empty-sample.jsonld => empty.jsonld} | 0 ...d-sample.jsonld => invalid-json-ld.jsonld} | 0 ...json-sample.jsonld => invalid-json.jsonld} | 0 ...ing-language-property-sub-property.jsonld} | 0 ...onld => building-language-property.jsonld} | 0 .../building-location-attribute-sample.jsonld | 22 ------------------- .../building-location-attribute.jsonld | 5 ++--- ...imal-sample.json => building-minimal.json} | 0 ...-sample.jsonld => building-minimal.jsonld} | 0 ... building-relationship-of-property.jsonld} | 0 ...le.jsonld => building-relationship.jsonld} | 0 ... building-simple-attributes-second.jsonld} | 0 ...e.json => building-simple-attributes.json} | 0 ...onld => building-simple-attributes.jsonld} | 0 ... => building-unretrievable-context.jsonld} | 0 ...ld => building-with-different-type.jsonld} | 0 ....jsonld => building-with-two-types.jsonld} | 0 .../{empty-sample.jsonld => empty.jsonld} | 0 ...on.json => building-attributes-query.json} | 0 ...onld => building-geoproperty-query.jsonld} | 0 ... building-language-property-update.jsonld} | 0 ...n.json => building-minimal-compacted.json} | 0 ...n => building-minimal-with-one-scope.json} | 0 ... => building-minimal-with-two-scopes.json} | 0 ...expectation.json => building-minimal.json} | 0 ...building-simple-attributes-compacted.json} | 0 ... building-simple-attributes-expanded.json} | 0 ...> building-simple-attributes-query.jsonld} | 0 ...uilding-simple-attributes-simplified.json} | 0 ...lding-simple-attributes-simplified.jsonld} | 0 ...onld => building-simple-attributes.jsonld} | 0 ...two-types-vehicle-offstreetparking.jsonld} | 0 ...expectation.jsonld => two-vehicles.jsonld} | 0 ... => vehicle-delete-datasetid-speed.jsonld} | 0 ...ld => vehicle-delete-default-speed.jsonld} | 0 ... => vehicle-delete-deleteall-speed.jsonld} | 0 ....jsonld => vehicle-isparked-update.jsonld} | 0 ...vehicle-language-property-appended.jsonld} | 0 ...jsonld => vehicle-multi-attributes.jsonld} | 0 ...geojson => vehicle-parking-simple.geojson} | 0 ...hicle-simple-attributes-core-context.json} | 0 ...n.jsonld => vehicle-speed-appended.jsonld} | 0 ... vehicle-speed-different-datasetid.jsonld} | 0 ...sonld => vehicle-update-attributes.jsonld} | 0 ...ehicle-update-datasetid-attributes.jsonld} | 0 ...ion.jsonld => vehicle-update-speed.jsonld} | 0 ...json-sample.jsonld => invalid-json.jsonld} | 0 ...sonld => parking-simple-attributes.jsonld} | 0 ...le.json => vehicle-simple-attributes.json} | 0 ...sonld => vehicle-simple-attributes.jsonld} | 0 ...nld => vehicle-speed-two-datasetid.jsonld} | 0 ...> vehicle-two-datasetid-attributes.jsonld} | 0 .../@context-duplicated-key.json | 7 ------ ...tion.jsonld => subscription-028-01.jsonld} | 0 ...ubscription-vehicle-expanded-types.jsonld} | 0 ...ple.jsonld => subscription-vehicle.jsonld} | 0 ...ctation.json => subscriptions-030-03.json} | 0 ...ctation.json => subscriptions-031-01.json} | 0 ...subscription-expiresAt-future-update.json} | 0 ...son => subscription-expiresAt-update.json} | 0 ....json => subscription-invalid-update.json} | 0 ...bscription-isActive-expiresAt-update.json} | 0 ...> subscription-isActive-false-update.json} | 0 ...=> subscription-isActive-true-update.json} | 0 ... subscription-null-properties-update.json} | 0 ...e-sample.json => subscription-update.json} | 0 ...son => subscription-vehicle-entities.json} | 0 ...ample.jsonld => subscription-empty.jsonld} | 0 ...le.jsonld => subscription-inactive.jsonld} | 0 ...sonld => subscription-invalid-json.jsonld} | 0 ...iption-invalid-negative-throttling.jsonld} | 0 ...on-invalid-throttling-timeInterval.jsonld} | 0 ...sonld => subscription-timeInterval.jsonld} | 0 ...subscription-unretrievable-context.jsonld} | 0 ...d => subscription-valid-throttling.jsonld} | 0 ... => subscription-watchedAttributes.jsonld} | 0 ...tion-sample.jsonld => subscription.jsonld} | 0 ...020-08-bus-temporal-representation.jsonld} | 0 ...-representation-multiple-instances.jsonld} | 0 ...08-vehicle-temporal-representation.jsonld} | 0 ...09-vehicle-temporal-representation.jsonld} | 0 ...poral-representation-with-location.jsonld} | 0 ...presentation-unretrievable-context.jsonld} | 0 ...normalized-temporal-representation.jsonld} | 0 ...simplified-temporal-representation.jsonld} | 0 ...cle-temporal-representation-020-01.jsonld} | 0 ...cle-temporal-representation-020-02.jsonld} | 0 ...cle-temporal-representation-020-03.jsonld} | 0 ...-temporal-representation-020-04-01.jsonld} | 0 ...-temporal-representation-020-04-02.jsonld} | 0 ...-temporal-representation-020-04-03.jsonld} | 0 ...-temporal-representation-020-05-01.jsonld} | 0 ...-temporal-representation-020-05-02.jsonld} | 0 ...cle-temporal-representation-020-10.jsonld} | 0 ...le-temporal-representation-020-11-01.json} | 0 ...le-temporal-representation-020-11-02.json} | 0 ...le-temporal-representation-020-11-03.json} | 0 ...le-temporal-representation-020-11-04.json} | 0 ...ral-representation-added-attribute.jsonld} | 0 ...resentation-create-with-no-context.jsonld} | 0 ...cle-temporal-representation-create.jsonld} | 0 ...ntation-delete-fuelLevel-datasetid.jsonld} | 0 ...al-representation-delete-fuelLevel.jsonld} | 0 ...esentation-delete-speed-instanceid.jsonld} | 0 ...representation-deleteall-fuelLevel.jsonld} | 0 ...entation-modify-attribute-instance.jsonld} | 0 ...cle-temporal-representation-update.jsonld} | 0 ...-temporal-representation-021-01-01.jsonld} | 0 ...-temporal-representation-021-01-02.jsonld} | 0 ...les-temporal-representation-021-02.jsonld} | 0 ...les-temporal-representation-021-03.jsonld} | 0 ...les-temporal-representation-021-04.jsonld} | 0 ...les-temporal-representation-021-05.jsonld} | 0 ...les-temporal-representation-021-06.jsonld} | 0 ...les-temporal-representation-021-07.jsonld} | 0 ...les-temporal-representation-021-08.jsonld} | 0 ...-temporal-representation-021-09-01.jsonld} | 0 ...-temporal-representation-021-09-02.jsonld} | 0 ...-temporal-representation-021-13-01.jsonld} | 0 ...-temporal-representation-021-13-02.jsonld} | 0 ...es-temporal-representation-021-14-01.json} | 0 ...es-temporal-representation-021-14-02.json} | 0 ...ral-representation-without-context.jsonld} | 0 ...cle-create-temporal-representation.jsonld} | 0 ...e-property-temporal-representation.jsonld} | 0 ...al-representation-empty-json-sample.jsonld | 0 ...temporal-representation-empty-json.jsonld} | 0 ...mporal-representation-invalid-json.jsonld} | 0 ...cle-temporal-representation-update.jsonld} | 0 ...temporal-representation-without-id.jsonld} | 0 ...=> vehicle-temporal-representation.jsonld} | 0 ...ectation.json => attribute-026-01-01.json} | 0 ...ectation.json => attribute-026-01-02.json} | 0 ...expectation.json => attribute-027-01.json} | 0 ...ion.json => attribute-list-025-01-01.json} | 0 ...ion.json => attribute-list-025-01-02.json} | 0 ...tation.json => entity-type-023-01-01.json} | 0 ...tation.json => entity-type-023-01-02.json} | 0 ...tion.json => entity-type-info-024-01.json} | 0 ...n.json => entity-type-list-022-01-01.json} | 0 ...n.json => entity-type-list-022-01-02.json} | 0 doc/files/CommonBehaviours/043_01.json | 6 ++--- doc/files/CommonBehaviours/044_02.json | 2 +- doc/files/CommonBehaviours/048_01.json | 8 +++---- .../Consumption/018_01_01.json | 2 +- .../Consumption/018_01_02.json | 2 +- .../Consumption/018_01_03.json | 2 +- .../Consumption/018_04.json | 2 +- .../Consumption/018_06.json | 4 ++-- .../Consumption/019_01_01.json | 2 +- .../Consumption/019_01_02.json | 2 +- .../Consumption/019_01_03.json | 2 +- .../Consumption/019_01_04.json | 2 +- .../Consumption/019_01_05.json | 2 +- .../Consumption/019_02_01.json | 2 +- .../Consumption/019_02_02.json | 2 +- .../Consumption/019_02_03.json | 2 +- .../Consumption/019_02_04.json | 2 +- .../Consumption/019_02_05.json | 2 +- .../Consumption/019_04.json | 2 +- .../Consumption/020_01.json | 2 +- .../Consumption/020_02.json | 2 +- .../Consumption/020_03.json | 2 +- .../Consumption/020_04.json | 6 ++--- .../Consumption/020_05.json | 4 ++-- .../Consumption/020_10.json | 2 +- .../Consumption/020_11.json | 8 +++---- .../Consumption/020_12.json | 4 ++-- .../Consumption/021_01.json | 4 ++-- .../Consumption/021_02.json | 2 +- .../Consumption/021_03.json | 2 +- .../Consumption/021_04.json | 2 +- .../Consumption/021_05.json | 2 +- .../Consumption/021_06.json | 2 +- .../Consumption/021_07.json | 2 +- .../Consumption/021_08.json | 2 +- .../Consumption/021_09.json | 4 ++-- .../Consumption/021_13.json | 4 ++-- .../Consumption/021_14.json | 4 ++-- .../Consumption/022_01.json | 4 ++-- .../Consumption/023_01.json | 4 ++-- .../Consumption/024_02.json | 2 +- .../Consumption/025_01.json | 4 ++-- .../Consumption/026_01.json | 4 ++-- .../Consumption/027_02.json | 2 +- .../ContextInformation/Provision/001_01.json | 8 +++---- .../ContextInformation/Provision/001_02.json | 6 ++--- .../ContextInformation/Provision/001_03.json | 2 +- .../ContextInformation/Provision/001_04.json | 4 ++-- .../ContextInformation/Provision/001_05.json | 4 ++-- .../ContextInformation/Provision/001_06.json | 2 +- .../ContextInformation/Provision/001_07.json | 4 ++-- .../ContextInformation/Provision/001_08.json | 2 +- .../ContextInformation/Provision/001_09.json | 2 +- .../ContextInformation/Provision/001_10.json | 2 +- .../ContextInformation/Provision/002_01.json | 2 +- .../ContextInformation/Provision/003_03.json | 4 ++-- .../ContextInformation/Provision/004_06.json | 4 ++-- .../ContextInformation/Provision/005_04.json | 4 ++-- .../ContextInformation/Provision/006_03.json | 4 ++-- .../ContextInformation/Provision/007_01.json | 4 ++-- .../ContextInformation/Provision/007_02.json | 4 ++-- .../ContextInformation/Provision/007_03.json | 4 ++-- .../ContextInformation/Provision/008_01.json | 2 +- .../ContextInformation/Provision/016_01.json | 2 +- .../Subscription/028_01.json | 2 +- .../Subscription/028_02.json | 4 ++-- .../Subscription/028_03.json | 4 ++-- .../Subscription/028_04.json | 2 +- .../Subscription/028_05.json | 4 ++-- .../Subscription/029_01.json | 4 ++-- .../Subscription/029_02.json | 2 +- .../Subscription/029_03.json | 2 +- .../Subscription/029_04.json | 2 +- .../Subscription/029_05.json | 8 +++---- .../Subscription/029_06.json | 2 +- .../Subscription/029_07.json | 2 +- .../Subscription/029_08.json | 2 +- .../Subscription/029_09.json | 2 +- .../Subscription/029_11.json | 2 +- .../Subscription/030_03.json | 2 +- .../Subscription/031_01.json | 2 +- .../Subscription/046_16_01.json | 2 +- .../Subscription/046_16_02.json | 2 +- .../ContextSource/Registration/034_04.json | 2 +- .../RegistrationSubscription/039_05.json | 2 +- .../RegistrationSubscription/041_01.json | 2 +- 530 files changed, 691 insertions(+), 721 deletions(-) rename data/csourceRegistrations/{context-source-registration-building-and-bus-entities-sample.jsonld => context-source-registration-building-and-bus-entities.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-bus-entities-sample.jsonld => context-source-registration-bus-entities.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-csourceProperty-sample.jsonld => context-source-registration-csourceProperty.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-detailed-information-sample.jsonld => context-source-registration-detailed-information.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-invalid-json-sample.json => context-source-registration-invalid-json.json} (100%) rename data/csourceRegistrations/{context-source-registration-invalid-structure-sample.jsonld => context-source-registration-invalid-structure.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-invalid-sample.json => context-source-registration-invalid.json} (100%) rename data/csourceRegistrations/{context-source-registration-invalid-sample.jsonld => context-source-registration-invalid.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-location-sample.jsonld => context-source-registration-location.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-managementInterval-sample.jsonld => context-source-registration-managementInterval.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-no-id-sample.jsonld => context-source-registration-no-id.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-observationInterval-sample.jsonld => context-source-registration-observationInterval.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-past-expiration-sample.jsonld => context-source-registration-past-expiration.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-unretrievable-context-sample.jsonld => context-source-registration-unretrievable-context.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-vehicle-entities-sample.jsonld => context-source-registration-vehicle-entities.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-with-expiration-sample.jsonld => context-source-registration-with-expiration.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-with-only-properties-information-sample.jsonld => context-source-registration-with-only-properties-information.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-sample.json => context-source-registration.json} (100%) rename data/csourceRegistrations/{context-source-registration-sample.jsonld => context-source-registration.jsonld} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-01-expectation.json => context-source-registrations-037-01.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-04-expectation.json => context-source-registrations-037-04.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-05-01-expectation.json => context-source-registrations-037-05-01.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-05-02-expectation.json => context-source-registrations-037-05-02.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-06-expectation.json => context-source-registrations-037-06.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-07-expectation.json => context-source-registrations-037-07.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-08-expectation.json => context-source-registrations-037-08.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-09-01-expectation.json => context-source-registrations-037-09-01.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-09-02-expectation.json => context-source-registrations-037-09-02.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-10-01-expectation.json => context-source-registrations-037-10-01.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-10-02-expectation.json => context-source-registrations-037-10-02.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-10-03-expectation.json => context-source-registrations-037-10-03.json} (100%) rename data/csourceRegistrations/fragments/{context-source-registration-different-type-sample.jsonld => context-source-registration-different-type.jsonld} (100%) rename data/csourceRegistrations/fragments/{context-source-registration-update-information-sample.json => context-source-registration-update-information.json} (100%) rename data/csourceRegistrations/fragments/{context-source-registration-update-sample.json => context-source-registration-update.json} (100%) rename data/csourceSubscriptions/expectations/{subscriptions-035-01-expectation.json => subscriptions-035-01.json} (100%) rename data/csourceSubscriptions/expectations/{subscriptions-040-01-expectation.json => subscriptions-040-01.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-bus-entities-sample.json => subscription-bus-entities.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-expiresAt-update-sample.json => subscription-expiresAt-update.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-isActive-update-sample.json => subscription-isActive-update.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-invalid-json-sample.json => subscription-update-invalid-json.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-invalid-notification-sample.json => subscription-update-invalid-notification.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-invalid-type-sample.json => subscription-update-invalid-type.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-sample.json => subscription-update.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-sample.jsonld => subscription-update.jsonld} (100%) rename data/csourceSubscriptions/fragments/{subscription-vehicle-and-bus-entities-sample.json => subscription-vehicle-and-bus-entities.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-vehicle-entities-sample.json => subscription-vehicle-entities.json} (100%) rename data/csourceSubscriptions/{subscription-empty-watchedAttributes-sample.jsonld => subscription-empty-watchedAttributes.jsonld} (100%) rename data/csourceSubscriptions/{subscription-expired-sample.jsonld => subscription-expired.jsonld} (100%) rename data/csourceSubscriptions/{subscription-expiresAt-sample.jsonld => subscription-expiresAt.jsonld} (100%) rename data/csourceSubscriptions/{subscription-geoQ-without-geoproperty-sample.jsonld => subscription-geoQ-without-geoproperty.jsonld} (100%) rename data/csourceSubscriptions/{subscription-geoQ-sample.jsonld => subscription-geoQ.jsonld} (100%) rename data/csourceSubscriptions/{subscription-inactive-sample.jsonld => subscription-inactive.jsonld} (100%) rename data/csourceSubscriptions/{subscription-invalid-query-sample.jsonld => subscription-invalid-query.jsonld} (100%) rename data/csourceSubscriptions/{subscription-invalid-type-sample.jsonld => subscription-invalid-type.jsonld} (100%) rename data/csourceSubscriptions/{subscription-temporalQ-createdAt-sample.jsonld => subscription-temporalQ-createdAt.jsonld} (100%) rename data/csourceSubscriptions/{subscription-temporalQ-modifiedAt-sample.jsonld => subscription-temporalQ-modifiedAt.jsonld} (100%) rename data/csourceSubscriptions/{subscription-temporalQ-observedAt-sample.jsonld => subscription-temporalQ-observedAt.jsonld} (100%) rename data/csourceSubscriptions/{subscription-timeInterval-sample.jsonld => subscription-timeInterval.jsonld} (100%) rename data/csourceSubscriptions/{subscription-unreachable-endpoint-sample.jsonld => subscription-unreachable-endpoint.jsonld} (100%) rename data/csourceSubscriptions/{subscription-watchedAttributes-sample.jsonld => subscription-watchedAttributes.jsonld} (100%) rename data/csourceSubscriptions/{subscription-without-notification-sample.jsonld => subscription-without-notification.jsonld} (100%) rename data/csourceSubscriptions/{subscription-sample.jsonld => subscription.jsonld} (100%) rename data/entities/batch/{empty-sample.jsonld => empty.jsonld} (100%) rename data/entities/batch/{invalid-json-ld-sample.jsonld => invalid-json-ld.jsonld} (100%) rename data/entities/batch/{invalid-json-sample.jsonld => invalid-json.jsonld} (100%) rename data/entities/{building-language-property-sub-property-sample.jsonld => building-language-property-sub-property.jsonld} (100%) rename data/entities/{building-language-property-sample.jsonld => building-language-property.jsonld} (100%) delete mode 100644 data/entities/building-location-attribute-sample.jsonld rename data/entities/{building-minimal-sample.json => building-minimal.json} (100%) rename data/entities/{building-minimal-sample.jsonld => building-minimal.jsonld} (100%) rename data/entities/{building-relationship-of-property-sample.jsonld => building-relationship-of-property.jsonld} (100%) rename data/entities/{building-relationship-sample.jsonld => building-relationship.jsonld} (100%) rename data/entities/{building-simple-attributes-second-sample.jsonld => building-simple-attributes-second.jsonld} (100%) rename data/entities/{building-simple-attributes-sample.json => building-simple-attributes.json} (100%) rename data/entities/{building-simple-attributes-sample.jsonld => building-simple-attributes.jsonld} (100%) rename data/entities/{building-unretrievable-context-sample.jsonld => building-unretrievable-context.jsonld} (100%) rename data/entities/{building-with-different-type-sample.jsonld => building-with-different-type.jsonld} (100%) rename data/entities/{building-with-two-types-sample.jsonld => building-with-two-types.jsonld} (100%) rename data/entities/{empty-sample.jsonld => empty.jsonld} (100%) rename data/entities/expectations/{building-attributes-query-expectation.json => building-attributes-query.json} (100%) rename data/entities/expectations/{building-geoproperty-query-expectation.jsonld => building-geoproperty-query.jsonld} (100%) rename data/entities/expectations/{building-language-property-update-expectation.jsonld => building-language-property-update.jsonld} (100%) rename data/entities/expectations/{building-minimal-compacted-expectation.json => building-minimal-compacted.json} (100%) rename data/entities/expectations/{building-minimal-with-one-scope-expectation.json => building-minimal-with-one-scope.json} (100%) rename data/entities/expectations/{building-minimal-with-two-scopes-expectation.json => building-minimal-with-two-scopes.json} (100%) rename data/entities/expectations/{building-minimal-expectation.json => building-minimal.json} (100%) rename data/entities/expectations/{building-simple-attributes-sample-compacted-expectation.json => building-simple-attributes-compacted.json} (100%) rename data/entities/expectations/{building-simple-attributes-sample-expanded-expectation.json => building-simple-attributes-expanded.json} (100%) rename data/entities/expectations/{building-simple-attributes-query-expectation.jsonld => building-simple-attributes-query.jsonld} (100%) rename data/entities/expectations/{building-simple-attributes-simplified-expectation.json => building-simple-attributes-simplified.json} (100%) rename data/entities/expectations/{building-simple-attributes-simplified-expectation.jsonld => building-simple-attributes-simplified.jsonld} (100%) rename data/entities/expectations/{building-simple-attributes-expectation.jsonld => building-simple-attributes.jsonld} (100%) rename data/entities/expectations/{two-types-vehicle-offstreetparking-expectation.jsonld => two-types-vehicle-offstreetparking.jsonld} (100%) rename data/entities/expectations/{two-vehicles-expectation.jsonld => two-vehicles.jsonld} (100%) rename data/entities/expectations/{vehicle-delete-datasetid-speed-expectation.jsonld => vehicle-delete-datasetid-speed.jsonld} (100%) rename data/entities/expectations/{vehicle-delete-default-speed-expectation.jsonld => vehicle-delete-default-speed.jsonld} (100%) rename data/entities/expectations/{vehicle-delete-deleteall-speed-expectation.jsonld => vehicle-delete-deleteall-speed.jsonld} (100%) rename data/entities/expectations/{vehicle-isparked-update-expectation.jsonld => vehicle-isparked-update.jsonld} (100%) rename data/entities/expectations/{vehicle-language-property-appended-expectation.jsonld => vehicle-language-property-appended.jsonld} (100%) rename data/entities/expectations/{vehicle-multi-attributes-expectation.jsonld => vehicle-multi-attributes.jsonld} (100%) rename data/entities/expectations/{vehicle-parking-simple-expectation.geojson => vehicle-parking-simple.geojson} (100%) rename data/entities/expectations/{vehicle-simple-attributes-core-context-expectation.json => vehicle-simple-attributes-core-context.json} (100%) rename data/entities/expectations/{vehicle-speed-appended-expectation.jsonld => vehicle-speed-appended.jsonld} (100%) rename data/entities/expectations/{vehicle-speed-different-datasetid-expectation.jsonld => vehicle-speed-different-datasetid.jsonld} (100%) rename data/entities/expectations/{vehicle-update-attributes-expectation.jsonld => vehicle-update-attributes.jsonld} (100%) rename data/entities/expectations/{vehicle-update-datasetid-attributes-expectation.jsonld => vehicle-update-datasetid-attributes.jsonld} (100%) rename data/entities/expectations/{vehicle-update-speed-expectation.jsonld => vehicle-update-speed.jsonld} (100%) rename data/entities/{invalid-json-sample.jsonld => invalid-json.jsonld} (100%) rename data/entities/{parking-simple-attributes-sample.jsonld => parking-simple-attributes.jsonld} (100%) rename data/entities/{vehicle-simple-attributes-sample.json => vehicle-simple-attributes.json} (100%) rename data/entities/{vehicle-simple-attributes-sample.jsonld => vehicle-simple-attributes.jsonld} (100%) rename data/entities/{vehicle-speed-two-datasetid-sample.jsonld => vehicle-speed-two-datasetid.jsonld} (100%) rename data/entities/{vehicle-two-datasetid-attributes-sample.jsonld => vehicle-two-datasetid-attributes.jsonld} (100%) delete mode 100644 data/jsonldContext/@context-duplicated-key.json rename data/subscriptions/expectations/{subscription-028-01-expectation.jsonld => subscription-028-01.jsonld} (100%) rename data/subscriptions/expectations/{subscription-vehicle-expanded-types-sample.jsonld => subscription-vehicle-expanded-types.jsonld} (100%) rename data/subscriptions/expectations/{subscription-vehicle-sample.jsonld => subscription-vehicle.jsonld} (100%) rename data/subscriptions/expectations/{subscriptions-030-03-expectation.json => subscriptions-030-03.json} (100%) rename data/subscriptions/expectations/{subscriptions-031-01-expectation.json => subscriptions-031-01.json} (100%) rename data/subscriptions/fragments/{subscription-expiresAt-future-update-sample.json => subscription-expiresAt-future-update.json} (100%) rename data/subscriptions/fragments/{subscription-expiresAt-update-sample.json => subscription-expiresAt-update.json} (100%) rename data/subscriptions/fragments/{subscription-invalid-update-sample.json => subscription-invalid-update.json} (100%) rename data/subscriptions/fragments/{subscription-isActive-expiresAt-update-sample.json => subscription-isActive-expiresAt-update.json} (100%) rename data/subscriptions/fragments/{subscription-isActive-false-update-sample.json => subscription-isActive-false-update.json} (100%) rename data/subscriptions/fragments/{subscription-isActive-true-update-sample.json => subscription-isActive-true-update.json} (100%) rename data/subscriptions/fragments/{subscription-null-properties-update-sample.json => subscription-null-properties-update.json} (100%) rename data/subscriptions/fragments/{subscription-update-sample.json => subscription-update.json} (100%) rename data/subscriptions/fragments/{subscription-vehicle-entities-sample.json => subscription-vehicle-entities.json} (100%) rename data/subscriptions/{subscription-empty-sample.jsonld => subscription-empty.jsonld} (100%) rename data/subscriptions/{subscription-inactive-sample.jsonld => subscription-inactive.jsonld} (100%) rename data/subscriptions/{subscription-invalid-json-sample.jsonld => subscription-invalid-json.jsonld} (100%) rename data/subscriptions/{subscription-invalid-negative-throttling-sample.jsonld => subscription-invalid-negative-throttling.jsonld} (100%) rename data/subscriptions/{subscription-invalid-throttling-timeInterval-sample.jsonld => subscription-invalid-throttling-timeInterval.jsonld} (100%) rename data/subscriptions/{subscription-timeInterval-sample.jsonld => subscription-timeInterval.jsonld} (100%) rename data/subscriptions/{subscription-unretrievable-context-sample.jsonld => subscription-unretrievable-context.jsonld} (100%) rename data/subscriptions/{subscription-valid-throttling-sample.jsonld => subscription-valid-throttling.jsonld} (100%) rename data/subscriptions/{subscription-watchedAttributes-sample.jsonld => subscription-watchedAttributes.jsonld} (100%) rename data/subscriptions/{subscription-sample.jsonld => subscription.jsonld} (100%) rename data/temporalEntities/{2020-08-bus-temporal-representation-sample.jsonld => 2020-08-bus-temporal-representation.jsonld} (100%) rename data/temporalEntities/{2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld => 2020-08-vehicle-temporal-representation-multiple-instances.jsonld} (100%) rename data/temporalEntities/{2020-08-vehicule-temporal-representation-sample.jsonld => 2020-08-vehicle-temporal-representation.jsonld} (100%) rename data/temporalEntities/{2020-09-vehicule-temporal-representation-sample.jsonld => 2020-09-vehicle-temporal-representation.jsonld} (100%) rename data/temporalEntities/{2020-10-vehicule-temporal-representation-with-location-sample.jsonld => 2020-10-vehicle-temporal-representation-with-location.jsonld} (100%) rename data/temporalEntities/{bus-temporal-representation-unretrievable-context-sample.jsonld => bus-temporal-representation-unretrievable-context.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-language-property-normalized-temporal-representation-expectation.jsonld => vehicle-language-property-normalized-temporal-representation.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-language-property-simplified-temporal-representation-expectation.jsonld => vehicle-language-property-simplified-temporal-representation.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-01-expectation.jsonld => vehicle-temporal-representation-020-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-02-expectation.jsonld => vehicle-temporal-representation-020-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-03-expectation.jsonld => vehicle-temporal-representation-020-03.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-04-01-expectation.jsonld => vehicle-temporal-representation-020-04-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-04-02-expectation.jsonld => vehicle-temporal-representation-020-04-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-04-03-expectation.jsonld => vehicle-temporal-representation-020-04-03.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-05-01-expectation.jsonld => vehicle-temporal-representation-020-05-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-05-02-expectation.jsonld => vehicle-temporal-representation-020-05-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-10-expectation.jsonld => vehicle-temporal-representation-020-10.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-11-01-expectation.json => vehicle-temporal-representation-020-11-01.json} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-11-02-expectation.json => vehicle-temporal-representation-020-11-02.json} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-11-03-expectation.json => vehicle-temporal-representation-020-11-03.json} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-11-04-expectation.json => vehicle-temporal-representation-020-11-04.json} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-added-attribute-expectation.jsonld => vehicle-temporal-representation-added-attribute.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-create-with-no-context-expectation.jsonld => vehicle-temporal-representation-create-with-no-context.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-create-expectation.jsonld => vehicle-temporal-representation-create.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-delete-fuelLevel-datasetid-expectation.jsonld => vehicle-temporal-representation-delete-fuelLevel-datasetid.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld => vehicle-temporal-representation-delete-fuelLevel.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld => vehicle-temporal-representation-delete-speed-instanceid.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-deleteall-fuelLevel-expectation.jsonld => vehicle-temporal-representation-deleteall-fuelLevel.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-modify-attribute-instance-expectation.jsonld => vehicle-temporal-representation-modify-attribute-instance.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-update-expectation.jsonld => vehicle-temporal-representation-update.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-01-01-expectation.jsonld => vehicles-temporal-representation-021-01-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-01-02-expectation.jsonld => vehicles-temporal-representation-021-01-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-02-expectation.jsonld => vehicles-temporal-representation-021-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-03-expectation.jsonld => vehicles-temporal-representation-021-03.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-04-expectation.jsonld => vehicles-temporal-representation-021-04.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-05-expectation.jsonld => vehicles-temporal-representation-021-05.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-06-expectation.jsonld => vehicles-temporal-representation-021-06.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-07-expectation.jsonld => vehicles-temporal-representation-021-07.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-08-expectation.jsonld => vehicles-temporal-representation-021-08.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-09-01-expectation.jsonld => vehicles-temporal-representation-021-09-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-09-02-expectation.jsonld => vehicles-temporal-representation-021-09-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-13-01-expectation.jsonld => vehicles-temporal-representation-021-13-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-13-02-expectation.jsonld => vehicles-temporal-representation-021-13-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-14-01-expectation.json => vehicles-temporal-representation-021-14-01.json} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-14-02-expectation.json => vehicles-temporal-representation-021-14-02.json} (100%) rename data/temporalEntities/{vehicle-create-temporal-representation-without-context-sample.jsonld => vehicle-create-temporal-representation-without-context.jsonld} (100%) rename data/temporalEntities/{vehicle-create-temporal-representation-sample.jsonld => vehicle-create-temporal-representation.jsonld} (100%) rename data/temporalEntities/{vehicle-language-property-temporal-representation-sample.jsonld => vehicle-language-property-temporal-representation.jsonld} (100%) delete mode 100644 data/temporalEntities/vehicle-temporal-representation-empty-json-sample.jsonld rename data/{jsonldContext/expected-detailed-@context.json => temporalEntities/vehicle-temporal-representation-empty-json.jsonld} (100%) rename data/temporalEntities/{vehicle-temporal-representation-invalid-json-sample.jsonld => vehicle-temporal-representation-invalid-json.jsonld} (100%) rename data/temporalEntities/{vehicle-temporal-representation-update-sample.jsonld => vehicle-temporal-representation-update.jsonld} (100%) rename data/temporalEntities/{vehicle-temporal-representation-without-id-sample.jsonld => vehicle-temporal-representation-without-id.jsonld} (100%) rename data/temporalEntities/{vehicle-temporal-representation-sample.jsonld => vehicle-temporal-representation.jsonld} (100%) rename data/types/expectations/{attribute-026-01-01-expectation.json => attribute-026-01-01.json} (100%) rename data/types/expectations/{attribute-026-01-02-expectation.json => attribute-026-01-02.json} (100%) rename data/types/expectations/{attribute-027-01-expectation.json => attribute-027-01.json} (100%) rename data/types/expectations/{attribute-list-025-01-01-expectation.json => attribute-list-025-01-01.json} (100%) rename data/types/expectations/{attribute-list-025-01-02-expectation.json => attribute-list-025-01-02.json} (100%) rename data/types/expectations/{entity-type-023-01-01-expectation.json => entity-type-023-01-01.json} (100%) rename data/types/expectations/{entity-type-023-01-02-expectation.json => entity-type-023-01-02.json} (100%) rename data/types/expectations/{entity-type-info-024-01-expectation.json => entity-type-info-024-01.json} (100%) rename data/types/expectations/{entity-type-list-022-01-01-expectation.json => entity-type-list-022-01-01.json} (100%) rename data/types/expectations/{entity-type-list-022-01-02-expectation.json => entity-type-list-022-01-02.json} (100%) diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot index 04e4af9f..8dfdfcc5 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot @@ -14,14 +14,14 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${building_filename}= building-simple-attributes-sample.jsonld +${building_filename}= building-simple-attributes.jsonld ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_filename}= subscriptions/subscription-sample.jsonld +${subscription_filename}= subscriptions/subscription.jsonld ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_filename}= csourceRegistrations/context-source-registration-with-expiration-sample.jsonld +${registration_filename}= csourceRegistrations/context-source-registration-with-expiration.jsonld ${registration_type}= Vehicle ${tea_id_prefix}= urn:ngsi-ld:Vehicle: -${tea_filename}= vehicle-temporal-representation-sample.jsonld +${tea_filename}= vehicle-temporal-representation.jsonld ${teatype}= Vehicle ${content_type}= application/json diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot index 44a8ff10..dfcfd43f 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot @@ -12,13 +12,13 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${expected_status_code}= 503 ${building_id_prefix}= urn:ngsi-ld:Building: -${building_filename}= building-unretrievable-context-sample.jsonld +${building_filename}= building-unretrievable-context.jsonld ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_filename}= subscriptions/subscription-unretrievable-context-sample.jsonld +${subscription_filename}= subscriptions/subscription-unretrievable-context.jsonld ${tea_id_prefix}= urn:ngsi-ld:Vehicle: -${tea_filename}= bus-temporal-representation-unretrievable-context-sample.jsonld +${tea_filename}= bus-temporal-representation-unretrievable-context.jsonld ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_filename}= csourceRegistrations/context-source-registration-unretrievable-context-sample.jsonld +${registration_filename}= csourceRegistrations/context-source-registration-unretrievable-context.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot index af2fbf78..d7b50946 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld ${vehicle_fragment}= vehicle-brandname-fragment.json ${attribute_id}= brandName diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot index a228f94b..70853e4b 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot @@ -12,8 +12,8 @@ Test Teardown Delete Initial Subscription *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_filename}= subscriptions/subscription-sample.jsonld -${subscription_fragment}= subscriptions/fragments/subscription-update-sample.json +${subscription_filename}= subscriptions/subscription.jsonld +${subscription_fragment}= subscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot index 9b0dd212..b87bbb64 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot @@ -10,16 +10,16 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld ${vehicle_attribute}= speed ${vehicle_fragment}= vehicle-brandname-fragment.jsonld ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_filename}= csourceSubscriptions/subscription-sample.jsonld -${subscription_fragment}= csourceSubscriptions/fragments/subscription-update-sample.jsonld +${subscription_filename}= csourceSubscriptions/subscription.jsonld +${subscription_fragment}= csourceSubscriptions/fragments/subscription-update.jsonld ${tea_id_prefix}= urn:ngsi-ld:Vehicle: -${tea_filename}= vehicle-temporal-representation-sample.jsonld +${tea_filename}= vehicle-temporal-representation.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${building_filename}= building-simple-attributes-sample.jsonld +${building_filename}= building-simple-attributes.jsonld ${content_type}= application/xml diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01.robot index 13de0208..7448a292 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_02.robot index f4298288..79d55052 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_02.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json -${expectation_file}= types/expectations/attribute-027-01-expectation.json +${filename}= building-simple-attributes.json +${expectation_file}= types/expectations/attribute-027-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot index 05096b7e..f6a0f6ef 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot @@ -13,16 +13,16 @@ Test Template Retrieve Available Attributes *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** CONTEXT EXPECTATION_FILE 025_01_01 WithoutJsonLdContext [Tags] ed-attrs 5_7_8 - ${EMPTY} types/expectations/attribute-list-025-01-01-expectation.json + ${EMPTY} types/expectations/attribute-list-025-01-01.json 025_01_02 WithJsonLdContext [Tags] ed-attrs 5_7_8 - ${ngsild_test_suite_context} types/expectations/attribute-list-025-01-02-expectation.json + ${ngsild_test_suite_context} types/expectations/attribute-list-025-01-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01.robot index 8b5c51cb..09cd511e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Initial Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_02.robot index 6ebc8c6a..fea49127 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_02.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Initial Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json -${expectation_file}= types/expectations/entity-type-info-024-01-expectation.json +${filename}= building-simple-attributes.json +${expectation_file}= types/expectations/entity-type-info-024-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot index 93dc63ae..f60b38d4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot @@ -14,17 +14,17 @@ Test Template Retrieve Available Entity Types *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${first_filename}= building-simple-attributes-sample.json -${second_filename}= vehicle-simple-attributes-sample.json +${first_filename}= building-simple-attributes.json +${second_filename}= vehicle-simple-attributes.json *** Test Cases *** CONTEXT EXPECTATION_FILE 022_01_01 WithoutJsonLdContext [Tags] ed-types 5_7_5 - ${EMPTY} types/expectations/entity-type-list-022-01-01-expectation.json + ${EMPTY} types/expectations/entity-type-list-022-01-01.json 022_01_02 WithJsonLdContext [Tags] ed-types 5_7_5 - ${ngsild_test_suite_context} types/expectations/entity-type-list-022-01-02-expectation.json + ${ngsild_test_suite_context} types/expectations/entity-type-list-022-01-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot index 035213c2..7f9a058e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot @@ -13,16 +13,16 @@ Test Template Retrieve Details Of Available Attributes *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** CONTEXT EXPECTATION_FILE 026_01_01 WithoutJsonLdContext [Tags] ed-attrs-details 5_7_9 - ${EMPTY} types/expectations/attribute-026-01-01-expectation.json + ${EMPTY} types/expectations/attribute-026-01-01.json 026_01_02 WithJsonLdContext [Tags] ed-attrs-details 5_7_9 - ${ngsild_test_suite_context} types/expectations/attribute-026-01-02-expectation.json + ${ngsild_test_suite_context} types/expectations/attribute-026-01-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot index e983ecfa..73b1a871 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot @@ -14,17 +14,17 @@ Test Template Retrieve Details Of Available Entity Types *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${first_filename}= building-simple-attributes-sample.json -${second_filename}= vehicle-simple-attributes-sample.json +${first_filename}= building-simple-attributes.json +${second_filename}= vehicle-simple-attributes.json *** Test Cases *** CONTEXT EXPECTATION_FILE 023_01_01 WithoutJsonLdContext [Tags] ed-types-details 5_7_6 - ${EMPTY} types/expectations/entity-type-023-01-01-expectation.json + ${EMPTY} types/expectations/entity-type-023-01-01.json 023_01_02 WithJsonLdContext [Tags] ed-types-details 5_7_6 - ${ngsild_test_suite_context} types/expectations/entity-type-023-01-02-expectation.json + ${ngsild_test_suite_context} types/expectations/entity-type-023-01-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_01.robot index 557217f7..4b16d03d 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_01.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-expectation.json +${filename}= building-minimal.jsonld +${expectation_filename}= building-minimal.json ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_02.robot index b5293c30..72600477 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_02.robot @@ -13,10 +13,10 @@ Suite Teardown Delete Entities ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${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}= two-types-vehicle-offstreetparking-expectation.jsonld +${building_filename}= building-minimal.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld +${parking_filename}= parking-simple-attributes.jsonld +${expectation_filename}= two-types-vehicle-offstreetparking.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/QueryEntities/019_01_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_03.robot index 6b293b76..51bb6f34 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_03.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-expectation.json +${filename}= building-minimal.jsonld +${expectation_filename}= building-minimal.json ${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/QueryEntities/019_01_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_04.robot index a0acab89..c6676a63 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_04.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${filename2}= building-minimal-sample.jsonld -${expectation_filename}= building-attributes-query-expectation.json +${filename}= building-simple-attributes.jsonld +${filename2}= building-minimal.jsonld +${expectation_filename}= building-attributes-query.json ${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/QueryEntities/019_01_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_05.robot index 97c771e4..09e68b08 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_05.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-geoproperty-query-expectation.jsonld +${filename}= building-location-attribute.jsonld +${expectation_filename}= building-geoproperty-query.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${georal}= equals ${geometry}= Point diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot index ab4d07f2..254620a4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-expectation.json +${filename}= building-minimal.jsonld +${expectation_filename}= building-minimal.json ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_02.robot index 3dfb6beb..488a4200 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_02.robot @@ -13,9 +13,9 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${building_filename}= building-minimal-sample.jsonld -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld -${expectation_filename}= two-vehicles-expectation.jsonld +${building_filename}= building-minimal.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld +${expectation_filename}= two-vehicles.jsonld ${building_entity_type}= https://ngsi-ld-test-suite/context#Building ${vehicle_entity_type}= https://ngsi-ld-test-suite/context#Vehicle diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_03.robot index 7413bc2d..7dd7b463 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_03.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-expectation.json +${filename}= building-minimal.jsonld +${expectation_filename}= building-minimal.json ${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/QueryEntities/019_02_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_04.robot index fe9373d8..e9e38a6e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_04.robot @@ -13,9 +13,9 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${building_filename}= building-minimal-sample.jsonld -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld -${expectation_filename}= vehicle-simple-attributes-core-context-expectation.json +${building_filename}= building-minimal.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld +${expectation_filename}= vehicle-simple-attributes-core-context.json ${attribute_brandname}= https://ngsi-ld-test-suite/context#brandName ${attribute_isparked}= https://uri.etsi.org/ngsi-ld/default-context/isParked diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot index f8d72a98..ad2e11a3 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot @@ -13,9 +13,9 @@ Suite Teardown Delete Entities *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${parking_id_prefix}= urn:ngsi-ld:OffStreetParking: -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld -${parking_filename}= parking-simple-attributes-sample.jsonld -${expectation_filename}= vehicle-parking-simple-expectation.geojson +${vehicle_filename}= vehicle-simple-attributes.jsonld +${parking_filename}= parking-simple-attributes.jsonld +${expectation_filename}= vehicle-parking-simple.geojson ${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/QueryEntities/019_03_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_01.robot index d5f651c3..212711fd 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_01.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${entity_invalid_id_one}= thisisaninvaliduri1 ${entity_invalid_id_two}= thisisaninvaliduri2 diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_02.robot index 7ce3496d..e0092e8d 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_02.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${building_filename}= building-minimal-sample.jsonld -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld +${building_filename}= building-minimal.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld ${invalid_entity_type_one}= type ${invalid_entity_type_two}= invalid_entity_type_two diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_03.robot index 1068173e..7e978656 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_03.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${invalid_entity_id_pattern}= invalid_entity_id_pattern** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_04.robot index 9871e7f6..04b37ae0 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_04.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${invalid_attribute_one}= id ${invalid_attribute_two}= type diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_05.robot index 52214218..ff946f1b 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_05.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld +${filename}= building-location-attribute.jsonld ${entity_type}= Building ${georel}= invalid ${geometry}= Point diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot index b729cb95..f2b890e5 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-simplified-expectation.json +${filename}= building-simple-attributes.jsonld +${expectation_filename}= building-simple-attributes-simplified.json ${options_parameter}= keyValues ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot index a963fa84..ce9ddb85 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld +${filename}= building-location-attribute.jsonld ${expectation_filename}= two-buildings-location-attribute-normalized.geojson ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot index 8d136195..3533aa51 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${limit}= 2 diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_07.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_07.robot index 91261d2c..a6976274 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_07.robot @@ -13,8 +13,8 @@ Test Template Query Entities With Count *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${first_entity_filename}= building-simple-attributes-sample.jsonld -${second_entity_filename}= building-simple-attributes-second-sample.jsonld +${first_entity_filename}= building-simple-attributes.jsonld +${second_entity_filename}= building-simple-attributes-second.jsonld ${entity_type}= Building ${airQualityLevel}= airQualityLevel==6 diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_08.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_08.robot index 25d43015..81365192 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_08.robot @@ -13,9 +13,9 @@ Test Template Query entities using Entity Type Selection Language *** Variables *** ${entity_id_prefix} urn:ngsi-ld:MultiTypes: -${first_entity_filename} building-simple-attributes-sample.jsonld -${second_entity_filename} building-with-different-type-sample.jsonld -${third_entity_filename} building-with-two-types-sample.jsonld +${first_entity_filename} building-simple-attributes.jsonld +${second_entity_filename} building-with-different-type.jsonld +${third_entity_filename} building-with-two-types.jsonld ${building_entity_type} Building ${parking_entity_type} Parking ${tourist_destination_entity_type} TouristDestination diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_01.robot index cada5b4b..13346272 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_01.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-expectation.jsonld +${filename}= building-simple-attributes.jsonld +${expectation_filename}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_02.robot index 986ba73f..7bc71315 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_02.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-query-expectation.jsonld +${filename}= building-simple-attributes.jsonld +${expectation_filename}= building-simple-attributes-query.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/RetrieveEntity/018_01_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_03.robot index d4a7b7d2..73d1f17a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_03.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-geoproperty-query-expectation.jsonld +${filename}= building-location-attribute.jsonld +${expectation_filename}= building-geoproperty-query.jsonld ${geometry_property}= location diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_03_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_03_02.robot index 97a35124..d9470434 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_03_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_03_02.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld +${filename}= building-simple-attributes.jsonld ${attribute_not_known}= property_not_found diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_04.robot index 370df415..f1e91158 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_04.robot @@ -11,8 +11,8 @@ Test Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld +${filename}= building-simple-attributes.jsonld +${expectation_filename}= building-simple-attributes-simplified.jsonld ${options_parameter}= keyValues diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot index a06f8909..f457a045 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot @@ -13,7 +13,7 @@ Test Template Retrieve Entity In GeoJSON Representation *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld +${filename}= building-location-attribute.jsonld *** Test Cases *** OPTIONS EXPECTATION_FILENAME diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_06.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_06.robot index ffff142d..da83ed60 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_06.robot @@ -13,9 +13,9 @@ Test Template Review JSON-LD Resolution When retrieving an entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json -${empty_jsonld_expectation_filename}= building-simple-attributes-sample-expanded-expectation.json -${creation_jsonld_expectation_filename}= building-simple-attributes-sample-compacted-expectation.json +${filename}= building-simple-attributes.json +${empty_jsonld_expectation_filename}= building-simple-attributes-expanded.json +${creation_jsonld_expectation_filename}= building-simple-attributes-compacted.json *** Test Cases *** CONTEXT EXPECTED_PAYLOAD diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot index 314cbf35..79ae8ddf 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot @@ -13,7 +13,7 @@ Test Template Retrieve Entity With Language Filter *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-language-property-sample.jsonld +${filename}= building-language-property.jsonld *** Test Cases *** LANGUAGE_FILTER OPTIONS EXPECTATION_FILENAME 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 1c08596b..0b302961 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot @@ -12,20 +12,20 @@ Test Template Query the temporal evolution of entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${bus_id_prefix}= urn:ngsi-ld:Bus: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${bus_payload_file}= 2020-08-bus-temporal-representation-sample.jsonld +${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 *** Test Cases *** TIMEREL TIMEAT EXPECTATION_FILE 021_01_01 After [Tags] te-query 5_7_4 - after 2020-08-01T12:04:00Z vehicles-temporal-representation-021-01-01-expectation.jsonld + after 2020-08-01T12:04:00Z vehicles-temporal-representation-021-01-01.jsonld 021_01_02 Before [Tags] te-query 5_7_4 - before 2020-09-01T13:06:00Z vehicles-temporal-representation-021-01-02-expectation.jsonld + before 2020-09-01T13:06:00Z vehicles-temporal-representation-021-01-02.jsonld *** Keywords *** @@ -48,8 +48,8 @@ Query the temporal evolution of entities ... ${response.json()} Setup Initial Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${third_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} 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 91b5c64d..2a508f15 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-02-expectation.jsonld +${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 *** Test Cases *** @@ -41,8 +41,8 @@ ${expectation_file}= vehicles-temporal-representation-021-02-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 4d8e3885..99b0d884 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-03-expectation.jsonld +${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 *** Test Cases *** @@ -40,8 +40,8 @@ ${expectation_file}= vehicles-temporal-representation-021-03-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 57817f32..24a731ec 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-04-expectation.jsonld +${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 *** Test Cases *** @@ -39,8 +39,8 @@ ${expectation_file}= vehicles-temporal-representation-021-04-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 b9c607ce..042a0676 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot @@ -11,11 +11,11 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${bus_id_prefix}= urn:ngsi-ld:Bus: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${bus_payload_file}= 2020-08-bus-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-05-expectation.jsonld +${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 *** Test Cases *** @@ -38,7 +38,7 @@ ${expectation_file}= vehicles-temporal-representation-021-05-expectation. *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${second_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${first_temporal_entity_representation_id} 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 1abc4825..b34a2d8c 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-06-expectation.jsonld +${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 *** Test Cases *** @@ -39,8 +39,8 @@ ${expectation_file}= vehicles-temporal-representation-021-06-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 a937da61..fc483b5a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-07-expectation.jsonld +${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 *** Test Cases *** @@ -40,8 +40,8 @@ ${expectation_file}= vehicles-temporal-representation-021-07-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 7dec5616..95e39996 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-08-expectation.jsonld +${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 *** Test Cases *** @@ -40,8 +40,8 @@ ${expectation_file}= vehicles-temporal-representation-021-08-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 0c2a0f23..e8fac7b5 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot @@ -12,19 +12,19 @@ Test Template Query the temporal evolution of entities matching the given *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-10-vehicule-temporal-representation-with-location-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-09-expectation.jsonld +${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 *** Test Cases *** GEOREL GEOMETRY COORDINATES GEOPROPERTY EXPECTATION_FILE 021_09_01 Near Point [Tags] te-query 5_7_4 - near;maxDistance==2000 Point [-8.503,41.202] ${EMPTY} vehicles-temporal-representation-021-09-01-expectation.jsonld + near;maxDistance==2000 Point [-8.503,41.202] ${EMPTY} vehicles-temporal-representation-021-09-01.jsonld 021_09_02 Within Polygon [Tags] te-query 5_7_4 - contains Polygon [[[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-13.503,32.57],[-13.503,47.202]]] location vehicles-temporal-representation-021-09-02-expectation.jsonld + contains Polygon [[[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-13.503,32.57],[-13.503,47.202]]] location vehicles-temporal-representation-021-09-02.jsonld *** Keywords *** @@ -49,8 +49,8 @@ Query the temporal evolution of entities matching the given NGSI-LD geo-query ... ${response.json()} Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 index 0a90bcfa..86ba7571 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot @@ -13,7 +13,7 @@ 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-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval.jsonld ${context_source_url}= http://${context_source_host}:${context_source_port} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot index f373dd13..81e76add 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot @@ -12,9 +12,9 @@ Test Template Query the temporal evolution of entities with a limit to the *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld +${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 *** Test Cases *** LIMIT @@ -41,9 +41,9 @@ Query the temporal evolution of entities with a limit to the number of entities Check Response Body Containing Number Of Entities Vehicle ${limit} ${response.json()} Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${third_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${third_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot index 0c8be253..ceb725ea 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** @@ -32,7 +32,7 @@ ${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.json *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Suite Variable ${temporal_entity_representation_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 a33e3115..b660fb2f 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot @@ -12,18 +12,18 @@ Test Template Query the temporal evolution of entities using the entityOpe *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld +${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 *** Test Cases *** PAYLOAD_FILE EXPECTATION_FILE 021_13_01 After [Tags] te-query 5_7_4 - entity-operations-after-query.jsonld vehicles-temporal-representation-021-13-01-expectation.jsonld + entity-operations-after-query.jsonld vehicles-temporal-representation-021-13-01.jsonld 021_13_02 Before [Tags] te-query 5_7_4 - entity-operations-before-query.jsonld vehicles-temporal-representation-021-13-02-expectation.jsonld + entity-operations-before-query.jsonld vehicles-temporal-representation-021-13-02.jsonld *** Keywords *** @@ -43,8 +43,8 @@ Query the temporal evolution of entities using the entityOperations method ... ${response.json()} Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 ed2488f2..ba044d96 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot @@ -12,20 +12,20 @@ Test Template Query the temporal evolution of entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${bus_id_prefix}= urn:ngsi-ld:Bus: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${bus_payload_file}= 2020-08-bus-temporal-representation-sample.jsonld +${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 *** Test Cases *** TIMEREL TIMEAT EXPECTATION_FILE 021_14_01 After [Tags] te-query 5_7_4 - after 2020-08-01T12:04:00Z vehicles-temporal-representation-021-14-01-expectation.json + after 2020-08-01T12:04:00Z vehicles-temporal-representation-021-14-01.json 021_14_02 Before [Tags] te-query 5_7_4 - before 2020-09-01T13:06:00Z vehicles-temporal-representation-021-14-02-expectation.json + before 2020-09-01T13:06:00Z vehicles-temporal-representation-021-14-02.json *** Keywords *** @@ -49,8 +49,8 @@ Query the temporal evolution of entities ... ${response.json()} Setup Initial Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${third_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot index 5ad471d5..8ce222af 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${vehicle_expectation_file}= vehicle-temporal-representation-020-01-expectation.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld +${vehicle_expectation_file}= vehicle-temporal-representation-020-01.jsonld *** Test Cases *** @@ -31,7 +31,7 @@ ${vehicle_expectation_file}= vehicle-temporal-representation-020-01-expectati *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Suite Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot index acdd9fe5..a6d8cf19 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${vehicle_expectation_file}= vehicle-temporal-representation-020-02-expectation.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld +${vehicle_expectation_file}= vehicle-temporal-representation-020-02.jsonld *** Test Cases *** @@ -32,7 +32,7 @@ ${vehicle_expectation_file}= vehicle-temporal-representation-020-02-expectati *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Suite Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot index 8c75629c..ffe22edf 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot @@ -11,9 +11,9 @@ Test Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${vehicle_expectation_file}= vehicle-temporal-representation-020-03-expectation.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld +${vehicle_expectation_file}= vehicle-temporal-representation-020-03.jsonld *** Test Cases *** @@ -34,7 +34,7 @@ ${vehicle_expectation_file}= vehicle-temporal-representation-020-03-expectati *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Suite Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot index 8b01da92..6b9a0ec8 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot @@ -12,20 +12,20 @@ Test Template Retrieve the temporal evolution of an entity matching the gi *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** TIMEREL TIMEAT ENDTIMEAT VEHICLE_EXPECTATION_FILE 020_04_01 After [Tags] te-retrieve 5_7_3 - after 2020-08-01T13:03:00Z ${EMPTY} vehicle-temporal-representation-020-04-01-expectation.jsonld + after 2020-08-01T13:03:00Z ${EMPTY} vehicle-temporal-representation-020-04-01.jsonld 020_04_02 Before [Tags] te-retrieve 5_7_3 - before 2020-08-01T12:05:00Z ${EMPTY} vehicle-temporal-representation-020-04-02-expectation.jsonld + before 2020-08-01T12:05:00Z ${EMPTY} vehicle-temporal-representation-020-04-02.jsonld 020_04_03 Between [Tags] te-retrieve 5_7_3 - between 2020-08-01T12:00:00Z 2020-08-01T13:00:00Z vehicle-temporal-representation-020-04-03-expectation.jsonld + between 2020-08-01T12:00:00Z 2020-08-01T13:00:00Z vehicle-temporal-representation-020-04-03.jsonld *** Keywords *** @@ -45,7 +45,7 @@ Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Test Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot index 9375ae08..8913018b 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot @@ -12,17 +12,17 @@ Test Template Retrieve the temporal evolution of the last N instances of e *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-multiple-instances.jsonld *** Test Cases *** LASTN VEHICLE_EXPECTATION_FILE 020_05_01 Retrieve Some Instances [Tags] te-retrieve 5_7_3 - ${10} vehicle-temporal-representation-020-05-01-expectation.jsonld + ${10} vehicle-temporal-representation-020-05-01.jsonld 020_05_02 Retrieve All Instances [Tags] te-retrieve 5_7_3 - ${20} vehicle-temporal-representation-020-05-02-expectation.jsonld + ${20} vehicle-temporal-representation-020-05-02.jsonld *** Keywords *** @@ -40,7 +40,7 @@ Retrieve the temporal evolution of the last N instances of entity attributes ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Test Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot index 29374deb..81dc1985 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** @@ -33,7 +33,7 @@ ${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.json *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Suite Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot index 9c4200fb..02656b51 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot @@ -12,8 +12,8 @@ Test Template Retrieve the temporal evolution of an entity with an invalid *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** TIMEREL TIMEAT ENDTIMEAT @@ -44,7 +44,7 @@ Retrieve the temporal evolution of an entity with an invalid request content Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Test Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot index c549ec1d..b1281738 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${vehicle_expectation_file}= vehicle-temporal-representation-020-10-expectation.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld +${vehicle_expectation_file}= vehicle-temporal-representation-020-10.jsonld *** Test Cases *** @@ -34,7 +34,7 @@ ${vehicle_expectation_file}= vehicle-temporal-representation-020-10-expectati *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Suite Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot index b4c20e90..d7fd7fa4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot @@ -12,23 +12,23 @@ Test Template Retrieve the temporal evolution of an entity with the aggreg *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** AGGRMETHODS AGGRPERIODDURATION ATTRS VEHICLE_EXPECTATION_FILE 020_11_01 One aggregate method aggregated by one hour duration [Tags] te-retrieve 5_7_3 4_5_19 since_v1.4.1 - avg PT1H ${EMPTY} vehicle-temporal-representation-020-11-01-expectation.json + avg PT1H ${EMPTY} vehicle-temporal-representation-020-11-01.json 020_11_02 One aggregate method aggregated by one hour duration asking for one attribute [Tags] te-retrieve 5_7_3 4_5_19 since_v1.4.1 - avg PT1H fuelLevel vehicle-temporal-representation-020-11-02-expectation.json + avg PT1H fuelLevel vehicle-temporal-representation-020-11-02.json 020_11_03 Multiple aggregate methods aggregated by one hour duration [Tags] te-retrieve 5_7_3 4_5_19 since_v1.4.1 - avg,max PT1H ${EMPTY} vehicle-temporal-representation-020-11-03-expectation.json + avg,max PT1H ${EMPTY} vehicle-temporal-representation-020-11-03.json 020_11_04 Multiple aggregate methods aggregated by one day duration [Tags] te-retrieve 5_7_3 4_5_19 since_v1.4.1 - min,max P1D ${EMPTY} vehicle-temporal-representation-020-11-04-expectation.json + min,max P1D ${EMPTY} vehicle-temporal-representation-020-11-04.json *** Keywords *** @@ -50,7 +50,7 @@ Retrieve the temporal evolution of an entity with the aggregated temporal repres ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Suite Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot index 8bfa8d24..c5f814d4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot @@ -12,17 +12,17 @@ Test Template Retrieve Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= vehicle-language-property-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= vehicle-language-property-temporal-representation.jsonld *** Test Cases *** REPRESENTATION EXPECTATION_FILENAME 020_12_01 Retrieve the normalized temporal representation of an entity with a LanguageProperty property [Tags] te-retrieve 5_7_3 4_5_7 4_5_18 since_v1.4.1 - ${EMPTY} vehicle-language-property-normalized-temporal-representation-expectation.jsonld + ${EMPTY} vehicle-language-property-normalized-temporal-representation.jsonld 020_12_02 Retrieve the simplified temporal representation of an entity with a LanguageProperty property [Tags] te-retrieve 5_7_3 4_5_9 4_5_18 since_v1.4.1 - temporalValues vehicle-language-property-simplified-temporal-representation-expectation.jsonld + temporalValues vehicle-language-property-simplified-temporal-representation.jsonld *** Keywords *** @@ -40,7 +40,7 @@ Retrieve Temporal Entity ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} Create Temporal Representation Of Entity ${vehicle_payload_file} ${temporal_entity_representation_id} Set Suite Variable ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot index d6b9ac5f..7bc259cd 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot @@ -17,16 +17,16 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME 003_01_01 MinimalEntity [Tags] be-create 5_6_7 - building-minimal-sample.jsonld + building-minimal.jsonld 003_01_02 EntityWithSimpleProperties [Tags] be-create 5_6_7 - building-simple-attributes-sample.jsonld + building-simple-attributes.jsonld 003_01_03 EntityWithSimpleRelationships [Tags] be-create 5_6_7 - building-relationship-sample.jsonld + building-relationship.jsonld 003_01_04 EntityWithRelationshipsProperties [Tags] be-create 5_6_7 - building-relationship-of-property-sample.jsonld + building-relationship-of-property.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot index a9362c81..e020a37a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot @@ -23,9 +23,9 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} Set Suite Variable ${second_entity_id} # TODO: Use Load Test Sample keyword instead - ${first_entity}= Load Entity building-minimal-sample.jsonld ${first_entity_id} - ${second_entity}= Load Entity building-minimal-sample.jsonld ${second_entity_id} - ${already_existing_entity}= Load Entity building-minimal-sample.jsonld ${existing_entity_id} + ${first_entity}= Load Entity building-minimal.jsonld ${first_entity_id} + ${second_entity}= Load Entity building-minimal.jsonld ${second_entity_id} + ${already_existing_entity}= Load Entity building-minimal.jsonld ${existing_entity_id} @{entities_to_be_created}= Create List ${first_entity} ${second_entity} ${already_existing_entity} ${response}= Batch Create Entities @{entities_to_be_created} @{expected_successful_entities_ids}= Create List ${first_entity_id} ${second_entity_id} @@ -48,7 +48,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Keywords *** Setup Initial Entity ${existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-minimal-sample.jsonld ${existing_entity_id} + Create Entity building-minimal.jsonld ${existing_entity_id} Set Suite Variable ${existing_entity_id} Delete Initial Entities diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_03.robot index dfa686db..749cfeec 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_03.robot @@ -10,10 +10,10 @@ Test Template Create Batch Entity With Invalid Request Scenarios *** Test Cases *** FILENAME PROBLEM_TYPE 003_03_01 InvalidJson [Tags] be-create 5_6_7 - batch/invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + batch/invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 003_03_02 EmptyJson [Tags] be-create 5_6_7 - batch/empty-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + batch/empty.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot index 996b2fd1..a4b2d342 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot @@ -20,7 +20,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities ... @{entities_to_be_created} @@ -42,7 +42,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities ... @{entities_to_be_created} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot index a449532b..06856300 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot @@ -20,7 +20,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_JSON} Check Response Status Code 201 ${response.status_code} @@ -37,7 +37,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_JSON} Check Response Status Code 201 ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_06.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_06.robot index ca78572c..5db49f72 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_06.robot @@ -15,7 +15,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Documentation] Check that an HTTP error response of type BadRequestData is raised if the Content-Type header is "application/json" and the request payload body (as JSON) contains a "@context" term [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} - ${entity}= Load Entity building-simple-attributes-sample.jsonld ${entity_id} + ${entity}= Load Entity building-simple-attributes.jsonld ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_JSON} Check Response Status Code 400 ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot index f88f8734..cad4ec73 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot @@ -19,7 +19,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.jsonld ${entity_id} + ${entity}= Load Entity building-simple-attributes.jsonld ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_LD_JSON} Check Response Status Code 201 ${response.status_code} @@ -36,7 +36,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.jsonld ${entity_id} + ${entity}= Load Entity building-simple-attributes.jsonld ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_LD_JSON} Check Response Status Code 201 ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_08.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_08.robot index b2ed5447..c3570080 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_08.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_08.robot @@ -15,7 +15,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Documentation] Check that an HTTP error response of type BadRequestData is raised if the Content-Type header is "application/ld+json" and the request payload body does not contain a @context term [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_LD_JSON} Check Response Status Code 400 ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_09.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_09.robot index 18e49296..0df87313 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_09.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_09.robot @@ -15,7 +15,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Documentation] Check that an HTTP error response of type BadRequestData is raised if the Content-Type header is "application/ld+json" and a JSON-LD Link header is present in the incoming HTTP request [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} - ${entity}= Load Entity building-simple-attributes-sample.jsonld ${entity_id} + ${entity}= Load Entity building-simple-attributes.jsonld ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities ... @{entities_to_be_created} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_10.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_10.robot index 72ffd6d8..e5db1c5a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_10.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_10.robot @@ -21,8 +21,8 @@ ${building_id_prefix}= urn:ngsi-ld:Building: Set Suite Variable ${first_entity_id} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} Set Suite Variable ${second_entity_id} - ${first_entity}= Load Entity building-minimal-sample.jsonld ${first_entity_id} - ${second_entity}= Load Entity building-minimal-sample.jsonld ${second_entity_id} + ${first_entity}= Load Entity building-minimal.jsonld ${first_entity_id} + ${second_entity}= Load Entity building-minimal.jsonld ${second_entity_id} @{entities_to_be_created}= Create List ${first_entity} ${second_entity} ${first_entity} ${response}= Batch Create Entities @{entities_to_be_created} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot index 0858a198..6d05117a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot @@ -32,7 +32,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-simple-attributes-sample.jsonld ${first_entity_id} - Create Entity building-simple-attributes-sample.jsonld ${second_entity_id} + Create Entity building-simple-attributes.jsonld ${first_entity_id} + Create Entity building-simple-attributes.jsonld ${second_entity_id} @{entities_ids_to_be_deleted}= Create List ${first_entity_id} ${second_entity_id} Set Test Variable ${entities_ids_to_be_deleted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot index a7a21efb..0c8b151d 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot @@ -42,5 +42,5 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Keywords *** Setup Initial Entity ${existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-simple-attributes-sample.jsonld ${existing_entity_id} + Create Entity building-simple-attributes.jsonld ${existing_entity_id} Set Test Variable ${existing_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_03.robot index 365d4757..ff22f729 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_03.robot @@ -10,10 +10,10 @@ Test Template Batch Delete Entity With Invalid Request Scenarios *** Test Cases *** FILENAME PROBLEM_TYPE 006_03_01 InvalidJson [Tags] be-delete 5_6_10 - batch/invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + batch/invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 006_03_02 EmptyJson [Tags] be-delete 5_6_10 - batch/empty-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + batch/empty.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_04.robot index 6bc4a30d..d66997d8 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_04.robot @@ -34,5 +34,5 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Keywords *** Setup Initial Entity ${entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-simple-attributes-sample.jsonld ${entity_id} + Create Entity building-simple-attributes.jsonld ${entity_id} Set Test Variable ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot index 96a32044..b6131517 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -13,19 +13,19 @@ Test Template Batch Update Entity Scenarios *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_payload_filename}= building-simple-attributes-sample.jsonld +${entity_payload_filename}= building-simple-attributes.jsonld *** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME 005_01_01 EntityWithSimpleProperties [Tags] be-update 5_6_9 - building-simple-attributes-sample.jsonld fragmentEntities/empty-fragment.json + building-simple-attributes.jsonld fragmentEntities/empty-fragment.json 005_01_02 EntityWithSimpleRelationships [Tags] be-update 5_6_9 - building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json + building-relationship.jsonld fragmentEntities/locatedAt-fragment.json 005_01_03 EntityWithRelationshipsProperties [Tags] be-update 5_6_9 - building-relationship-of-property-sample.jsonld fragmentEntities/airQualityLevel-with-relationship-fragment.json + building-relationship-of-property.jsonld fragmentEntities/airQualityLevel-with-relationship-fragment.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot index 46ae55f4..448862d6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -13,19 +13,19 @@ Test Template Batch Update Entity With NoOverwrite Option Scenarios *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_payload_filename}= building-simple-attributes-sample.jsonld +${entity_payload_filename}= building-simple-attributes.jsonld *** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME EXPECTED_STATUS 005_02_01 EntityWithExistingAttributes [Tags] be-update 5_6_9 - building-simple-attributes-sample.jsonld fragmentEntities/empty-fragment.json 204 + building-simple-attributes.jsonld fragmentEntities/empty-fragment.json 204 005_02_02 EntityWithNewAttribute [Tags] be-update 5_6_9 - building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json 204 + building-relationship.jsonld fragmentEntities/locatedAt-fragment.json 204 005_02_03 EntityWithNewAndExistingAttribute [Tags] be-update 5_6_9 - building-location-attribute-sample.jsonld fragmentEntities/location-fragment.json 204 + building-location-attribute.jsonld fragmentEntities/location-fragment.json 204 *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot index 02fe8b83..a3ec663c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Initial Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_payload_filename}= building-simple-attributes-sample.jsonld +${entity_payload_filename}= building-simple-attributes.jsonld ${update_fragment_filename}= fragmentEntities/simple-attributes-relationship-of-property-fragment.json @@ -21,13 +21,13 @@ ${update_fragment_filename}= fragmentEntities/simple-attributes-relationship- [Documentation] Check that one can update a batch of non-existing and existing entities [Tags] be-update 5_6_9 ${first_existing_entity}= Load Entity - ... building-relationship-of-property-sample.jsonld + ... building-relationship-of-property.jsonld ... ${first_existing_entity_id} ${second_existing_entity}= Load Entity - ... building-relationship-of-property-sample.jsonld + ... building-relationship-of-property.jsonld ... ${second_existing_entity_id} ${new_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${new_entity}= Load Entity building-relationship-of-property-sample.jsonld ${new_entity_id} + ${new_entity}= Load Entity building-relationship-of-property.jsonld ${new_entity_id} @{entities_to_be_updated}= Create List ${first_existing_entity} ${second_existing_entity} ${new_entity} ${response}= Batch Update Entities @{entities_to_be_updated} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_04.robot index 8a183135..dda91ad5 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_04.robot @@ -10,10 +10,10 @@ Test Template Batch Update Entity With Invalid Request Scenarios *** Test Cases *** FILENAME PROBLEM_TYPE 005_04_01 InvalidJson [Tags] be-update 5_6_9 - batch/invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + batch/invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 005_04_02 InvalidJsonLd [Tags] be-update 5_6_9 - batch/invalid-json-ld-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + batch/invalid-json-ld.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot index f3605ba9..291a8289 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot @@ -17,13 +17,13 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME 004_01_01 EntityWithSimpleProperties [Tags] be-upsert 5_6_8 - building-simple-attributes-sample.jsonld + building-simple-attributes.jsonld 004_01_02 EntityWithSimpleRelationships [Tags] be-upsert 5_6_8 - building-relationship-sample.jsonld + building-relationship.jsonld 004_01_03 EntityWithRelationshipsProperties [Tags] be-upsert 5_6_8 - building-relationship-of-property-sample.jsonld + building-relationship-of-property.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot index ca888974..7cfbccff 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot @@ -17,13 +17,13 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME 004_02_01 EntityWithSimpleProperties [Tags] be-upsert 5_6_8 - building-simple-attributes-sample.jsonld + building-simple-attributes.jsonld 004_02_02 EntityWithSimpleRelationships [Tags] be-upsert 5_6_8 - building-relationship-sample.jsonld + building-relationship.jsonld 004_02_03 EntityWithRelationshipsProperties [Tags] be-upsert 5_6_8 - building-relationship-of-property-sample.jsonld + building-relationship-of-property.jsonld *** Keywords *** @@ -51,8 +51,8 @@ Setup Initial Entities [Arguments] ${filename} ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-minimal-sample.jsonld ${first_existing_entity_id} - Create Entity building-minimal-sample.jsonld ${second_existing_entity_id} + Create Entity building-minimal.jsonld ${first_existing_entity_id} + Create Entity building-minimal.jsonld ${second_existing_entity_id} Set Test Variable ${first_existing_entity_id} Set Test Variable ${second_existing_entity_id} ${new_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot index 78c6d316..00887ad2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -18,13 +18,13 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME 004_03_01 EntityWithSimpleProperties [Tags] be-upsert 5_6_8 - building-simple-attributes-sample.jsonld + building-simple-attributes.jsonld 004_03_02 EntityWithSimpleRelationships [Tags] be-upsert 5_6_8 - building-relationship-sample.jsonld + building-relationship.jsonld 004_03_03 EntityWithRelationshipsProperties [Tags] be-upsert 5_6_8 - building-relationship-of-property-sample.jsonld + building-relationship-of-property.jsonld *** Keywords *** @@ -48,8 +48,8 @@ Batch Upsert Existing Entities Scenarios Setup Initial Entities ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-minimal-sample.jsonld ${first_existing_entity_id} - Create Entity building-minimal-sample.jsonld ${second_existing_entity_id} + Create Entity building-minimal.jsonld ${first_existing_entity_id} + Create Entity building-minimal.jsonld ${second_existing_entity_id} Set Test Variable ${first_existing_entity_id} Set Test Variable ${second_existing_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot index 0776bdd7..02e317f7 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot @@ -13,19 +13,19 @@ Test Template Batch Upsert Entities With Update Option Scenarios *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${existing_entity_payload_filename}= building-minimal-sample.jsonld +${existing_entity_payload_filename}= building-minimal.jsonld *** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME 004_04_01 EntityWithSimpleProperties [Tags] be-upsert 5_6_8 - building-simple-attributes-sample.jsonld fragmentEntities/simple-attributes-fragment.json + building-simple-attributes.jsonld fragmentEntities/simple-attributes-fragment.json 004_04_02 EntityWithSimpleRelationships [Tags] be-upsert 5_6_8 - building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json + building-relationship.jsonld fragmentEntities/locatedAt-fragment.json 004_04_03 EntityWithRelationshipsProperties [Tags] be-upsert 5_6_8 - building-relationship-of-property-sample.jsonld fragmentEntities/simple-attributes-relationship-of-property-fragment.json + building-relationship-of-property.jsonld fragmentEntities/simple-attributes-relationship-of-property-fragment.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot index 9d38256b..d0cc445c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot @@ -20,9 +20,9 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} ${third_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${first_entity}= Load Entity building-minimal-sample.jsonld ${first_entity_id} - ${second_entity}= Load Entity building-minimal-sample.jsonld ${second_entity_id} - ${third_entity}= Load Entity building-minimal-sample.jsonld ${third_entity_id} + ${first_entity}= Load Entity building-minimal.jsonld ${first_entity_id} + ${second_entity}= Load Entity building-minimal.jsonld ${second_entity_id} + ${third_entity}= Load Entity building-minimal.jsonld ${third_entity_id} ${invalid_entity}= Remove Entity Type ${third_entity} @{entities_to_be_upserted}= Create List ${first_entity} ${second_entity} ${invalid_entity} ${response}= Batch Upsert Entities @{entities_to_be_upserted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_06.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_06.robot index 4d8211e6..29cbb283 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_06.robot @@ -10,10 +10,10 @@ Test Template Batch Upsert Entity With Invalid Request Scenarios *** Test Cases *** FILENAME PROBLEM_TYPE 004_06_01 InvalidJson [Tags] be-upsert 5_6_8 - batch/invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + batch/invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 004_06_02 InvalidJsonLd [Tags] be-upsert 5_6_8 - batch/invalid-json-ld-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + batch/invalid-json-ld.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_07.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_07.robot index 943666e9..abd5aad4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_07.robot @@ -19,8 +19,8 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Tags] be-upsert 5_6_8 since_v1.5.1 ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${first_entity}= Load Entity building-minimal-sample.jsonld ${first_entity_id} - ${second_entity}= Load Entity building-minimal-sample.jsonld ${second_entity_id} + ${first_entity}= Load Entity building-minimal.jsonld ${first_entity_id} + ${second_entity}= Load Entity building-minimal.jsonld ${second_entity_id} @{entities_to_be_upserted}= Create List ${first_entity} ${second_entity} ${first_entity} ${response}= Batch Upsert Entities @{entities_to_be_upserted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot index a164793e..3f963fb6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot @@ -17,16 +17,16 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME CONTENT_TYPE 001_01_01 MinimalEntity [Tags] e-create 5_6_1 - building-minimal-sample.json application/json + building-minimal.json application/json 001_01_02 EntityWithSimpleProperties [Tags] e-create 5_6_1 - building-simple-attributes-sample.jsonld application/ld+json + building-simple-attributes.jsonld application/ld+json 001_01_03 EntityWithRelationshipsProperties [Tags] e-create 5_6_1 - building-relationship-of-property-sample.jsonld application/ld+json + building-relationship-of-property.jsonld application/ld+json 001_01_04 EntityWithLocationAttribute [Tags] e-create 5_6_1 - building-location-attribute-sample.jsonld application/ld+json + building-location-attribute.jsonld application/ld+json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot index 03c4f2ef..2878b9a1 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot @@ -10,13 +10,13 @@ Test Template Create Entity With Invalid Request Scenarios *** Test Cases *** FILENAME ERROR_TYPE 001_02_01 InvalidJson [Tags] e-create 5_6_1 - invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 001_02_02 EmptyJson [Tags] e-create 5_6_1 - empty-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + empty.jsonld ${ERROR_TYPE_INVALID_REQUEST} 001_02_03 EntityWithNoContext [Tags] e-create 5_6_1 - building-minimal-sample.json ${ERROR_TYPE_BAD_REQUEST_DATA} + building-minimal.json ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_03.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_03.robot index a87fc5f2..068bdec1 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_03.robot @@ -10,7 +10,7 @@ Suite Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${content_type}= application/ld+json diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot index 8badd392..58f228c6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot index 375fd6aa..4fcab0c4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_06.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_06.robot index 0a6cc028..464cfe76 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_06.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld +${filename}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot index eb74295b..20cb883e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld +${filename}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_08.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_08.robot index 6ec9f5e5..2b44b19f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_08.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_08.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_09.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_09.robot index 13e06ecb..47917f10 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_09.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_09.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld +${filename}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot index a73e3b8a..3cf24a39 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot @@ -17,7 +17,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME CONTENT_TYPE 001_10_01 EntityWithLanguageProperty [Tags] e-create 5_6_1 4_5_18 since_v1.4.1 - building-language-property-sample.jsonld application/ld+json + building-language-property.jsonld application/ld+json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot index 8705306c..b0c1e378 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot @@ -17,7 +17,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Tags] e-delete 5_6_6 ${entity_id}= Generate Random Entity Id ${building_id_prefix} ${response}= Create Entity Selecting Content Type - ... building-simple-attributes-sample.jsonld + ... building-simple-attributes.jsonld ... ${entity_id} ... application/ld+json Check Response Status Code 201 ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot index 1a1c9c92..30a523c2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot @@ -13,16 +13,16 @@ Test Template Append Attributes Without Params *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_FILENAME 010_01_01 Append entity attributes [Tags] ea-append 5_6_3 - 204 vehicle-new-attribute-fragment.jsonld vehicle-speed-appended-expectation.jsonld + 204 vehicle-new-attribute-fragment.jsonld vehicle-speed-appended.jsonld 010_01_02 Append entity attributes with different datasetid [Tags] ea-append 5_6_3 - 204 vehicle-speed-different-datasetid-fragment.jsonld vehicle-speed-different-datasetid-expectation.jsonld + 204 vehicle-speed-different-datasetid-fragment.jsonld vehicle-speed-different-datasetid.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_02.robot index 630a3ff4..dd5c5b63 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_02.robot @@ -12,7 +12,7 @@ Test Template Append Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld ${fragment_filename}= vehicle-attribute-to-add-fragment.jsonld ${status_code}= 400 ${invalid_fragment_filename}= invalid-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot index 17b358e7..ee75aeff 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot @@ -13,14 +13,14 @@ Test Template Append Attributes With Params *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_FILENAME 010_04_01 Append entity attributes and ignore existing multi-attribute instance - 204 vehicle-attribute-to-add-fragment.jsonld vehicle-speed-appended-expectation.jsonld + 204 vehicle-attribute-to-add-fragment.jsonld vehicle-speed-appended.jsonld 010_04_02 Append entity attributes with a new multi-attribute instance - 204 vehicle-speed-different-datasetid-fragment.jsonld vehicle-speed-different-datasetid-expectation.jsonld + 204 vehicle-speed-different-datasetid-fragment.jsonld vehicle-speed-different-datasetid.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_05.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_05.robot index 7aa6734e..48022c6a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_05.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld ${fragment_filename}= vehicle-attribute-to-add-fragment.jsonld ${status_code}= 400 ${invalid_fragment_filename}= invalid-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot index b4e68831..09aa5064 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot @@ -13,13 +13,13 @@ Test Template Append Attributes Without Params *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_FILENAME 010_06_01 Append a LanguageProperty property [Tags] ea-append 5_6_3 4_5_18 since_v1.4.1 - 204 vehicle-new-language-property-fragment.jsonld vehicle-language-property-appended-expectation.jsonld + 204 vehicle-new-language-property-fragment.jsonld vehicle-language-property-appended.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot index 4c2ab4e6..2f2ef05f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot @@ -25,7 +25,7 @@ ${scope_fragment_filename}= one-scope-fragment.json ... ${scope_fragment_filename} ... ${CONTENT_TYPE_JSON} Check Response Status Code 204 ${response.status_code} - ${expectation_filename}= Set Variable building-minimal-with-one-scope-expectation.json + ${expectation_filename}= Set Variable building-minimal-with-one-scope.json ${entity_expectation_payload}= Load Test Sample entities/expectations/${expectation_filename} ${entity_id} ${response}= Retrieve Entity by Id ... ${entity_id} @@ -42,7 +42,7 @@ ${scope_fragment_filename}= one-scope-fragment.json ... ${CONTENT_TYPE_JSON} ... noOverwrite Check Response Status Code 204 ${response.status_code} - ${expectation_filename}= Set Variable building-minimal-with-two-scopes-expectation.json + ${expectation_filename}= Set Variable building-minimal-with-two-scopes.json ${entity_expectation_payload}= Load Test Sample entities/expectations/${expectation_filename} ${entity_id} ${response}= Retrieve Entity by Id ... ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot index bc2b343a..b76b35c4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot @@ -13,17 +13,17 @@ Test Template Delete Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${status_code}= 204 -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld ${attribute_id}= speed *** Test Cases *** DATASETID DELETEALL EXPECTATION_FILENAME 013_01_01 Delete an attribute with the default instance - ${EMPTY} false vehicle-delete-default-speed-expectation.jsonld + ${EMPTY} false vehicle-delete-default-speed.jsonld 013_01_02 Delete an attribute with the datasetId - urn:ngsi-ld:Property:gpsBxyz123-speed false vehicle-delete-datasetid-speed-expectation.jsonld + urn:ngsi-ld:Property:gpsBxyz123-speed false vehicle-delete-datasetid-speed.jsonld 013_01_03 Delete all target attribute instances - ${EMPTY} true vehicle-delete-deleteall-speed-expectation.jsonld + ${EMPTY} true vehicle-delete-deleteall-speed.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_02.robot index 363032da..36b23f39 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_02.robot @@ -12,7 +12,7 @@ Test Template Delete Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld *** Test Cases *** ENTITY_ID ATTRIBUTE_ID EXPECTED_STATUS_CODE diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_03.robot index 2fe08d7e..b1c0448d 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_03.robot @@ -13,7 +13,7 @@ Test Template Delete Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${status_code}= 404 -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld *** Test Cases *** ENTITY_ID ATTRIBUTE_ID DATASETID diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot index df4b17f8..bc4464f0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot @@ -13,7 +13,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= building-minimal-with-one-scope.json -${expectation_filename}= building-minimal-compacted-expectation.json +${expectation_filename}= building-minimal-compacted.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot index 5a0b22a4..214864fb 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot @@ -13,15 +13,15 @@ Test Template Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld ${status_code}= 204 *** Test Cases *** FRAGMENT_FILENAME ATTRIBUTE_ID EXPECTATION_FILENAME 012_01_01 Check that one can partially update an attribute - vehicle-isparked-fragment.jsonld isParked vehicle-isparked-update-expectation.jsonld + vehicle-isparked-fragment.jsonld isParked vehicle-isparked-update.jsonld 012_01_02 Check that one can partially update an attribute by specifying the datasetId - vehicle-speed-equal-datasetid-fragment.jsonld speed vehicle-update-speed-expectation.jsonld + vehicle-speed-equal-datasetid-fragment.jsonld speed vehicle-update-speed.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_02.robot index 11940056..1e7e675a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_02.robot @@ -12,7 +12,7 @@ Test Template Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld ${status_code}= 400 diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot index ade2e05b..c6fbdec3 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot @@ -12,7 +12,7 @@ Test Template Partial Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld ${status_code}= 404 ${default_attr_id}= speed diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot index 91620737..10948bc1 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot @@ -13,14 +13,14 @@ Test Template Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-language-property-sub-property-sample.jsonld +${filename}= building-language-property-sub-property.jsonld ${status_code}= 204 *** Test Cases *** FRAGMENT_FILENAME ATTRIBUTE_ID EXPECTATION_FILENAME 012_04_01 Check that one can partially update a LanguageProperty property [Tags] ea-partial-update 5_6_4 4_5_18 since_v1.4.1 - building-language-property-fragment.jsonld street building-language-property-update-expectation.jsonld + building-language-property-fragment.jsonld street building-language-property-update.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot index f1377d4f..cdc9c053 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot @@ -13,16 +13,16 @@ Test Template Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_RESPONSE_FILENAME EXPECTATION_FILENAME 011_01_01 Check that one can update existing attributes with no datasetId - 204 vehicle-speed-two-datasetid-01-fragment.jsonld ${EMPTY} expectations/vehicle-update-attributes-expectation.jsonld + 204 vehicle-speed-two-datasetid-01-fragment.jsonld ${EMPTY} expectations/vehicle-update-attributes.jsonld 011_01_02 Check that one can update existing attributes with the datasetId - 204 vehicle-speed-two-datasetid-02-fragment.jsonld ${EMPTY} expectations/vehicle-update-datasetid-attributes-expectation.jsonld + 204 vehicle-speed-two-datasetid-02-fragment.jsonld ${EMPTY} expectations/vehicle-update-datasetid-attributes.jsonld 011_01_03 Check that one can update only some attributes while unknown are ignored - 204 vehicle-speed-two-datasetid-03-fragment.jsonld ${EMPTY} expectations/vehicle-multi-attributes-expectation.jsonld + 204 vehicle-speed-two-datasetid-03-fragment.jsonld ${EMPTY} expectations/vehicle-multi-attributes.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_02.robot index 09607dd0..57b5ba0c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_02.robot @@ -37,7 +37,7 @@ Initialize Environment ${entity_id}= Generate Random Entity Id ${vehicle_id_prefix} Set Test Variable ${entity_id} ${response}= Create Entity Selecting Content Type - ... vehicle-two-datasetid-attributes-sample.jsonld + ... vehicle-two-datasetid-attributes.jsonld ... ${entity_id} ... ${CONTENT_TYPE_LD_JSON} Check Response Status Code 201 ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_04.robot index cffffe4a..b47bf235 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_04.robot @@ -11,12 +11,12 @@ Test Template Update entity attributes with invalid entity fragments *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld *** Test Cases *** 011_04_01 Update entity attributes with invalid entity fragments - vehicle-speed-two-datasetid-sample.jsonld invalid-fragment.jsonld + vehicle-speed-two-datasetid.jsonld invalid-fragment.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot index becf67af..379ebefe 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot @@ -24,7 +24,7 @@ ${scope_fragment_filename}= one-scope-fragment.json ... ${scope_fragment_filename} ... ${CONTENT_TYPE_JSON} Check Response Status Code 204 ${response.status_code} - ${expectation_filename}= Set Variable building-minimal-with-one-scope-expectation.json + ${expectation_filename}= Set Variable building-minimal-with-one-scope.json ${entity_expectation_payload}= Load Test Sample entities/expectations/${expectation_filename} ${entity_id} ${response}= Retrieve Entity by Id ... ${entity_id} @@ -35,13 +35,13 @@ ${scope_fragment_filename}= one-scope-fragment.json 011_05_02 Update scope to an entity not having a scope [Documentation] Check that scope is not added if entity does not already have a scope [Tags] ea-append 5_6_2 4_18 since_v1.5.1 - [Setup] Create Initial Entity building-minimal-sample.json + [Setup] Create Initial Entity building-minimal.json ${response}= Update Entity Attributes ... ${entity_id} ... ${scope_fragment_filename} ... ${CONTENT_TYPE_JSON} Check Response Status Code 207 ${response.status_code} - ${expectation_filename}= Set Variable building-minimal-compacted-expectation.json + ${expectation_filename}= Set Variable building-minimal-compacted.json ${entity_expectation_payload}= Load Test Sample entities/expectations/${expectation_filename} ${entity_id} ${response}= Retrieve Entity by Id ... ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot index 6f17ab1e..992609da 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot @@ -16,9 +16,9 @@ ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: *** Test Cases *** FILENAME EXPECTATION_FILENAME CONTENT_TYPE 007_01_01 Create a temporal representation of an entity - vehicle-create-temporal-representation-sample.jsonld vehicle-temporal-representation-create-expectation.jsonld application/ld+json + vehicle-create-temporal-representation.jsonld vehicle-temporal-representation-create.jsonld application/ld+json 007_01_02 Create a temporal entity with no context - vehicle-create-temporal-representation-without-context-sample.jsonld vehicle-temporal-representation-create-with-no-context-expectation.jsonld application/json + vehicle-create-temporal-representation-without-context.jsonld vehicle-temporal-representation-create-with-no-context.jsonld application/json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_02.robot index 1d39a82f..49659f81 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_02.robot @@ -14,9 +14,9 @@ ${status_code}= 400 *** Test Cases *** FILENAME 007_02_01 Create a temporal entity with an invalid json - vehicle-temporal-representation-invalid-json-sample.jsonld + vehicle-temporal-representation-invalid-json.jsonld 007_02_02 Create a temporal entity with an empty json - vehicle-temporal-representation-empty-json-sample.jsonld + vehicle-temporal-representation-empty-json.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_03.robot index 71e721b2..5c4c2bfe 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_03.robot @@ -14,9 +14,9 @@ ${status_code}= 400 *** Test Cases *** ENTITY_ID FILENAME 007_03_01 Create a temporal entity with missing id - ${EMPTY} vehicle-temporal-representation-without-id-sample.jsonld + ${EMPTY} vehicle-temporal-representation-without-id.jsonld 007_03_02 Create a temporal invalid URI - invalidId vehicle-temporal-representation-sample.jsonld + invalidId vehicle-temporal-representation.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot index e2cdf8ba..b101168e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot @@ -11,7 +11,7 @@ Test Setup Create Initial Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot index fe1d96f7..fa779edd 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-create-temporal-representation-sample.jsonld -${update_filename}= vehicle-temporal-representation-update-sample.jsonld -${expectation_filename}= vehicle-temporal-representation-update-expectation.jsonld +${filename}= vehicle-create-temporal-representation.jsonld +${update_filename}= vehicle-temporal-representation-update.jsonld +${expectation_filename}= vehicle-temporal-representation-update.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot index 0a219652..6589ef24 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-representation-fragment.jsonld -${expectation_filename}= vehicle-temporal-representation-added-attribute-expectation.jsonld +${expectation_filename}= vehicle-temporal-representation-added-attribute.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_02.robot index bd73ea21..5e5700f0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_02.robot @@ -10,7 +10,7 @@ Test Template Add Attribute To Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 400 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_03.robot index f667654f..2187cc5b 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_03.robot @@ -10,7 +10,7 @@ Suite Teardown Delete Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 404 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_04.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_04.robot index d525d4c6..6fd35e7d 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_04.robot @@ -11,7 +11,7 @@ Test Template Add an Attribute To a Temporal Entity From File *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 400 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot index e2da4a97..2f5a6f8d 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot @@ -13,18 +13,18 @@ Test Template Delete Attribute From A Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${status_code}= 204 ${attribute_id}= fuelLevel *** Test Cases *** DELETE_ALL DATASET_ID EXPECTATION_FILE 015_01_01 Delete an attribute from a temporal representation of an entity without deleteAll/datasetId - false ${EMPTY} vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld + false ${EMPTY} vehicle-temporal-representation-delete-fuelLevel.jsonld 015_01_02 Delete an attribute from a temporal representation of an entity with datasetId - false urn:ngsi-ld:Vehicle:12345-fuel vehicle-temporal-representation-delete-fuelLevel-datasetid-expectation.jsonld + false urn:ngsi-ld:Vehicle:12345-fuel vehicle-temporal-representation-delete-fuelLevel-datasetid.jsonld 015_01_03 Delete an attribute from a temporal representation of an entity with deleteAll - true ${EMPTY} vehicle-temporal-representation-deleteall-fuelLevel-expectation.jsonld + true ${EMPTY} vehicle-temporal-representation-deleteall-fuelLevel.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_02.robot index fe31762b..861752c0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_02.robot @@ -13,7 +13,7 @@ Test Template Delete attribute from temporal entity with unknow entity/att *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${status_code}= 400 -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld *** Test Cases *** ENTITY_ID ATTRIBUTE_ID diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_03.robot index 0353c87a..493bdae7 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_03.robot @@ -12,7 +12,7 @@ Test Template Delete An Attribute *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${status_code}= 404 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot index 252acc57..9e5ae435 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${attributeId}= speed -${expectation_filename}= vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld +${expectation_filename}= vehicle-temporal-representation-delete-speed-instanceid.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_02.robot index 7f0eb277..98adc7bc 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_02.robot @@ -13,7 +13,7 @@ Test Template Delete attribute instance *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${status_code}= 400 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_03.robot index 0f7bd6bc..e13b6997 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_03.robot @@ -13,7 +13,7 @@ Test Template Delete An Attribute Instance *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${status_code}= 404 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot index d968821a..5ef3b9d7 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Intitial Temporal Representation Of Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-modify-attribute-instance-fragment.jsonld -${expectation_filename}= vehicle-temporal-representation-modify-attribute-instance-expectation.jsonld +${expectation_filename}= vehicle-temporal-representation-modify-attribute-instance.jsonld ${attributeId}= speed diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_02.robot index 7191c02d..b65a5f4b 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_02.robot @@ -13,7 +13,7 @@ Test Template Modify Attribute Instance Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-modify-attribute-instance-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_03.robot index 47a08510..c06abba6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_03.robot @@ -13,7 +13,7 @@ Test Template Modify Attribute Instance Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-modify-attribute-instance-fragment.jsonld ${status_code}= 404 diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot index 1ff8fec9..8c618ad7 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot @@ -10,8 +10,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_expectation_file_path}= subscriptions/expectations/subscription-028-01-expectation.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_expectation_file_path}= subscriptions/expectations/subscription-028-01.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_02.robot index ccfac130..f4dc443e 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_02.robot @@ -9,9 +9,9 @@ Test Template Create Subscription With Invalid Request *** Test Cases *** FILENAME EXPECTED_STATUS 028_02_01 InvalidJson - subscription-invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + subscription-invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 028_02_02 EmptyJson - subscription-empty-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + subscription-empty.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_03.robot index 1685c588..fff953cf 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_03.robot @@ -10,7 +10,7 @@ Test Template Create Subscription With Invalid/Empty Id *** Variables *** -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld *** Test Cases *** ID diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot index f5b0dd6f..e97dab27 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot @@ -10,7 +10,7 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_05.robot index b11792e1..1a4b19ad 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_05.robot @@ -9,9 +9,9 @@ Test Template Create Subscription With Invalid Throttling *** Test Cases *** FILENAME EXPECTED_STATUS 028_05_01 ThrottlingAndTimeIntervalConjunction - subscription-invalid-throttling-timeInterval-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + subscription-invalid-throttling-timeInterval.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} 028_05_02 NegativeThrottling - subscription-invalid-negative-throttling-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + subscription-invalid-negative-throttling.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot index 5747e0b5..b722147e 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot @@ -10,7 +10,7 @@ Suite Setup Setup Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot index d504b783..951a9af1 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= subscriptions/subscription-watchedAttributes-sample.jsonld -${third_subscription_payload_file_path}= subscriptions/subscription-inactive-sample.jsonld -${expectation_file_path}= subscriptions/expectations/subscriptions-031-01-expectation.json +${first_subscription_payload_file_path}= subscriptions/subscription.jsonld +${second_subscription_payload_file_path}= subscriptions/subscription-watchedAttributes.jsonld +${third_subscription_payload_file_path}= subscriptions/subscription-inactive.jsonld +${expectation_file_path}= subscriptions/expectations/subscriptions-031-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot index c3ca806b..c47ff54e 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot @@ -12,9 +12,9 @@ Test Template Query Subscriptions With Limit And Page Parameters *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= subscriptions/subscription-watchedAttributes-sample.jsonld -${third_subscription_payload_file_path}= subscriptions/subscription-inactive-sample.jsonld +${first_subscription_payload_file_path}= subscriptions/subscription.jsonld +${second_subscription_payload_file_path}= subscriptions/subscription-watchedAttributes.jsonld +${third_subscription_payload_file_path}= subscriptions/subscription-inactive.jsonld *** Test Cases *** LIMIT OFFSET EXPECTED_SUBSCRIPTION_NUMBER PREV_LINK NEXT_LINK diff --git a/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot index cfc21f76..eb5a0f06 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${expectation_file_path}= subscriptions/expectations/subscriptions-030-03-expectation.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${expectation_file_path}= subscriptions/expectations/subscriptions-030-03.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot index aebf2830..551c9b53 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot index 9fb9e494..17c2b290 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot @@ -13,10 +13,10 @@ Suite Teardown After Test *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-timeInterval-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription-timeInterval.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot index b8cb874b..8af324ed 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-default.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot index 3e487caf..f0dfe331 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active-watchedAttributes.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot index b698a8c2..4469d6d8 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active-watchedAttributes-query.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot index cbba2962..c639080c 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot @@ -19,7 +19,7 @@ ${subscription_payload_file_path_notificationAttributes} subscriptions/subscr ${subscription_payload_file_path_default_context} subscriptions/subscription-building-entities-active-default-context.jsonld ${building_id_prefix} urn:ngsi-ld:Building: ${notification_server_send_url} http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${date_format} %Y-%m-%dT%H:%M:%SZ ${date_format_with_millis} %Y-%m-%dT%H:%M:%S.%fZ diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot index 3e685e62..97cef1d4 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot @@ -18,7 +18,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot index 359b126c..cb2d52d5 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-active-endpoint-info.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${notification_server_send_url} http://${notification_server_host}:${notification_server_port}/notify diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot index 31866d31..949505b6 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-default.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${notification_server_send_url} http://${notification_server_host}:${notification_server_port}/notify ${expected_header_links} <${ngsild_test_suite_context}>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot index f8b2d391..62243232 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify ${date_format}= %Y-%m-%dT%H:%M:%SZ diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot index bacdb570..042de6f8 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot index ccc6ef86..5206713c 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot @@ -16,7 +16,7 @@ Suite Teardown After Test ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot index b5258eb6..d560564f 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-accept-jsonld.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${notification_server_send_url} http://${notification_server_host}:${notification_server_port}/notify diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot index c1661f98..f2101bf5 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot @@ -13,10 +13,10 @@ Suite Teardown After Test *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-valid-throttling-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription-valid-throttling.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_01.robot index 1fc0f388..85fae0e6 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_01.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-type-selection.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${content_type}= application/ld+json diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_02.robot index b07e3496..3a714ec4 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_02.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-type-selection.jsonld ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_vehicle_filepath}= vehicle-simple-attributes-sample.jsonld +${entity_vehicle_filepath}= vehicle-simple-attributes.jsonld ${content_type}= application/ld+json diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_01.robot index a31ea8f0..dcd45c14 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_01.robot @@ -9,7 +9,7 @@ Test Template Update Subscription With Non present Or Invalid Id *** Variables *** -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update-sample.json +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update.json *** Test Cases *** ID EXPECTED_STATUS_CODE PROBLEM_TYPE diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_02.robot index f28c640a..3c6103a9 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update-sample.json +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot index f21ab5f0..d0995890 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-invalid-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-invalid-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot index 2d8d7a0e..e630322f 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-null-properties-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-null-properties-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot index 9bc578ad..19d4abda 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-vehicle-entities-sample.json -${expected_subscription_payload_file_path}= subscriptions/expectations/subscription-vehicle-sample.jsonld -${expected_expanded_subscription_payload_file_path}= subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-vehicle-entities.json +${expected_subscription_payload_file_path}= subscriptions/expectations/subscription-vehicle.jsonld +${expected_expanded_subscription_payload_file_path}= subscriptions/expectations/subscription-vehicle-expanded-types.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot index 6eb12e05..b242da79 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot index a465f452..753469e1 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot @@ -12,13 +12,13 @@ Test Template Activate Paused Subscription With isActive Member *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-inactive-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription-inactive.jsonld *** Test Cases *** SUBSCRIPTION_UPDATE_FRAGMENT_FILE_PATH 029_07_01 ActiveTrue [Tags] sub-update 5_8_2 - subscriptions/fragments/subscription-isActive-true-update-sample.json + subscriptions/fragments/subscription-isActive-true-update.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot index 2535a2b5..89f3f6d5 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot @@ -12,13 +12,13 @@ Test Template Activate Paused Subscription With isActive And ExpiresAt Mem *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-inactive-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription-inactive.jsonld *** Test Cases *** SUBSCRIPTION_UPDATE_FRAGMENT_FILE_PATH 029_08_01 ActiveTrueExpiresAt [Tags] sub-update 5_8_2 - subscriptions/fragments/subscription-isActive-expiresAt-update-sample.json + subscriptions/fragments/subscription-isActive-expiresAt-update.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot index 11d68bd4..19724204 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-isActive-false-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-isActive-false-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot index 3f666970..f9dfa7e0 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix} urn:ngsi-ld:Subscription: -${subscription_payload_file_path} subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path} subscriptions/fragments/subscription-expiresAt-future-update-sample.json +${subscription_payload_file_path} subscriptions/subscription.jsonld +${subscription_update_fragment_file_path} subscriptions/fragments/subscription-expiresAt-future-update.json *** Test Cases *** @@ -23,7 +23,7 @@ ${subscription_update_fragment_file_path} subscriptions/fragments/subscrip ${now}= Get Current Date time_zone=UTC ${in_5_seconds}= Add Time To Date ${now} 5s result_format=%Y-%m-%dT%H:%M:%SZ ${update_template_fragment}= Load JSON From File - ... ${EXECDIR}/data/subscriptions/fragments/subscription-expiresAt-update-sample.json + ... ${EXECDIR}/data/subscriptions/fragments/subscription-expiresAt-update.json ${update_fragment}= Update Value To JSON ${update_template_fragment} $..expiresAt ${in_5_seconds} ${update_response}= Update Subscription With Payload ... ${subscription_id} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot index f2c348a7..9da11c1a 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-expiresAt-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-expiresAt-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_01.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_01.robot index 127e8d0d..87f860ae 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_01.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_01.robot @@ -13,17 +13,17 @@ Test Template Query A Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld +${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld *** Test Cases *** QUERY_PARAM_NAME QUERY_PARAM_VALUE EXPECTATION_FILE_PATH EXPECTED_CONTEXT_SOURCE_REGISTRATION_IDS 037_01_01 With list of entity types [Tags] csr-query 5_10_2 - type Building csourceRegistrations/expectations/context-source-registrations-037-01-expectation.json ${second_context_source_registration_id} + type Building csourceRegistrations/expectations/context-source-registrations-037-01.json ${second_context_source_registration_id} 037_01_02 With list of attribute names [Tags] csr-query 5_10_2 - attrs name csourceRegistrations/expectations/context-source-registrations-037-01-expectation.json ${second_context_source_registration_id} + attrs name csourceRegistrations/expectations/context-source-registrations-037-01.json ${second_context_source_registration_id} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_04.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_04.robot index ae46d96f..5480d5ef 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_04.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_04.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Created Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld -${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-04-expectation.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld +${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-04.json ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_05.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_05.robot index 41350779..d4a28f03 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_05.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_05.robot @@ -17,10 +17,10 @@ ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistr *** Test Cases *** REGISTRATION_FILE_PATH EXPECTATION_FILE_PATH 037_05_01 Registration With EntityInfo Matching The Query [Tags] csr-query 5_10_2 - csourceRegistrations/context-source-registration-sample.jsonld csourceRegistrations/expectations/context-source-registrations-037-05-01-expectation.json + csourceRegistrations/context-source-registration.jsonld csourceRegistrations/expectations/context-source-registrations-037-05-01.json 037_05_02 Registration Without EntityInfo [Tags] csr-query 5_10_2 - csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld csourceRegistrations/expectations/context-source-registrations-037-05-02-expectation.json + csourceRegistrations/context-source-registration-with-only-properties-information.jsonld csourceRegistrations/expectations/context-source-registrations-037-05-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_06.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_06.robot index bbfb96a5..24bb0d04 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_06.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_06.robot @@ -13,16 +13,16 @@ Test Template Query Context Source Registration Matching Properties And Re *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld *** Test Cases *** ATTRS_VALUE EXPECTATION_FILE_PATH 037_06_01 Query With Matching Properties And Relationships [Tags] csr-query 5_10_2 - name,locatedAt csourceRegistrations/expectations/context-source-registrations-037-06-expectation.json + name,locatedAt csourceRegistrations/expectations/context-source-registrations-037-06.json 037_06_02 Query Without Properties And Relationships [Tags] csr-query 5_10_2 - ${EMPTY} csourceRegistrations/expectations/context-source-registrations-037-06-expectation.json + ${EMPTY} csourceRegistrations/expectations/context-source-registrations-037-06.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_07.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_07.robot index 36c4ed73..d4b2dc6d 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_07.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_07.robot @@ -13,8 +13,8 @@ Test Template Query Context Source Registration Matching Geoquery *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location-sample.jsonld -${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-07-expectation.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location.jsonld +${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-07.json *** Test Cases *** GEOREL GEOMETRY COORDINATES GEOPROPERTY EXPECTATION_FILE_PATH diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_08.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_08.robot index 5b3d80dc..cfdafbad 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_08.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_08.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Created Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-08-expectation.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-08.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot index b7fc4a6c..ac7fb10c 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot @@ -12,10 +12,10 @@ Test Template Query Context Source Registration Matching Temporal Query *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_observation_interval_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval-sample.jsonld -${context_source_registration_management_interval_payload_file_path}= csourceRegistrations/context-source-registration-managementInterval-sample.jsonld -${observation_interval_expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-09-01-expectation.json -${management_interval_expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-09-02-expectation.json +${context_source_registration_observation_interval_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval.jsonld +${context_source_registration_management_interval_payload_file_path}= csourceRegistrations/context-source-registration-managementInterval.jsonld +${observation_interval_expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-09-01.json +${management_interval_expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-09-02.json *** Test Cases *** PAYLOAD_FILE_PATH TIMEPROPERTY EXPECTATION_FILE_PATH diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_10.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_10.robot index b11664f4..3dd5c7a7 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_10.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_10.robot @@ -13,18 +13,18 @@ Test Template Query Context Source Registration With Query Params *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld -${third_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-csourceProperty-sample.jsonld +${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld +${third_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-csourceProperty.jsonld *** Test Cases *** QUERY_PARAM_NAME QUERY_PARAM_VALUE EXPECTATION_FILE_PATH EXPECTED_CONTEXT_SOURCE_REGISTRATION_IDS 037_10_01 With list of Entity Ids [Tags] csr-query 5_10_2 - id ${first_context_source_registration_id},${third_context_source_registration_id} csourceRegistrations/expectations/context-source-registrations-037-10-01-expectation.json ${first_context_source_registration_id},${third_context_source_registration_id} + id ${first_context_source_registration_id},${third_context_source_registration_id} csourceRegistrations/expectations/context-source-registrations-037-10-01.json ${first_context_source_registration_id},${third_context_source_registration_id} 037_10_02 With NGSI-LD Query [Tags] csr-query 5_10_2 - q csourceProperty1=="aValue" csourceRegistrations/expectations/context-source-registrations-037-10-02-expectation.json ${third_context_source_registration_id} + q csourceProperty1=="aValue" csourceRegistrations/expectations/context-source-registrations-037-10-02.json ${third_context_source_registration_id} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot index f6825c2f..9ca52ee7 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot @@ -13,9 +13,9 @@ Test Template Query Context Source Registration With Limit And Offset Para *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location-sample.jsonld -${third_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld +${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location.jsonld +${third_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld *** Test Cases *** LIMIT OFFSET EXPECTED_NUMBER PREV_LINK NEXT_LINK diff --git a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_03.robot b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_03.robot index 370ad599..c09a666b 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_03.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_03.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Created Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld ${expectation_file_path}= csourceRegistrations/expectations/context-source-registration-expanded-format.json diff --git a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_04.robot b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_04.robot index f01cb838..907fbf32 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_04.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_04.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Created Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld ${expectation_file_path}= csourceRegistrations/expectations/context-source-registration.json diff --git a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_05.robot b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_05.robot index 4a0d3d3f..33598809 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_05.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_05.robot @@ -13,7 +13,7 @@ Test Template Review JSON-LD resolution when retrieving a context source r *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld ${expectation_file_path_compacted}= csourceRegistrations/expectations/context-source-registration.json ${expectation_file_path_expanded}= csourceRegistrations/expectations/context-source-registration-expanded-format.json diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot index 70138310..3ec96238 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot @@ -9,7 +9,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= context-source-registration-sample.jsonld +${registration_payload_file_path}= context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot index 0d7e55de..fef11c19 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot @@ -12,7 +12,7 @@ Test Template Delete A Context Source *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld +${filename}= context-source-registration.jsonld *** Test Cases *** INVALID_REGISTRATION_ID EXPECTED_STATUS_CODE PROBLEM_TYPE diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot index 15682aec..444f867b 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= context-source-registration-simple-sample.jsonld +${registration_payload_file_path}= context-source-registration-simple.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot index 773841e1..ac196405 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-with-expiration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-with-expiration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot index 2c741fa5..236dc7e6 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot index 3008ec2b..55d7e793 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-no-id-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-no-id.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_02.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_02.robot index 1e8063d3..b68aee12 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_02.robot @@ -9,7 +9,7 @@ Library OperatingSystem *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-invalid-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-invalid.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_03.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_03.robot index 904cbe09..cc2b14de 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_03.robot @@ -11,7 +11,7 @@ Test Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= csourceRegistrations/context-source-registration-sample.jsonld +${filename}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot index 9a4bb29d..57019f01 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.json +${registration_payload_file_path}= csourceRegistrations/context-source-registration.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot index 31efe47e..a53ca256 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.json +${registration_payload_file_path}= csourceRegistrations/context-source-registration.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_06.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_06.robot index 8247cb99..660538a5 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_06.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_06.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot index 3010951f..74754b15 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_08.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_08.robot index bcd08070..e1fda055 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_08.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_08.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.json +${registration_payload_file_path}= csourceRegistrations/context-source-registration.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_09.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_09.robot index cc17f1d9..e7c14fc0 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_09.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_09.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_10.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_10.robot index 42595a5f..280fb4dd 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_10.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_10.robot @@ -14,9 +14,9 @@ ${registration_id_prefix}= urn:ngsi-ld:Registration: *** Test Cases *** 033_10_01 Create a context source registration with a different data structure than CSourceRegistration data type - csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld + csourceRegistrations/context-source-registration-invalid-structure.jsonld 033_10_02 Create a context source registration with a date in the past - csourceRegistrations/context-source-registration-past-expiration-sample.jsonld + csourceRegistrations/context-source-registration-past-expiration.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot index 7f2ff3e5..a28c07ef 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot @@ -18,7 +18,7 @@ ${registration_id_prefix}= urn:ngsi-ld:Registration: *** Test Cases *** FILENAME UPDATE_FILENAME 034_01_01 Update a context source registration by id [Tags] csr-update 5_9_3 - context-source-registration-sample.jsonld context-source-registration-update-sample.json + context-source-registration.jsonld context-source-registration-update.json *** Keywords *** @@ -47,7 +47,7 @@ Initialize the Test Case ${registration_id}= Generate Random Entity Id ${registration_id_prefix} Set Test Variable ${registration_id} ${payload}= Load JSON From File - ... ${EXECDIR}/data/csourceRegistrations/context-source-registration-sample.jsonld + ... ${EXECDIR}/data/csourceRegistrations/context-source-registration.jsonld ${registration_payload}= Update Value To JSON ${payload} $..id ${registration_id} Set Test Variable ${registration_payload} ${response}= Create Context Source Registration With Return ${registration_payload} diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot index 78a92552..30f2a85a 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot @@ -12,18 +12,18 @@ Test Template Update A Context Source *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld -${registration_payload_file_path}= context-source-registration-invalid-sample.jsonld +${filename}= context-source-registration.jsonld +${registration_payload_file_path}= context-source-registration-invalid.jsonld ${reason_400}= Bad Request *** Test Cases *** REGISTRATION_ID FRAGMENT_FILENAME EXPECTED_STATUS_CODE PROBLEM_TYPE 034_02_01 Update a context source registration by id if the Id is not a valid URI - invalidURI fragments/context-source-registration-different-type-sample.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} + invalidURI fragments/context-source-registration-different-type.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} 034_02_02 Update a context source registration if the request body is not of the same data type - ${valid_registration_id} fragments/context-source-registration-different-type-sample.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} + ${valid_registration_id} fragments/context-source-registration-different-type.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} 034_02_03 Update a context source registration if one attempts to remove a mandatory property - ${valid_registration_id} context-source-registration-invalid-sample.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} + ${valid_registration_id} context-source-registration-invalid.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot index ead47111..9505f6fa 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld +${filename}= context-source-registration.jsonld ${reason_404}= Not Found diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_04.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_04.robot index aed9efb5..7f71d98d 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_04.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_04.robot @@ -11,8 +11,8 @@ Test Teardown Delete Initial Context Source Registration *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld -${registration_payload_file_path}= context-source-registration-invalid-json-sample.json +${filename}= context-source-registration.jsonld +${registration_payload_file_path}= context-source-registration-invalid-json.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot index efa3fb3e..58a12db0 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot @@ -18,7 +18,7 @@ ${registration_id_prefix}= urn:ngsi-ld:Registration: *** Test Cases *** FILENAME UPDATE_FILENAME 034_05_01 Update a context source registration to never expire [Tags] csr-update 5_9_3 - context-source-registration-with-expiration-sample.jsonld context-source-registration-null-expiresAt.json + context-source-registration-with-expiration.jsonld context-source-registration-null-expiresAt.json *** Keywords *** @@ -46,7 +46,7 @@ Initialize the Test Case ${registration_id}= Generate Random Entity Id ${registration_id_prefix} Set Test Variable ${registration_id} ${payload}= Load JSON From File - ... ${EXECDIR}/data/csourceRegistrations/context-source-registration-sample.jsonld + ... ${EXECDIR}/data/csourceRegistrations/context-source-registration.jsonld ${registration_payload}= Update Value To JSON ${payload} $..id ${registration_id} Set Test Variable ${registration_payload} ${response}= Create Context Source Registration With Return ${registration_payload} diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_06.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_06.robot index 342c6e46..e1383a39 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_06.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_06.robot @@ -12,14 +12,14 @@ Test Template Update A Context Source *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld -${registration_payload_file_path}= context-source-registration-invalid-sample.jsonld +${filename}= context-source-registration.jsonld +${registration_payload_file_path}= context-source-registration-invalid.jsonld ${reason_405}= Method Not Allowed *** Test Cases *** FRAGMENT_FILENAME EXPECTED_STATUS_CODE REASON 034_06_01 Update a context source registration by id if the Id is not present - fragments/context-source-registration-different-type-sample.jsonld 405 ${reason_405} + fragments/context-source-registration-different-type.jsonld 405 ${reason_405} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_01.robot index 2162618c..975027b2 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_01.robot @@ -14,8 +14,8 @@ Suite Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-timeInterval-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-timeInterval.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot index 0c53e859..f78fc709 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot @@ -14,9 +14,9 @@ Test Teardown Delete Created Context Source Registration And Context Sourc *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update-sample.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot index 0b16106d..15a7d3b4 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-building-and-bus-entities.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot index 6584958c..0027d875 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot index dd559ba8..80b87cb4 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld ${notification_expectation_file_path}= notifications/expectations/1-timesSent-ok.json diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_06.robot index 36875da4..bbf31606 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_06.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_06.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-unreachable-endpoint.jsonld ${notification_expectation_file_path}= notifications/expectations/1-timesSent-failed.json diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot index 7f51c728..b6c6fc40 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot @@ -15,17 +15,17 @@ Test Template Do Not Receive cSourceNotification If Subscription Status Is *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** FILEPATH 047_07_01 PausedSubscription [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-isActive-update-sample.json + csourceSubscriptions/fragments/subscription-isActive-update.json 047_07_02 ExpiredSubscription [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-expiresAt-update-sample.json + csourceSubscriptions/fragments/subscription-expiresAt-update.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_08.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_08.robot index bddc4ffa..6d1f29d7 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_08.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_08.robot @@ -14,9 +14,9 @@ Test Teardown Delete Created Context Source Registration And Context Sourc *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update-sample.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_09.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_09.robot index 30de1c0b..26bd68c5 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_09.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_09.robot @@ -14,9 +14,9 @@ Suite Teardown Delete Created Context Source Registration And Context Sourc *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update-information-sample.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update-information.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_10.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_10.robot index edb70308..7c9f33ec 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_10.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_10.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-temporalQ-observedAt.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_11.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_11.robot index 52cbf11f..87e7ebb4 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_11.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_11.robot @@ -16,14 +16,14 @@ Test Template Receive cSourceNotification For Matching Context Source Regi *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-managementInterval-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-managementInterval.jsonld *** Test Cases *** FILEPATH 047_11_01 CreatedAt [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld + csourceSubscriptions/subscription-temporalQ-createdAt.jsonld 047_11_02 ModifiedAt [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld + csourceSubscriptions/subscription-temporalQ-modifiedAt.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_12.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_12.robot index 59d620a2..5d9a494a 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_12.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_12.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_13.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_13.robot index 5a24fab7..7f876e74 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_13.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_13.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_14.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_14.robot index 3ab8c258..5216850b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_14.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_14.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_15.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_15.robot index 792bc9cd..acf83f66 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_15.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_15.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-without-geoproperty.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot index 1b8c0878..2c41c017 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot @@ -15,21 +15,21 @@ Test Template Receive cSourceNotification For Newly Matching Context Sourc *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld -${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-bus-entities-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-vehicle-entities.jsonld +${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-bus-entities.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** FILEPATH NOTIFICATION_CSR_IDS 047_16_01 MatchFirstContextSourceRegistration [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-vehicle-entities-sample.json ${first_context_source_registration_id} + csourceSubscriptions/fragments/subscription-vehicle-entities.json ${first_context_source_registration_id} 047_16_02 MatchSecondContextSourceRegistration [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-bus-entities-sample.json ${second_context_source_registration_id} + csourceSubscriptions/fragments/subscription-bus-entities.json ${second_context_source_registration_id} 047_16_03 MatchBothContextSourceRegistrations [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities-sample.json ${first_context_source_registration_id} ${second_context_source_registration_id} + csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities.json ${first_context_source_registration_id} ${second_context_source_registration_id} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot index a34c68a4..d8e75e0b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot index 6d33309b..48da4ed1 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot @@ -9,7 +9,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld ${subscription_id}= ${EMPTY} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot index 277cf962..9a933e4c 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot index cfc3d652..7f72e686 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-inactive-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-inactive.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot index ea783a83..5a5107a4 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-expiresAt-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-expiresAt.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot index 659c8d65..43232ead 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot index d45c12ef..7e6f8258 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Context Source Registration Subscription *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot index 10e1f080..32b69a6d 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot @@ -16,16 +16,16 @@ ${subscription_payload_file_path}= ${EMPTY} *** Test Cases *** FILEPATH 038_08_01 WithoutNotification [Tags] csrsub-create 5_11_2 - csourceSubscriptions/subscription-without-notification-sample.jsonld + csourceSubscriptions/subscription-without-notification.jsonld 038_08_02 InvalidType [Tags] csrsub-create 5_11_2 - csourceSubscriptions/subscription-invalid-type-sample.jsonld + csourceSubscriptions/subscription-invalid-type.jsonld 038_08_03 InvalidQuery [Tags] csrsub-create 5_11_2 - csourceSubscriptions/subscription-invalid-query-sample.jsonld + csourceSubscriptions/subscription-invalid-query.jsonld 038_08_04 EmptyWatchedAttributes [Tags] csrsub-create 5_11_2 - csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld + csourceSubscriptions/subscription-empty-watchedAttributes.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot index ad3c72eb..dfc61917 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-expired-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-expired.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot index 2fa66e39..78fc824c 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot @@ -10,7 +10,7 @@ Test Setup Setup Initial Context Source Registration Subscription *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot index fd181bac..3cec61b7 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot @@ -11,9 +11,9 @@ Test Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes-sample.jsonld -${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-035-01-expectation.json +${first_subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes.jsonld +${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-035-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot index 9ee802d7..1c2975d9 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot @@ -12,10 +12,10 @@ Test Template Query Context Source Registration Subscriptions With Limit P *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes-sample.jsonld -${third_subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-sample.jsonld -${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-035-01-expectation.json +${first_subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes.jsonld +${third_subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ.jsonld +${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-035-01.json *** Test Cases *** LIMIT EXPECTED_SUBSCRIPTION_NUMBER diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot index bb1db3d5..f304ad56 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot @@ -12,9 +12,9 @@ Test Template Query Context Source Registration Subscriptions With Limit A *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes-sample.jsonld -${third_subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-sample.jsonld +${first_subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes.jsonld +${third_subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ.jsonld *** Test Cases *** LIMIT PAGE EXPECTED_SUBSCRIPTION_NUMBER PREV_LINK NEXT_LINK diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot index fd4f0e45..9bb9e69f 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot @@ -11,8 +11,8 @@ Test Teardown Delete Created Context Source Registration Subscription *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-040-01-expectation.json +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-040-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot index abef36c7..2498f884 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot @@ -11,8 +11,8 @@ Test Teardown Delete Initial Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-sample.json +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot index a0369b61..012d8e02 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** -${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-sample.json +${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot index 889fa4f5..c530e0d1 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** -${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-sample.json +${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot index a6b513e4..3acf6af3 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot @@ -12,16 +12,16 @@ Test Template Update Context Source Registration Subscription With Invalid *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** FILEPATH 039_04_01 InvalidType [Tags] csrsub-update 5_11_3 - csourceSubscriptions/fragments/subscription-update-invalid-type-sample.json + csourceSubscriptions/fragments/subscription-update-invalid-type.json 039_04_02 InvalidNotification [Tags] csrsub-update 5_11_3 - csourceSubscriptions/fragments/subscription-update-invalid-notification-sample.json + csourceSubscriptions/fragments/subscription-update-invalid-notification.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot index 06baea39..10f0799b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot @@ -11,8 +11,8 @@ Test Teardown Delete Initial Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-invalid-json.json *** Test Cases *** diff --git a/data/csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-building-and-bus-entities.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld rename to data/csourceRegistrations/context-source-registration-building-and-bus-entities.jsonld diff --git a/data/csourceRegistrations/context-source-registration-bus-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-bus-entities.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-bus-entities-sample.jsonld rename to data/csourceRegistrations/context-source-registration-bus-entities.jsonld diff --git a/data/csourceRegistrations/context-source-registration-csourceProperty-sample.jsonld b/data/csourceRegistrations/context-source-registration-csourceProperty.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-csourceProperty-sample.jsonld rename to data/csourceRegistrations/context-source-registration-csourceProperty.jsonld diff --git a/data/csourceRegistrations/context-source-registration-detailed-information-sample.jsonld b/data/csourceRegistrations/context-source-registration-detailed-information.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-detailed-information-sample.jsonld rename to data/csourceRegistrations/context-source-registration-detailed-information.jsonld diff --git a/data/csourceRegistrations/context-source-registration-invalid-json-sample.json b/data/csourceRegistrations/context-source-registration-invalid-json.json similarity index 100% rename from data/csourceRegistrations/context-source-registration-invalid-json-sample.json rename to data/csourceRegistrations/context-source-registration-invalid-json.json diff --git a/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid-structure.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld rename to data/csourceRegistrations/context-source-registration-invalid-structure.jsonld diff --git a/data/csourceRegistrations/context-source-registration-invalid-sample.json b/data/csourceRegistrations/context-source-registration-invalid.json similarity index 100% rename from data/csourceRegistrations/context-source-registration-invalid-sample.json rename to data/csourceRegistrations/context-source-registration-invalid.json diff --git a/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-invalid-sample.jsonld rename to data/csourceRegistrations/context-source-registration-invalid.jsonld diff --git a/data/csourceRegistrations/context-source-registration-location-sample.jsonld b/data/csourceRegistrations/context-source-registration-location.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-location-sample.jsonld rename to data/csourceRegistrations/context-source-registration-location.jsonld diff --git a/data/csourceRegistrations/context-source-registration-managementInterval-sample.jsonld b/data/csourceRegistrations/context-source-registration-managementInterval.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-managementInterval-sample.jsonld rename to data/csourceRegistrations/context-source-registration-managementInterval.jsonld diff --git a/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld b/data/csourceRegistrations/context-source-registration-no-id.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-no-id-sample.jsonld rename to data/csourceRegistrations/context-source-registration-no-id.jsonld diff --git a/data/csourceRegistrations/context-source-registration-observationInterval-sample.jsonld b/data/csourceRegistrations/context-source-registration-observationInterval.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-observationInterval-sample.jsonld rename to data/csourceRegistrations/context-source-registration-observationInterval.jsonld diff --git a/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-past-expiration.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-past-expiration.jsonld diff --git a/data/csourceRegistrations/context-source-registration-unretrievable-context-sample.jsonld b/data/csourceRegistrations/context-source-registration-unretrievable-context.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-unretrievable-context-sample.jsonld rename to data/csourceRegistrations/context-source-registration-unretrievable-context.jsonld diff --git a/data/csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-vehicle-entities.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld rename to data/csourceRegistrations/context-source-registration-vehicle-entities.jsonld diff --git a/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-with-expiration.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-with-expiration.jsonld diff --git a/data/csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld b/data/csourceRegistrations/context-source-registration-with-only-properties-information.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld rename to data/csourceRegistrations/context-source-registration-with-only-properties-information.jsonld diff --git a/data/csourceRegistrations/context-source-registration-sample.json b/data/csourceRegistrations/context-source-registration.json similarity index 100% rename from data/csourceRegistrations/context-source-registration-sample.json rename to data/csourceRegistrations/context-source-registration.json diff --git a/data/csourceRegistrations/context-source-registration-sample.jsonld b/data/csourceRegistrations/context-source-registration.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-sample.jsonld rename to data/csourceRegistrations/context-source-registration.jsonld diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-01-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-01.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-01-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-01.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-04-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-04.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-04-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-04.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-05-01-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-05-01.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-05-01-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-05-01.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-05-02-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-05-02.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-05-02-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-05-02.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-06-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-06.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-06-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-06.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-07-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-07.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-07-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-07.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-08-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-08.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-08-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-08.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-09-01-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-09-01.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-09-01-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-09-01.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-09-02-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-09-02.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-09-02-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-09-02.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-10-01-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-10-01.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-10-01-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-10-01.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-10-02-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-10-02.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-10-02-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-10-02.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-10-03-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-10-03.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-10-03-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-10-03.json diff --git a/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld b/data/csourceRegistrations/fragments/context-source-registration-different-type.jsonld similarity index 100% rename from data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld rename to data/csourceRegistrations/fragments/context-source-registration-different-type.jsonld diff --git a/data/csourceRegistrations/fragments/context-source-registration-update-information-sample.json b/data/csourceRegistrations/fragments/context-source-registration-update-information.json similarity index 100% rename from data/csourceRegistrations/fragments/context-source-registration-update-information-sample.json rename to data/csourceRegistrations/fragments/context-source-registration-update-information.json diff --git a/data/csourceRegistrations/fragments/context-source-registration-update-sample.json b/data/csourceRegistrations/fragments/context-source-registration-update.json similarity index 100% rename from data/csourceRegistrations/fragments/context-source-registration-update-sample.json rename to data/csourceRegistrations/fragments/context-source-registration-update.json diff --git a/data/csourceSubscriptions/expectations/subscriptions-035-01-expectation.json b/data/csourceSubscriptions/expectations/subscriptions-035-01.json similarity index 100% rename from data/csourceSubscriptions/expectations/subscriptions-035-01-expectation.json rename to data/csourceSubscriptions/expectations/subscriptions-035-01.json diff --git a/data/csourceSubscriptions/expectations/subscriptions-040-01-expectation.json b/data/csourceSubscriptions/expectations/subscriptions-040-01.json similarity index 100% rename from data/csourceSubscriptions/expectations/subscriptions-040-01-expectation.json rename to data/csourceSubscriptions/expectations/subscriptions-040-01.json diff --git a/data/csourceSubscriptions/fragments/subscription-bus-entities-sample.json b/data/csourceSubscriptions/fragments/subscription-bus-entities.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-bus-entities-sample.json rename to data/csourceSubscriptions/fragments/subscription-bus-entities.json diff --git a/data/csourceSubscriptions/fragments/subscription-expiresAt-update-sample.json b/data/csourceSubscriptions/fragments/subscription-expiresAt-update.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-expiresAt-update-sample.json rename to data/csourceSubscriptions/fragments/subscription-expiresAt-update.json diff --git a/data/csourceSubscriptions/fragments/subscription-isActive-update-sample.json b/data/csourceSubscriptions/fragments/subscription-isActive-update.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-isActive-update-sample.json rename to data/csourceSubscriptions/fragments/subscription-isActive-update.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json b/data/csourceSubscriptions/fragments/subscription-update-invalid-json.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json rename to data/csourceSubscriptions/fragments/subscription-update-invalid-json.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-invalid-notification-sample.json b/data/csourceSubscriptions/fragments/subscription-update-invalid-notification.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-invalid-notification-sample.json rename to data/csourceSubscriptions/fragments/subscription-update-invalid-notification.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-invalid-type-sample.json b/data/csourceSubscriptions/fragments/subscription-update-invalid-type.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-invalid-type-sample.json rename to data/csourceSubscriptions/fragments/subscription-update-invalid-type.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-sample.json b/data/csourceSubscriptions/fragments/subscription-update.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-sample.json rename to data/csourceSubscriptions/fragments/subscription-update.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-sample.jsonld b/data/csourceSubscriptions/fragments/subscription-update.jsonld similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-sample.jsonld rename to data/csourceSubscriptions/fragments/subscription-update.jsonld diff --git a/data/csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities-sample.json b/data/csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities-sample.json rename to data/csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities.json diff --git a/data/csourceSubscriptions/fragments/subscription-vehicle-entities-sample.json b/data/csourceSubscriptions/fragments/subscription-vehicle-entities.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-vehicle-entities-sample.json rename to data/csourceSubscriptions/fragments/subscription-vehicle-entities.json diff --git a/data/csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld b/data/csourceSubscriptions/subscription-empty-watchedAttributes.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld rename to data/csourceSubscriptions/subscription-empty-watchedAttributes.jsonld diff --git a/data/csourceSubscriptions/subscription-expired-sample.jsonld b/data/csourceSubscriptions/subscription-expired.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-expired-sample.jsonld rename to data/csourceSubscriptions/subscription-expired.jsonld diff --git a/data/csourceSubscriptions/subscription-expiresAt-sample.jsonld b/data/csourceSubscriptions/subscription-expiresAt.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-expiresAt-sample.jsonld rename to data/csourceSubscriptions/subscription-expiresAt.jsonld diff --git a/data/csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld b/data/csourceSubscriptions/subscription-geoQ-without-geoproperty.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld rename to data/csourceSubscriptions/subscription-geoQ-without-geoproperty.jsonld diff --git a/data/csourceSubscriptions/subscription-geoQ-sample.jsonld b/data/csourceSubscriptions/subscription-geoQ.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-geoQ-sample.jsonld rename to data/csourceSubscriptions/subscription-geoQ.jsonld diff --git a/data/csourceSubscriptions/subscription-inactive-sample.jsonld b/data/csourceSubscriptions/subscription-inactive.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-inactive-sample.jsonld rename to data/csourceSubscriptions/subscription-inactive.jsonld diff --git a/data/csourceSubscriptions/subscription-invalid-query-sample.jsonld b/data/csourceSubscriptions/subscription-invalid-query.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-invalid-query-sample.jsonld rename to data/csourceSubscriptions/subscription-invalid-query.jsonld diff --git a/data/csourceSubscriptions/subscription-invalid-type-sample.jsonld b/data/csourceSubscriptions/subscription-invalid-type.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-invalid-type-sample.jsonld rename to data/csourceSubscriptions/subscription-invalid-type.jsonld diff --git a/data/csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-createdAt.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld rename to data/csourceSubscriptions/subscription-temporalQ-createdAt.jsonld diff --git a/data/csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-modifiedAt.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld rename to data/csourceSubscriptions/subscription-temporalQ-modifiedAt.jsonld diff --git a/data/csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-observedAt.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld rename to data/csourceSubscriptions/subscription-temporalQ-observedAt.jsonld diff --git a/data/csourceSubscriptions/subscription-timeInterval-sample.jsonld b/data/csourceSubscriptions/subscription-timeInterval.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-timeInterval-sample.jsonld rename to data/csourceSubscriptions/subscription-timeInterval.jsonld diff --git a/data/csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld b/data/csourceSubscriptions/subscription-unreachable-endpoint.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld rename to data/csourceSubscriptions/subscription-unreachable-endpoint.jsonld diff --git a/data/csourceSubscriptions/subscription-watchedAttributes-sample.jsonld b/data/csourceSubscriptions/subscription-watchedAttributes.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-watchedAttributes-sample.jsonld rename to data/csourceSubscriptions/subscription-watchedAttributes.jsonld diff --git a/data/csourceSubscriptions/subscription-without-notification-sample.jsonld b/data/csourceSubscriptions/subscription-without-notification.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-without-notification-sample.jsonld rename to data/csourceSubscriptions/subscription-without-notification.jsonld diff --git a/data/csourceSubscriptions/subscription-sample.jsonld b/data/csourceSubscriptions/subscription.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-sample.jsonld rename to data/csourceSubscriptions/subscription.jsonld diff --git a/data/entities/batch/empty-sample.jsonld b/data/entities/batch/empty.jsonld similarity index 100% rename from data/entities/batch/empty-sample.jsonld rename to data/entities/batch/empty.jsonld diff --git a/data/entities/batch/invalid-json-ld-sample.jsonld b/data/entities/batch/invalid-json-ld.jsonld similarity index 100% rename from data/entities/batch/invalid-json-ld-sample.jsonld rename to data/entities/batch/invalid-json-ld.jsonld diff --git a/data/entities/batch/invalid-json-sample.jsonld b/data/entities/batch/invalid-json.jsonld similarity index 100% rename from data/entities/batch/invalid-json-sample.jsonld rename to data/entities/batch/invalid-json.jsonld diff --git a/data/entities/building-language-property-sub-property-sample.jsonld b/data/entities/building-language-property-sub-property.jsonld similarity index 100% rename from data/entities/building-language-property-sub-property-sample.jsonld rename to data/entities/building-language-property-sub-property.jsonld diff --git a/data/entities/building-language-property-sample.jsonld b/data/entities/building-language-property.jsonld similarity index 100% rename from data/entities/building-language-property-sample.jsonld rename to data/entities/building-language-property.jsonld diff --git a/data/entities/building-location-attribute-sample.jsonld b/data/entities/building-location-attribute-sample.jsonld deleted file mode 100644 index 081c7a01..00000000 --- a/data/entities/building-location-attribute-sample.jsonld +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "urn:ngsi-ld:Building:randomUUID", - "type": "Building", - "name": { - "type": "Property", - "value": "Eiffel Tower" - }, - "subCategory": { - "type": "Property", - "value": "tourism" - }, - "location": { - "type": "GeoProperty", - "value": { - "type": "Point", - "coordinates": [13.3986, 52.5547] - } - }, - "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" - ] -} \ No newline at end of file diff --git a/data/entities/building-location-attribute.jsonld b/data/entities/building-location-attribute.jsonld index 778fe8f9..081c7a01 100644 --- a/data/entities/building-location-attribute.jsonld +++ b/data/entities/building-location-attribute.jsonld @@ -1,5 +1,5 @@ { - "id": "urn:ngsi-ld:Building:3009ef20-9f62-41f5-bd66-92f041b428b9", + "id": "urn:ngsi-ld:Building:randomUUID", "type": "Building", "name": { "type": "Property", @@ -17,7 +17,6 @@ } }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-minimal-sample.json b/data/entities/building-minimal.json similarity index 100% rename from data/entities/building-minimal-sample.json rename to data/entities/building-minimal.json diff --git a/data/entities/building-minimal-sample.jsonld b/data/entities/building-minimal.jsonld similarity index 100% rename from data/entities/building-minimal-sample.jsonld rename to data/entities/building-minimal.jsonld diff --git a/data/entities/building-relationship-of-property-sample.jsonld b/data/entities/building-relationship-of-property.jsonld similarity index 100% rename from data/entities/building-relationship-of-property-sample.jsonld rename to data/entities/building-relationship-of-property.jsonld diff --git a/data/entities/building-relationship-sample.jsonld b/data/entities/building-relationship.jsonld similarity index 100% rename from data/entities/building-relationship-sample.jsonld rename to data/entities/building-relationship.jsonld diff --git a/data/entities/building-simple-attributes-second-sample.jsonld b/data/entities/building-simple-attributes-second.jsonld similarity index 100% rename from data/entities/building-simple-attributes-second-sample.jsonld rename to data/entities/building-simple-attributes-second.jsonld diff --git a/data/entities/building-simple-attributes-sample.json b/data/entities/building-simple-attributes.json similarity index 100% rename from data/entities/building-simple-attributes-sample.json rename to data/entities/building-simple-attributes.json diff --git a/data/entities/building-simple-attributes-sample.jsonld b/data/entities/building-simple-attributes.jsonld similarity index 100% rename from data/entities/building-simple-attributes-sample.jsonld rename to data/entities/building-simple-attributes.jsonld diff --git a/data/entities/building-unretrievable-context-sample.jsonld b/data/entities/building-unretrievable-context.jsonld similarity index 100% rename from data/entities/building-unretrievable-context-sample.jsonld rename to data/entities/building-unretrievable-context.jsonld diff --git a/data/entities/building-with-different-type-sample.jsonld b/data/entities/building-with-different-type.jsonld similarity index 100% rename from data/entities/building-with-different-type-sample.jsonld rename to data/entities/building-with-different-type.jsonld diff --git a/data/entities/building-with-two-types-sample.jsonld b/data/entities/building-with-two-types.jsonld similarity index 100% rename from data/entities/building-with-two-types-sample.jsonld rename to data/entities/building-with-two-types.jsonld diff --git a/data/entities/empty-sample.jsonld b/data/entities/empty.jsonld similarity index 100% rename from data/entities/empty-sample.jsonld rename to data/entities/empty.jsonld diff --git a/data/entities/expectations/building-attributes-query-expectation.json b/data/entities/expectations/building-attributes-query.json similarity index 100% rename from data/entities/expectations/building-attributes-query-expectation.json rename to data/entities/expectations/building-attributes-query.json diff --git a/data/entities/expectations/building-geoproperty-query-expectation.jsonld b/data/entities/expectations/building-geoproperty-query.jsonld similarity index 100% rename from data/entities/expectations/building-geoproperty-query-expectation.jsonld rename to data/entities/expectations/building-geoproperty-query.jsonld diff --git a/data/entities/expectations/building-language-property-update-expectation.jsonld b/data/entities/expectations/building-language-property-update.jsonld similarity index 100% rename from data/entities/expectations/building-language-property-update-expectation.jsonld rename to data/entities/expectations/building-language-property-update.jsonld diff --git a/data/entities/expectations/building-minimal-compacted-expectation.json b/data/entities/expectations/building-minimal-compacted.json similarity index 100% rename from data/entities/expectations/building-minimal-compacted-expectation.json rename to data/entities/expectations/building-minimal-compacted.json diff --git a/data/entities/expectations/building-minimal-with-one-scope-expectation.json b/data/entities/expectations/building-minimal-with-one-scope.json similarity index 100% rename from data/entities/expectations/building-minimal-with-one-scope-expectation.json rename to data/entities/expectations/building-minimal-with-one-scope.json diff --git a/data/entities/expectations/building-minimal-with-two-scopes-expectation.json b/data/entities/expectations/building-minimal-with-two-scopes.json similarity index 100% rename from data/entities/expectations/building-minimal-with-two-scopes-expectation.json rename to data/entities/expectations/building-minimal-with-two-scopes.json diff --git a/data/entities/expectations/building-minimal-expectation.json b/data/entities/expectations/building-minimal.json similarity index 100% rename from data/entities/expectations/building-minimal-expectation.json rename to data/entities/expectations/building-minimal.json diff --git a/data/entities/expectations/building-simple-attributes-sample-compacted-expectation.json b/data/entities/expectations/building-simple-attributes-compacted.json similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-compacted-expectation.json rename to data/entities/expectations/building-simple-attributes-compacted.json diff --git a/data/entities/expectations/building-simple-attributes-sample-expanded-expectation.json b/data/entities/expectations/building-simple-attributes-expanded.json similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-expanded-expectation.json rename to data/entities/expectations/building-simple-attributes-expanded.json diff --git a/data/entities/expectations/building-simple-attributes-query-expectation.jsonld b/data/entities/expectations/building-simple-attributes-query.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-query-expectation.jsonld rename to data/entities/expectations/building-simple-attributes-query.jsonld diff --git a/data/entities/expectations/building-simple-attributes-simplified-expectation.json b/data/entities/expectations/building-simple-attributes-simplified.json similarity index 100% rename from data/entities/expectations/building-simple-attributes-simplified-expectation.json rename to data/entities/expectations/building-simple-attributes-simplified.json diff --git a/data/entities/expectations/building-simple-attributes-simplified-expectation.jsonld b/data/entities/expectations/building-simple-attributes-simplified.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-simplified-expectation.jsonld rename to data/entities/expectations/building-simple-attributes-simplified.jsonld diff --git a/data/entities/expectations/building-simple-attributes-expectation.jsonld b/data/entities/expectations/building-simple-attributes.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-expectation.jsonld rename to data/entities/expectations/building-simple-attributes.jsonld diff --git a/data/entities/expectations/two-types-vehicle-offstreetparking-expectation.jsonld b/data/entities/expectations/two-types-vehicle-offstreetparking.jsonld similarity index 100% rename from data/entities/expectations/two-types-vehicle-offstreetparking-expectation.jsonld rename to data/entities/expectations/two-types-vehicle-offstreetparking.jsonld diff --git a/data/entities/expectations/two-vehicles-expectation.jsonld b/data/entities/expectations/two-vehicles.jsonld similarity index 100% rename from data/entities/expectations/two-vehicles-expectation.jsonld rename to data/entities/expectations/two-vehicles.jsonld diff --git a/data/entities/expectations/vehicle-delete-datasetid-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-datasetid-speed.jsonld similarity index 100% rename from data/entities/expectations/vehicle-delete-datasetid-speed-expectation.jsonld rename to data/entities/expectations/vehicle-delete-datasetid-speed.jsonld diff --git a/data/entities/expectations/vehicle-delete-default-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-default-speed.jsonld similarity index 100% rename from data/entities/expectations/vehicle-delete-default-speed-expectation.jsonld rename to data/entities/expectations/vehicle-delete-default-speed.jsonld diff --git a/data/entities/expectations/vehicle-delete-deleteall-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-deleteall-speed.jsonld similarity index 100% rename from data/entities/expectations/vehicle-delete-deleteall-speed-expectation.jsonld rename to data/entities/expectations/vehicle-delete-deleteall-speed.jsonld diff --git a/data/entities/expectations/vehicle-isparked-update-expectation.jsonld b/data/entities/expectations/vehicle-isparked-update.jsonld similarity index 100% rename from data/entities/expectations/vehicle-isparked-update-expectation.jsonld rename to data/entities/expectations/vehicle-isparked-update.jsonld diff --git a/data/entities/expectations/vehicle-language-property-appended-expectation.jsonld b/data/entities/expectations/vehicle-language-property-appended.jsonld similarity index 100% rename from data/entities/expectations/vehicle-language-property-appended-expectation.jsonld rename to data/entities/expectations/vehicle-language-property-appended.jsonld diff --git a/data/entities/expectations/vehicle-multi-attributes-expectation.jsonld b/data/entities/expectations/vehicle-multi-attributes.jsonld similarity index 100% rename from data/entities/expectations/vehicle-multi-attributes-expectation.jsonld rename to data/entities/expectations/vehicle-multi-attributes.jsonld diff --git a/data/entities/expectations/vehicle-parking-simple-expectation.geojson b/data/entities/expectations/vehicle-parking-simple.geojson similarity index 100% rename from data/entities/expectations/vehicle-parking-simple-expectation.geojson rename to data/entities/expectations/vehicle-parking-simple.geojson diff --git a/data/entities/expectations/vehicle-simple-attributes-core-context-expectation.json b/data/entities/expectations/vehicle-simple-attributes-core-context.json similarity index 100% rename from data/entities/expectations/vehicle-simple-attributes-core-context-expectation.json rename to data/entities/expectations/vehicle-simple-attributes-core-context.json diff --git a/data/entities/expectations/vehicle-speed-appended-expectation.jsonld b/data/entities/expectations/vehicle-speed-appended.jsonld similarity index 100% rename from data/entities/expectations/vehicle-speed-appended-expectation.jsonld rename to data/entities/expectations/vehicle-speed-appended.jsonld diff --git a/data/entities/expectations/vehicle-speed-different-datasetid-expectation.jsonld b/data/entities/expectations/vehicle-speed-different-datasetid.jsonld similarity index 100% rename from data/entities/expectations/vehicle-speed-different-datasetid-expectation.jsonld rename to data/entities/expectations/vehicle-speed-different-datasetid.jsonld diff --git a/data/entities/expectations/vehicle-update-attributes-expectation.jsonld b/data/entities/expectations/vehicle-update-attributes.jsonld similarity index 100% rename from data/entities/expectations/vehicle-update-attributes-expectation.jsonld rename to data/entities/expectations/vehicle-update-attributes.jsonld diff --git a/data/entities/expectations/vehicle-update-datasetid-attributes-expectation.jsonld b/data/entities/expectations/vehicle-update-datasetid-attributes.jsonld similarity index 100% rename from data/entities/expectations/vehicle-update-datasetid-attributes-expectation.jsonld rename to data/entities/expectations/vehicle-update-datasetid-attributes.jsonld diff --git a/data/entities/expectations/vehicle-update-speed-expectation.jsonld b/data/entities/expectations/vehicle-update-speed.jsonld similarity index 100% rename from data/entities/expectations/vehicle-update-speed-expectation.jsonld rename to data/entities/expectations/vehicle-update-speed.jsonld diff --git a/data/entities/invalid-json-sample.jsonld b/data/entities/invalid-json.jsonld similarity index 100% rename from data/entities/invalid-json-sample.jsonld rename to data/entities/invalid-json.jsonld diff --git a/data/entities/parking-simple-attributes-sample.jsonld b/data/entities/parking-simple-attributes.jsonld similarity index 100% rename from data/entities/parking-simple-attributes-sample.jsonld rename to data/entities/parking-simple-attributes.jsonld diff --git a/data/entities/vehicle-simple-attributes-sample.json b/data/entities/vehicle-simple-attributes.json similarity index 100% rename from data/entities/vehicle-simple-attributes-sample.json rename to data/entities/vehicle-simple-attributes.json diff --git a/data/entities/vehicle-simple-attributes-sample.jsonld b/data/entities/vehicle-simple-attributes.jsonld similarity index 100% rename from data/entities/vehicle-simple-attributes-sample.jsonld rename to data/entities/vehicle-simple-attributes.jsonld diff --git a/data/entities/vehicle-speed-two-datasetid-sample.jsonld b/data/entities/vehicle-speed-two-datasetid.jsonld similarity index 100% rename from data/entities/vehicle-speed-two-datasetid-sample.jsonld rename to data/entities/vehicle-speed-two-datasetid.jsonld diff --git a/data/entities/vehicle-two-datasetid-attributes-sample.jsonld b/data/entities/vehicle-two-datasetid-attributes.jsonld similarity index 100% rename from data/entities/vehicle-two-datasetid-attributes-sample.jsonld rename to data/entities/vehicle-two-datasetid-attributes.jsonld diff --git a/data/jsonldContext/@context-duplicated-key.json b/data/jsonldContext/@context-duplicated-key.json deleted file mode 100644 index 2f5d5a43..00000000 --- a/data/jsonldContext/@context-duplicated-key.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "@context": { - "A1": "urn:ngsi-ld:attributes:A1", - "A1": "urn:ngsi-ld:attributes:A2", - "A3": "urn:ngsi-ld:attributes:A3" - } -} diff --git a/data/subscriptions/expectations/subscription-028-01-expectation.jsonld b/data/subscriptions/expectations/subscription-028-01.jsonld similarity index 100% rename from data/subscriptions/expectations/subscription-028-01-expectation.jsonld rename to data/subscriptions/expectations/subscription-028-01.jsonld diff --git a/data/subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld b/data/subscriptions/expectations/subscription-vehicle-expanded-types.jsonld similarity index 100% rename from data/subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld rename to data/subscriptions/expectations/subscription-vehicle-expanded-types.jsonld diff --git a/data/subscriptions/expectations/subscription-vehicle-sample.jsonld b/data/subscriptions/expectations/subscription-vehicle.jsonld similarity index 100% rename from data/subscriptions/expectations/subscription-vehicle-sample.jsonld rename to data/subscriptions/expectations/subscription-vehicle.jsonld diff --git a/data/subscriptions/expectations/subscriptions-030-03-expectation.json b/data/subscriptions/expectations/subscriptions-030-03.json similarity index 100% rename from data/subscriptions/expectations/subscriptions-030-03-expectation.json rename to data/subscriptions/expectations/subscriptions-030-03.json diff --git a/data/subscriptions/expectations/subscriptions-031-01-expectation.json b/data/subscriptions/expectations/subscriptions-031-01.json similarity index 100% rename from data/subscriptions/expectations/subscriptions-031-01-expectation.json rename to data/subscriptions/expectations/subscriptions-031-01.json diff --git a/data/subscriptions/fragments/subscription-expiresAt-future-update-sample.json b/data/subscriptions/fragments/subscription-expiresAt-future-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-expiresAt-future-update-sample.json rename to data/subscriptions/fragments/subscription-expiresAt-future-update.json diff --git a/data/subscriptions/fragments/subscription-expiresAt-update-sample.json b/data/subscriptions/fragments/subscription-expiresAt-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-expiresAt-update-sample.json rename to data/subscriptions/fragments/subscription-expiresAt-update.json diff --git a/data/subscriptions/fragments/subscription-invalid-update-sample.json b/data/subscriptions/fragments/subscription-invalid-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-invalid-update-sample.json rename to data/subscriptions/fragments/subscription-invalid-update.json diff --git a/data/subscriptions/fragments/subscription-isActive-expiresAt-update-sample.json b/data/subscriptions/fragments/subscription-isActive-expiresAt-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-isActive-expiresAt-update-sample.json rename to data/subscriptions/fragments/subscription-isActive-expiresAt-update.json diff --git a/data/subscriptions/fragments/subscription-isActive-false-update-sample.json b/data/subscriptions/fragments/subscription-isActive-false-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-isActive-false-update-sample.json rename to data/subscriptions/fragments/subscription-isActive-false-update.json diff --git a/data/subscriptions/fragments/subscription-isActive-true-update-sample.json b/data/subscriptions/fragments/subscription-isActive-true-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-isActive-true-update-sample.json rename to data/subscriptions/fragments/subscription-isActive-true-update.json diff --git a/data/subscriptions/fragments/subscription-null-properties-update-sample.json b/data/subscriptions/fragments/subscription-null-properties-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-null-properties-update-sample.json rename to data/subscriptions/fragments/subscription-null-properties-update.json diff --git a/data/subscriptions/fragments/subscription-update-sample.json b/data/subscriptions/fragments/subscription-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-update-sample.json rename to data/subscriptions/fragments/subscription-update.json diff --git a/data/subscriptions/fragments/subscription-vehicle-entities-sample.json b/data/subscriptions/fragments/subscription-vehicle-entities.json similarity index 100% rename from data/subscriptions/fragments/subscription-vehicle-entities-sample.json rename to data/subscriptions/fragments/subscription-vehicle-entities.json diff --git a/data/subscriptions/subscription-empty-sample.jsonld b/data/subscriptions/subscription-empty.jsonld similarity index 100% rename from data/subscriptions/subscription-empty-sample.jsonld rename to data/subscriptions/subscription-empty.jsonld diff --git a/data/subscriptions/subscription-inactive-sample.jsonld b/data/subscriptions/subscription-inactive.jsonld similarity index 100% rename from data/subscriptions/subscription-inactive-sample.jsonld rename to data/subscriptions/subscription-inactive.jsonld diff --git a/data/subscriptions/subscription-invalid-json-sample.jsonld b/data/subscriptions/subscription-invalid-json.jsonld similarity index 100% rename from data/subscriptions/subscription-invalid-json-sample.jsonld rename to data/subscriptions/subscription-invalid-json.jsonld diff --git a/data/subscriptions/subscription-invalid-negative-throttling-sample.jsonld b/data/subscriptions/subscription-invalid-negative-throttling.jsonld similarity index 100% rename from data/subscriptions/subscription-invalid-negative-throttling-sample.jsonld rename to data/subscriptions/subscription-invalid-negative-throttling.jsonld diff --git a/data/subscriptions/subscription-invalid-throttling-timeInterval-sample.jsonld b/data/subscriptions/subscription-invalid-throttling-timeInterval.jsonld similarity index 100% rename from data/subscriptions/subscription-invalid-throttling-timeInterval-sample.jsonld rename to data/subscriptions/subscription-invalid-throttling-timeInterval.jsonld diff --git a/data/subscriptions/subscription-timeInterval-sample.jsonld b/data/subscriptions/subscription-timeInterval.jsonld similarity index 100% rename from data/subscriptions/subscription-timeInterval-sample.jsonld rename to data/subscriptions/subscription-timeInterval.jsonld diff --git a/data/subscriptions/subscription-unretrievable-context-sample.jsonld b/data/subscriptions/subscription-unretrievable-context.jsonld similarity index 100% rename from data/subscriptions/subscription-unretrievable-context-sample.jsonld rename to data/subscriptions/subscription-unretrievable-context.jsonld diff --git a/data/subscriptions/subscription-valid-throttling-sample.jsonld b/data/subscriptions/subscription-valid-throttling.jsonld similarity index 100% rename from data/subscriptions/subscription-valid-throttling-sample.jsonld rename to data/subscriptions/subscription-valid-throttling.jsonld diff --git a/data/subscriptions/subscription-watchedAttributes-sample.jsonld b/data/subscriptions/subscription-watchedAttributes.jsonld similarity index 100% rename from data/subscriptions/subscription-watchedAttributes-sample.jsonld rename to data/subscriptions/subscription-watchedAttributes.jsonld diff --git a/data/subscriptions/subscription-sample.jsonld b/data/subscriptions/subscription.jsonld similarity index 100% rename from data/subscriptions/subscription-sample.jsonld rename to data/subscriptions/subscription.jsonld diff --git a/data/temporalEntities/2020-08-bus-temporal-representation-sample.jsonld b/data/temporalEntities/2020-08-bus-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/2020-08-bus-temporal-representation-sample.jsonld rename to data/temporalEntities/2020-08-bus-temporal-representation.jsonld diff --git a/data/temporalEntities/2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld b/data/temporalEntities/2020-08-vehicle-temporal-representation-multiple-instances.jsonld similarity index 100% rename from data/temporalEntities/2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld rename to data/temporalEntities/2020-08-vehicle-temporal-representation-multiple-instances.jsonld diff --git a/data/temporalEntities/2020-08-vehicule-temporal-representation-sample.jsonld b/data/temporalEntities/2020-08-vehicle-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/2020-08-vehicule-temporal-representation-sample.jsonld rename to data/temporalEntities/2020-08-vehicle-temporal-representation.jsonld diff --git a/data/temporalEntities/2020-09-vehicule-temporal-representation-sample.jsonld b/data/temporalEntities/2020-09-vehicle-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/2020-09-vehicule-temporal-representation-sample.jsonld rename to data/temporalEntities/2020-09-vehicle-temporal-representation.jsonld diff --git a/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld b/data/temporalEntities/2020-10-vehicle-temporal-representation-with-location.jsonld similarity index 100% rename from data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld rename to data/temporalEntities/2020-10-vehicle-temporal-representation-with-location.jsonld diff --git a/data/temporalEntities/bus-temporal-representation-unretrievable-context-sample.jsonld b/data/temporalEntities/bus-temporal-representation-unretrievable-context.jsonld similarity index 100% rename from data/temporalEntities/bus-temporal-representation-unretrievable-context-sample.jsonld rename to data/temporalEntities/bus-temporal-representation-unretrievable-context.jsonld diff --git a/data/temporalEntities/expectations/vehicle-language-property-normalized-temporal-representation-expectation.jsonld b/data/temporalEntities/expectations/vehicle-language-property-normalized-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-language-property-normalized-temporal-representation-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-language-property-normalized-temporal-representation.jsonld diff --git a/data/temporalEntities/expectations/vehicle-language-property-simplified-temporal-representation-expectation.jsonld b/data/temporalEntities/expectations/vehicle-language-property-simplified-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-language-property-simplified-temporal-representation-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-language-property-simplified-temporal-representation.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-01-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-01.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-02-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-02.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-03-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-03-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-05-01-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-05-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-05-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-05-01.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-05-02-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-05-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-05-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-05-02.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-10-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-10.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-10-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-10.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-01-expectation.json b/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-01.json similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-11-01-expectation.json rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-11-01.json diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-02-expectation.json b/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-02.json similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-11-02-expectation.json rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-11-02.json diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-03-expectation.json b/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-03.json similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-11-03-expectation.json rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-11-03.json diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-04-expectation.json b/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-04.json similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-11-04-expectation.json rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-11-04.json diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-added-attribute-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-added-attribute.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-added-attribute-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-added-attribute.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-create-with-no-context-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-create-with-no-context.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-create-with-no-context-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-create-with-no-context.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-create-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-create.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-create-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-create.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-datasetid-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-datasetid.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-datasetid-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-datasetid.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-deleteall-fuelLevel-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-deleteall-fuelLevel.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-deleteall-fuelLevel-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-deleteall-fuelLevel.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-modify-attribute-instance-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-modify-attribute-instance.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-modify-attribute-instance-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-modify-attribute-instance.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-update-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-update.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-update-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-update.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-02.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-03-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-03.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-03-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-03.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-04-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-04.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-04-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-04.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-05-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-05.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-05-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-05.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-06-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-06.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-06-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-06.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-07-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-07.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-07-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-07.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-08-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-08.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-08-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-08.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01-expectation.json b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01.json similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01-expectation.json rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01.json diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02-expectation.json b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02.json similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02-expectation.json rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02.json diff --git a/data/temporalEntities/vehicle-create-temporal-representation-without-context-sample.jsonld b/data/temporalEntities/vehicle-create-temporal-representation-without-context.jsonld similarity index 100% rename from data/temporalEntities/vehicle-create-temporal-representation-without-context-sample.jsonld rename to data/temporalEntities/vehicle-create-temporal-representation-without-context.jsonld diff --git a/data/temporalEntities/vehicle-create-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-create-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/vehicle-create-temporal-representation-sample.jsonld rename to data/temporalEntities/vehicle-create-temporal-representation.jsonld diff --git a/data/temporalEntities/vehicle-language-property-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-language-property-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/vehicle-language-property-temporal-representation-sample.jsonld rename to data/temporalEntities/vehicle-language-property-temporal-representation.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-empty-json-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-empty-json-sample.jsonld deleted file mode 100644 index e69de29b..00000000 diff --git a/data/jsonldContext/expected-detailed-@context.json b/data/temporalEntities/vehicle-temporal-representation-empty-json.jsonld similarity index 100% rename from data/jsonldContext/expected-detailed-@context.json rename to data/temporalEntities/vehicle-temporal-representation-empty-json.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-invalid-json-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-invalid-json.jsonld similarity index 100% rename from data/temporalEntities/vehicle-temporal-representation-invalid-json-sample.jsonld rename to data/temporalEntities/vehicle-temporal-representation-invalid-json.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-update-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-update.jsonld similarity index 100% rename from data/temporalEntities/vehicle-temporal-representation-update-sample.jsonld rename to data/temporalEntities/vehicle-temporal-representation-update.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-without-id-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-without-id.jsonld similarity index 100% rename from data/temporalEntities/vehicle-temporal-representation-without-id-sample.jsonld rename to data/temporalEntities/vehicle-temporal-representation-without-id.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/vehicle-temporal-representation-sample.jsonld rename to data/temporalEntities/vehicle-temporal-representation.jsonld diff --git a/data/types/expectations/attribute-026-01-01-expectation.json b/data/types/expectations/attribute-026-01-01.json similarity index 100% rename from data/types/expectations/attribute-026-01-01-expectation.json rename to data/types/expectations/attribute-026-01-01.json diff --git a/data/types/expectations/attribute-026-01-02-expectation.json b/data/types/expectations/attribute-026-01-02.json similarity index 100% rename from data/types/expectations/attribute-026-01-02-expectation.json rename to data/types/expectations/attribute-026-01-02.json diff --git a/data/types/expectations/attribute-027-01-expectation.json b/data/types/expectations/attribute-027-01.json similarity index 100% rename from data/types/expectations/attribute-027-01-expectation.json rename to data/types/expectations/attribute-027-01.json diff --git a/data/types/expectations/attribute-list-025-01-01-expectation.json b/data/types/expectations/attribute-list-025-01-01.json similarity index 100% rename from data/types/expectations/attribute-list-025-01-01-expectation.json rename to data/types/expectations/attribute-list-025-01-01.json diff --git a/data/types/expectations/attribute-list-025-01-02-expectation.json b/data/types/expectations/attribute-list-025-01-02.json similarity index 100% rename from data/types/expectations/attribute-list-025-01-02-expectation.json rename to data/types/expectations/attribute-list-025-01-02.json diff --git a/data/types/expectations/entity-type-023-01-01-expectation.json b/data/types/expectations/entity-type-023-01-01.json similarity index 100% rename from data/types/expectations/entity-type-023-01-01-expectation.json rename to data/types/expectations/entity-type-023-01-01.json diff --git a/data/types/expectations/entity-type-023-01-02-expectation.json b/data/types/expectations/entity-type-023-01-02.json similarity index 100% rename from data/types/expectations/entity-type-023-01-02-expectation.json rename to data/types/expectations/entity-type-023-01-02.json diff --git a/data/types/expectations/entity-type-info-024-01-expectation.json b/data/types/expectations/entity-type-info-024-01.json similarity index 100% rename from data/types/expectations/entity-type-info-024-01-expectation.json rename to data/types/expectations/entity-type-info-024-01.json diff --git a/data/types/expectations/entity-type-list-022-01-01-expectation.json b/data/types/expectations/entity-type-list-022-01-01.json similarity index 100% rename from data/types/expectations/entity-type-list-022-01-01-expectation.json rename to data/types/expectations/entity-type-list-022-01-01.json diff --git a/data/types/expectations/entity-type-list-022-01-02-expectation.json b/data/types/expectations/entity-type-list-022-01-02.json similarity index 100% rename from data/types/expectations/entity-type-list-022-01-02-expectation.json rename to data/types/expectations/entity-type-list-022-01-02.json diff --git a/doc/files/CommonBehaviours/043_01.json b/doc/files/CommonBehaviours/043_01.json index a2c342ab..d14a18af 100644 --- a/doc/files/CommonBehaviours/043_01.json +++ b/doc/files/CommonBehaviours/043_01.json @@ -25,7 +25,7 @@ "teardown": "Delete Entity by Id", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 503 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/LdContextNotAvailable' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-unretrievable-context-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-unretrievable-context.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": "Delete Subscription", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription with Response Status Code set to 503 and\n Create Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/LdContextNotAvailable' and\n Create Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-unretrievable-context-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-unretrievable-context.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -59,7 +59,7 @@ "teardown": "Delete Temporal Representation Of Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 503 and\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/LdContextNotAvailable' and\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response body containing 'title' element\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'bus-temporal-representation-unretrievable-context-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'bus-temporal-representation-unretrievable-context.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" }, diff --git a/doc/files/CommonBehaviours/044_02.json b/doc/files/CommonBehaviours/044_02.json index 80ee4040..750143ed 100644 --- a/doc/files/CommonBehaviours/044_02.json +++ b/doc/files/CommonBehaviours/044_02.json @@ -28,7 +28,7 @@ "teardown": "Delete Initial Subscription", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Update Subscription with Response Status Code set to 204\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/merge-patch+json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/merge-patch+json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/CommonBehaviours/048_01.json b/doc/files/CommonBehaviours/048_01.json index 5721211f..057be248 100644 --- a/doc/files/CommonBehaviours/048_01.json +++ b/doc/files/CommonBehaviours/048_01.json @@ -42,7 +42,7 @@ "teardown": "Delete Subscription", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Update Subscription with Response Status Code set to 415\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/xml' and\nPayload defined in file 'csourceSubscriptions/fragments/subscription-update-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/xml' and\nPayload defined in file 'csourceSubscriptions/fragments/subscription-update.jsonld'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" }, @@ -59,7 +59,7 @@ "teardown": "Delete Entity by Id", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Create Entity Selecting Content Type with Response Status Code set to 415\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/xml' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/xml' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -76,7 +76,7 @@ "teardown": "Delete Subscription", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Create Subscription with Response Status Code set to 415\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/xml' and\n payload defined in file: 'csourceSubscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/xml' and\n payload defined in file: 'csourceSubscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -110,7 +110,7 @@ "teardown": "Delete Temporal Representation Of Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 415\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/xml' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/xml' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Consumption/018_01_01.json b/doc/files/ContextInformation/Consumption/018_01_01.json index d25620ac..a2b58640 100644 --- a/doc/files/ContextInformation/Consumption/018_01_01.json +++ b/doc/files/ContextInformation/Consumption/018_01_01.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-expectation.jsonld'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes.jsonld'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/ld+json'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/018_01_02.json b/doc/files/ContextInformation/Consumption/018_01_02.json index 4aff9ddf..86e65131 100644 --- a/doc/files/ContextInformation/Consumption/018_01_02.json +++ b/doc/files/ContextInformation/Consumption/018_01_02.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-query-expectation.jsonld'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-query.jsonld'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: attrs set to '${attributes_to_be_retrieved}'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/018_01_03.json b/doc/files/ContextInformation/Consumption/018_01_03.json index 2e7bef60..cdbec4fc 100644 --- a/doc/files/ContextInformation/Consumption/018_01_03.json +++ b/doc/files/ContextInformation/Consumption/018_01_03.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-geoproperty-query-expectation.jsonld'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-geoproperty-query.jsonld'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: geoproperty set to 'location'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/018_04.json b/doc/files/ContextInformation/Consumption/018_04.json index ed301135..8ff6c45c 100644 --- a/doc/files/ContextInformation/Consumption/018_04.json +++ b/doc/files/ContextInformation/Consumption/018_04.json @@ -25,7 +25,7 @@ "setup": null, "teardown": "Delete Created Entity", "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-simplified-expectation.jsonld'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-simplified.jsonld'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: options set to 'keyValues'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/018_06.json b/doc/files/ContextInformation/Consumption/018_06.json index a17ae1c3..3a40c482 100644 --- a/doc/files/ContextInformation/Consumption/018_06.json +++ b/doc/files/ContextInformation/Consumption/018_06.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Created Entity", "template": "Review JSON-LD Resolution When retrieving an entity", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-sample-expanded-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-expanded.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/json' and\n Query Parameter: Link set to '<$${EMPTY}>; rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\"'\n}", "http_verb": "GET", "endpoint": "entities/{id}" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Created Entity", "template": "Review JSON-LD Resolution When retrieving an entity", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-sample-compacted-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-compacted.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/json' 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\"'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/019_01_01.json b/doc/files/ContextInformation/Consumption/019_01_01.json index f9955fb4..929a1d81 100644 --- a/doc/files/ContextInformation/Consumption/019_01_01.json +++ b/doc/files/ContextInformation/Consumption/019_01_01.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_ids set to '${entities_ids_to_be_retrieved}' and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_01_02.json b/doc/files/ContextInformation/Consumption/019_01_02.json index f06d0445..e0b05772 100644 --- a/doc/files/ContextInformation/Consumption/019_01_02.json +++ b/doc/files/ContextInformation/Consumption/019_01_02.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response body containing a list containing entity elements with different types and\n Query Parameter: filename set to 'two-types-vehicle-offstreetparking-expectation.jsonld' and\n Query Parameter: entities_representation_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'True'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response body containing a list containing entity elements with different types and\n Query Parameter: filename set to 'two-types-vehicle-offstreetparking.jsonld' and\n Query Parameter: entities_representation_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'True'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: accept set to 'application/ld+json'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_01_03.json b/doc/files/ContextInformation/Consumption/019_01_03.json index ab0e60a1..53010519 100644 --- a/doc/files/ContextInformation/Consumption/019_01_03.json +++ b/doc/files/ContextInformation/Consumption/019_01_03.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_id_pattern set to 'urn:ngsi-ld:Building:.*' and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_01_04.json b/doc/files/ContextInformation/Consumption/019_01_04.json index f5ea11c9..244bc1b7 100644 --- a/doc/files/ContextInformation/Consumption/019_01_04.json +++ b/doc/files/ContextInformation/Consumption/019_01_04.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-attributes-query-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-attributes-query.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: attrs set to '${attributes_to_be_retrieved}'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_01_05.json b/doc/files/ContextInformation/Consumption/019_01_05.json index d7a48e2f..5344a9ca 100644 --- a/doc/files/ContextInformation/Consumption/019_01_05.json +++ b/doc/files/ContextInformation/Consumption/019_01_05.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-geoproperty-query-expectation.jsonld' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-geoproperty-query.jsonld' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: georel set to 'equals' and\n Query Parameter: geometry set to 'Point' and\n Query Parameter: coordinates set to '[13.3986, 52.5547]'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_02_01.json b/doc/files/ContextInformation/Consumption/019_02_01.json index d7ec3a92..7dc151cd 100644 --- a/doc/files/ContextInformation/Consumption/019_02_01.json +++ b/doc/files/ContextInformation/Consumption/019_02_01.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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: entity_ids set to '${first_entity_id}' and\n Query Parameter: entity_types set to 'https://ngsi-ld-test-suite/context#Building' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_02_02.json b/doc/files/ContextInformation/Consumption/019_02_02.json index 8e26de62..a43aeb3f 100644 --- a/doc/files/ContextInformation/Consumption/019_02_02.json +++ b/doc/files/ContextInformation/Consumption/019_02_02.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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response body containing a list containing entity elements with different types and\n Query Parameter: filename set to 'two-vehicles-expectation.jsonld' and\n Query Parameter: entities_representation_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'True'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response body containing a list containing entity elements with different types and\n Query Parameter: filename set to 'two-vehicles.jsonld' and\n Query Parameter: entities_representation_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'True'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: entity_types set to 'https://ngsi-ld-test-suite/context#Vehicle' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: content_type set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_02_03.json b/doc/files/ContextInformation/Consumption/019_02_03.json index 192ca38a..0d14ad59 100644 --- a/doc/files/ContextInformation/Consumption/019_02_03.json +++ b/doc/files/ContextInformation/Consumption/019_02_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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: entity_id_pattern set to 'urn:ngsi-ld:Building:.*' and\n Query Parameter: entity_types set to 'https://ngsi-ld-test-suite/context#Building' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_02_04.json b/doc/files/ContextInformation/Consumption/019_02_04.json index 88dc4256..4daecbeb 100644 --- a/doc/files/ContextInformation/Consumption/019_02_04.json +++ b/doc/files/ContextInformation/Consumption/019_02_04.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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'vehicle-simple-attributes-core-context-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_retrieved' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'vehicle-simple-attributes-core-context.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_retrieved' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: attrs set to '${attributes_to_be_retrieved}' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_02_05.json b/doc/files/ContextInformation/Consumption/019_02_05.json index fa79b393..a968ef31 100644 --- a/doc/files/ContextInformation/Consumption/019_02_05.json +++ b/doc/files/ContextInformation/Consumption/019_02_05.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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Check Response Body Content and\n Query Parameter: expectation_filename set to 'vehicle-parking-simple-expectation.geojson' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: additional_ignored_path set to '${EMPTY}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Check Response Body Content and\n Query Parameter: expectation_filename set to 'vehicle-parking-simple.geojson' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: additional_ignored_path set to '${EMPTY}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: accept set to 'application/geo+json' 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: content_type set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_04.json b/doc/files/ContextInformation/Consumption/019_04.json index d8cfcf5e..c3ddfe8f 100644 --- a/doc/files/ContextInformation/Consumption/019_04.json +++ b/doc/files/ContextInformation/Consumption/019_04.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-simple-attributes-simplified-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-simple-attributes-simplified.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_ids set to '${entities_ids_to_be_retrieved}' and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: options set to 'keyValues'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/020_01.json b/doc/files/ContextInformation/Consumption/020_01.json index 0e8cc7c6..39c753da 100644 --- a/doc/files/ContextInformation/Consumption/020_01.json +++ b/doc/files/ContextInformation/Consumption/020_01.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-01-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-01.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}'\n}", "http_verb": "GET", "endpoint": "temporal/entities/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_02.json b/doc/files/ContextInformation/Consumption/020_02.json index ed48c4f7..77c2bb6e 100644 --- a/doc/files/ContextInformation/Consumption/020_02.json +++ b/doc/files/ContextInformation/Consumption/020_02.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-02-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-02.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_03.json b/doc/files/ContextInformation/Consumption/020_03.json index 55afadde..b7f89959 100644 --- a/doc/files/ContextInformation/Consumption/020_03.json +++ b/doc/files/ContextInformation/Consumption/020_03.json @@ -26,7 +26,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-03-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-03.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_04.json b/doc/files/ContextInformation/Consumption/020_04.json index 2a74af7d..74ef58d6 100644 --- a/doc/files/ContextInformation/Consumption/020_04.json +++ b/doc/files/ContextInformation/Consumption/020_04.json @@ -27,7 +27,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal query", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-01-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-01.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-08-01T13:03:00Z' and\n Query Parameter: endTimeAt set to '${EMPTY}' 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/{temporal_entity_representation_id}" @@ -43,7 +43,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal query", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-02-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-02.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: timerel set to 'before' and\n Query Parameter: timeAt set to '2020-08-01T12:05:00Z' and\n Query Parameter: endTimeAt set to '${EMPTY}' 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/{temporal_entity_representation_id}" @@ -59,7 +59,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal query", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-03-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-03.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: timerel set to 'between' and\n Query Parameter: timeAt set to '2020-08-01T12:00:00Z' and\n Query Parameter: endTimeAt set to '2020-08-01T13:00: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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_05.json b/doc/files/ContextInformation/Consumption/020_05.json index b47b4651..d110043d 100644 --- a/doc/files/ContextInformation/Consumption/020_05.json +++ b/doc/files/ContextInformation/Consumption/020_05.json @@ -27,7 +27,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of the last N instances of entity attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-05-01-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-05-01.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: lastN set to '10' 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/{temporal_entity_representation_id}" @@ -43,7 +43,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of the last N instances of entity attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-05-02-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-05-02.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: lastN set to '20' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_10.json b/doc/files/ContextInformation/Consumption/020_10.json index 151f1dd5..2b038cff 100644 --- a/doc/files/ContextInformation/Consumption/020_10.json +++ b/doc/files/ContextInformation/Consumption/020_10.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-10-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-10.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: options set to '${options}' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_11.json b/doc/files/ContextInformation/Consumption/020_11.json index 340890f8..dcbd3a16 100644 --- a/doc/files/ContextInformation/Consumption/020_11.json +++ b/doc/files/ContextInformation/Consumption/020_11.json @@ -30,7 +30,7 @@ "setup": null, "teardown": null, "template": "Retrieve the temporal evolution of an entity with the aggregated temporal representation", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-01-expectation.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-01.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: attrs set to '${EMPTY}' and\n Query Parameter: options set to '${options}' and\n Query Parameter: aggrMethods set to 'avg' and\n Query Parameter: aggrPeriodDuration set to 'PT1H' 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/{temporal_entity_representation_id}" @@ -48,7 +48,7 @@ "setup": null, "teardown": null, "template": "Retrieve the temporal evolution of an entity with the aggregated temporal representation", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-02-expectation.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-02.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: attrs set to 'fuelLevel' and\n Query Parameter: options set to '${options}' and\n Query Parameter: aggrMethods set to 'avg' and\n Query Parameter: aggrPeriodDuration set to 'PT1H' 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/{temporal_entity_representation_id}" @@ -66,7 +66,7 @@ "setup": null, "teardown": null, "template": "Retrieve the temporal evolution of an entity with the aggregated temporal representation", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-03-expectation.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-03.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: attrs set to '${EMPTY}' and\n Query Parameter: options set to '${options}' and\n Query Parameter: aggrMethods set to 'avg,max' and\n Query Parameter: aggrPeriodDuration set to 'PT1H' 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/{temporal_entity_representation_id}" @@ -84,7 +84,7 @@ "setup": null, "teardown": null, "template": "Retrieve the temporal evolution of an entity with the aggregated temporal representation", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-04-expectation.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-04.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: attrs set to '${EMPTY}' and\n Query Parameter: options set to '${options}' and\n Query Parameter: aggrMethods set to 'min,max' and\n Query Parameter: aggrPeriodDuration set to 'P1D' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_12.json b/doc/files/ContextInformation/Consumption/020_12.json index 4031111e..69aba745 100644 --- a/doc/files/ContextInformation/Consumption/020_12.json +++ b/doc/files/ContextInformation/Consumption/020_12.json @@ -33,7 +33,7 @@ "setup": null, "teardown": null, "template": "Retrieve Temporal Entity", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-language-property-normalized-temporal-representation-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-language-property-normalized-temporal-representation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: options set to '${EMPTY}' 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/{temporal_entity_representation_id}" @@ -52,7 +52,7 @@ "setup": null, "teardown": null, "template": "Retrieve Temporal Entity", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-language-property-simplified-temporal-representation-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-language-property-simplified-temporal-representation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: options set to 'temporalValues' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/021_01.json b/doc/files/ContextInformation/Consumption/021_01.json index ccf6e75f..796ffa31 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 'vehicles-temporal-representation-021-01-01-expectation.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-01-01.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\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-08-01T12:04: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 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 'vehicles-temporal-representation-021-01-02-expectation.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-01-02.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\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 '2020-09-01T13:06: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_02.json b/doc/files/ContextInformation/Consumption/021_02.json index f06d4efc..d03c732f 100644 --- a/doc/files/ContextInformation/Consumption/021_02.json +++ b/doc/files/ContextInformation/Consumption/021_02.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-02-expectation.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 '${temporal_entities_representation_ids}'\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 21060d4e..9a4345ef 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-expectation.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 '${temporal_entities_representation_ids}'\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 '14' 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 7b34c686..0790c8ac 100644 --- a/doc/files/ContextInformation/Consumption/021_04.json +++ b/doc/files/ContextInformation/Consumption/021_04.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-04-expectation.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 '${temporal_entities_representation_ids}'\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 761143a1..b2f80cf1 100644 --- a/doc/files/ContextInformation/Consumption/021_05.json +++ b/doc/files/ContextInformation/Consumption/021_05.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-05-expectation.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 '${temporal_entities_representation_ids}'\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 287ef1d2..0e21e6d8 100644 --- a/doc/files/ContextInformation/Consumption/021_06.json +++ b/doc/files/ContextInformation/Consumption/021_06.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-06-expectation.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 '${temporal_entities_representation_ids}'\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 e7e51ca7..8bf6f1a9 100644 --- a/doc/files/ContextInformation/Consumption/021_07.json +++ b/doc/files/ContextInformation/Consumption/021_07.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-07-expectation.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 '${temporal_entities_representation_ids}'\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 8d9727be..5a0bda2e 100644 --- a/doc/files/ContextInformation/Consumption/021_08.json +++ b/doc/files/ContextInformation/Consumption/021_08.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-08-expectation.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 '${temporal_entities_representation_ids}'\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 914b6475..baa9bb4a 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-expectation.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 '${temporal_entities_representation_ids}'\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-expectation.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 '${temporal_entities_representation_ids}'\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 'contains' 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_13.json b/doc/files/ContextInformation/Consumption/021_13.json index ec2c4f63..4d47ea6d 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-expectation.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 '${temporal_entities_representation_ids}'\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-expectation.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 '${temporal_entities_representation_ids}'\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" diff --git a/doc/files/ContextInformation/Consumption/021_14.json b/doc/files/ContextInformation/Consumption/021_14.json index 2257cdf0..5960c7dc 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 'vehicles-temporal-representation-021-14-01-expectation.json'\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 '${temporal_entities_representation_ids}'\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-08-01T12:04: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' 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 'vehicles-temporal-representation-021-14-02-expectation.json'\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 '${temporal_entities_representation_ids}'\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 '2020-09-01T13:06: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' and\n Query Parameter: options set to 'temporalValues'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/022_01.json b/doc/files/ContextInformation/Consumption/022_01.json index c81516bc..d9d0acd3 100644 --- a/doc/files/ContextInformation/Consumption/022_01.json +++ b/doc/files/ContextInformation/Consumption/022_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Retrieve Available Entity Types", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type List with expectation body equal to file: 'types/expectations/entity-type-list-022-01-01-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type List with expectation body equal to file: 'types/expectations/entity-type-list-022-01-01.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types'\n method set to 'GET'\n Retrieve entity types: and\n Query Parameter: context set to '${EMPTY}'\n}", "http_verb": "GET", "endpoint": "types" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Retrieve Available Entity Types", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type List with expectation body equal to file: 'types/expectations/entity-type-list-022-01-02-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type List with expectation body equal to file: 'types/expectations/entity-type-list-022-01-02.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types'\n method set to 'GET'\n Retrieve entity types: 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": "types" diff --git a/doc/files/ContextInformation/Consumption/023_01.json b/doc/files/ContextInformation/Consumption/023_01.json index 9304f516..d0c9559c 100644 --- a/doc/files/ContextInformation/Consumption/023_01.json +++ b/doc/files/ContextInformation/Consumption/023_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Retrieve Details Of Available Entity Types", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type Element with expectation body equal to file: 'types/expectations/entity-type-023-01-01-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type Element with expectation body equal to file: 'types/expectations/entity-type-023-01-01.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types'\n method set to 'GET'\n Retrieve entity types: and\n Query Parameter: context set to '${EMPTY}' and\n Query Parameter: details set to 'true'\n}", "http_verb": "GET", "endpoint": "types" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Retrieve Details Of Available Entity Types", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type Element with expectation body equal to file: 'types/expectations/entity-type-023-01-02-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type Element with expectation body equal to file: 'types/expectations/entity-type-023-01-02.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types'\n method set to 'GET'\n Retrieve entity types: 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: details set to 'true'\n}", "http_verb": "GET", "endpoint": "types" diff --git a/doc/files/ContextInformation/Consumption/024_02.json b/doc/files/ContextInformation/Consumption/024_02.json index b3e7e9ef..bf7f7032 100644 --- a/doc/files/ContextInformation/Consumption/024_02.json +++ b/doc/files/ContextInformation/Consumption/024_02.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Type with Response Status Code set to 200 and\n Retrieve Entity Type with Response body containing an Entity Type Info with expectation body set to file 'types/expectations/entity-type-info-024-01-expectation.json' and response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Type with Response Status Code set to 200 and\n Retrieve Entity Type with Response body containing an Entity Type Info with expectation body set to file 'types/expectations/entity-type-info-024-01.json' and response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types/{type}'\n method set to 'GET'\n Retrieve Entity Type, with type set to 'Building', with Header['Link'] containing '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": "types/{type}" diff --git a/doc/files/ContextInformation/Consumption/025_01.json b/doc/files/ContextInformation/Consumption/025_01.json index d7d1260b..398b1693 100644 --- a/doc/files/ContextInformation/Consumption/025_01.json +++ b/doc/files/ContextInformation/Consumption/025_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Initial Entity", "template": "Retrieve Available Attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response Body containing an Attribute List element\n * with filename set to 'types/expectations/attribute-list-025-01-01-expectation.json'\n * response set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response Body containing an Attribute List element\n * with filename set to 'types/expectations/attribute-list-025-01-01.json'\n * response set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes'\n method set to 'GET'\n Retrieve attributes: and\n Query Parameter: context set to '${EMPTY}'\n}", "http_verb": "GET", "endpoint": "attributes" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Initial Entity", "template": "Retrieve Available Attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response Body containing an Attribute List element\n * with filename set to 'types/expectations/attribute-list-025-01-02-expectation.json'\n * response set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response Body containing an Attribute List element\n * with filename set to 'types/expectations/attribute-list-025-01-02.json'\n * response set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes'\n method set to 'GET'\n Retrieve attributes: 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": "attributes" diff --git a/doc/files/ContextInformation/Consumption/026_01.json b/doc/files/ContextInformation/Consumption/026_01.json index e00b43dc..b035aab2 100644 --- a/doc/files/ContextInformation/Consumption/026_01.json +++ b/doc/files/ContextInformation/Consumption/026_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Initial Entity", "template": "Retrieve Details Of Available Attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-026-01-01-expectation.json'\n * and response body set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-026-01-01.json'\n * and response body set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes'\n method set to 'GET'\n Retrieve attributes: and\n Query Parameter: context set to '${EMPTY}' and\n Query Parameter: details set to 'true'\n}", "http_verb": "GET", "endpoint": "attributes" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Initial Entity", "template": "Retrieve Details Of Available Attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-026-01-02-expectation.json'\n * and response body set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-026-01-02.json'\n * and response body set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes'\n method set to 'GET'\n Retrieve attributes: 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: details set to 'true'\n}", "http_verb": "GET", "endpoint": "attributes" diff --git a/doc/files/ContextInformation/Consumption/027_02.json b/doc/files/ContextInformation/Consumption/027_02.json index d3788775..e322d548 100644 --- a/doc/files/ContextInformation/Consumption/027_02.json +++ b/doc/files/ContextInformation/Consumption/027_02.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attribute with Response Status Code set to 200 and\n Retrieve Attribute with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-027-01-expectation.json'\n * and response body set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attribute with Response Status Code set to 200 and\n Retrieve Attribute with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-027-01.json'\n * and response body set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes/{attribute_name}'\n method set to 'GET'\n Retrieve Attribute with attributeName set to 'airQualityLevel'\n}", "http_verb": "GET", "endpoint": "attributes/{attribute_name}" diff --git a/doc/files/ContextInformation/Provision/001_01.json b/doc/files/ContextInformation/Provision/001_01.json index a89bba4a..039fb13d 100644 --- a/doc/files/ContextInformation/Provision/001_01.json +++ b/doc/files/ContextInformation/Provision/001_01.json @@ -27,7 +27,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-minimal-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-minimal.json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -43,7 +43,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -59,7 +59,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-relationship-of-property-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-relationship-of-property.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -75,7 +75,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-location-attribute-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-location-attribute.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_02.json b/doc/files/ContextInformation/Provision/001_02.json index 505fa379..584af26e 100644 --- a/doc/files/ContextInformation/Provision/001_02.json +++ b/doc/files/ContextInformation/Provision/001_02.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity From File with Response Status Code set to 400 and\n Create Entity From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Entity From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'invalid-json-sample.jsonld' and Content-Type set to 'application/ld+json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'invalid-json.jsonld' and Content-Type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity From File with Response Status Code set to 400 and\n Create Entity From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Entity From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'empty-sample.jsonld' and Content-Type set to 'application/ld+json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'empty.jsonld' and Content-Type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -58,7 +58,7 @@ "teardown": null, "template": "Create Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity From File with Response Status Code set to 400 and\n Create Entity From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Entity From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'building-minimal-sample.json' and Content-Type set to 'application/ld+json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'building-minimal.json' and Content-Type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_03.json b/doc/files/ContextInformation/Provision/001_03.json index 406bd644..1b1c751f 100644 --- a/doc/files/ContextInformation/Provision/001_03.json +++ b/doc/files/ContextInformation/Provision/001_03.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 409 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/AlreadyExists' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-minimal-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-minimal.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_04.json b/doc/files/ContextInformation/Provision/001_04.json index c52a5a09..d0277708 100644 --- a/doc/files/ContextInformation/Provision/001_04.json +++ b/doc/files/ContextInformation/Provision/001_04.json @@ -26,7 +26,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'https://ngsi-ld-test-suite/context#almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_05.json b/doc/files/ContextInformation/Provision/001_05.json index d62f0e51..1ffe7649 100644 --- a/doc/files/ContextInformation/Provision/001_05.json +++ b/doc/files/ContextInformation/Provision/001_05.json @@ -26,7 +26,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'ngsi-ld:default-context/almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_06.json b/doc/files/ContextInformation/Provision/001_06.json index b9b9822c..884eb16c 100644 --- a/doc/files/ContextInformation/Provision/001_06.json +++ b/doc/files/ContextInformation/Provision/001_06.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 400 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_07.json b/doc/files/ContextInformation/Provision/001_07.json index 5d99bef0..af1f6bab 100644 --- a/doc/files/ContextInformation/Provision/001_07.json +++ b/doc/files/ContextInformation/Provision/001_07.json @@ -26,7 +26,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'https://ngsi-ld-test-suite/context#almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_08.json b/doc/files/ContextInformation/Provision/001_08.json index 73b24d2d..a2337688 100644 --- a/doc/files/ContextInformation/Provision/001_08.json +++ b/doc/files/ContextInformation/Provision/001_08.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 400 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_09.json b/doc/files/ContextInformation/Provision/001_09.json index 4870ec22..32cc6770 100644 --- a/doc/files/ContextInformation/Provision/001_09.json +++ b/doc/files/ContextInformation/Provision/001_09.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 400 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_10.json b/doc/files/ContextInformation/Provision/001_10.json index 03ad7246..559dbac6 100644 --- a/doc/files/ContextInformation/Provision/001_10.json +++ b/doc/files/ContextInformation/Provision/001_10.json @@ -30,7 +30,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-language-property-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-language-property.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/002_01.json b/doc/files/ContextInformation/Provision/002_01.json index ea1a0ae8..9a232e15 100644 --- a/doc/files/ContextInformation/Provision/002_01.json +++ b/doc/files/ContextInformation/Provision/002_01.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Delete Entity by Id with Response Status Code set to 204 and\n Retrieve Entity by Id with Response Status Code set to ${response2.status_code}\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/003_03.json b/doc/files/ContextInformation/Provision/003_03.json index 8edd0961..1f9bfe5a 100644 --- a/doc/files/ContextInformation/Provision/003_03.json +++ b/doc/files/ContextInformation/Provision/003_03.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Batch Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/create'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'create', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/create'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'create', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/create" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Batch Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/create'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'create', Content-Type set to 'application/ld+json', and body set to 'batch/empty-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/create'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'create', Content-Type set to 'application/ld+json', and body set to 'batch/empty.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/create" } diff --git a/doc/files/ContextInformation/Provision/004_06.json b/doc/files/ContextInformation/Provision/004_06.json index 2e217abc..4cb466e6 100644 --- a/doc/files/ContextInformation/Provision/004_06.json +++ b/doc/files/ContextInformation/Provision/004_06.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Batch Upsert Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/upsert'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'upsert', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/upsert'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'upsert', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/upsert" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Batch Upsert Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/upsert'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'upsert', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-ld-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/upsert'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'upsert', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-ld.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/upsert" } diff --git a/doc/files/ContextInformation/Provision/005_04.json b/doc/files/ContextInformation/Provision/005_04.json index 38527c52..c4d5744e 100644 --- a/doc/files/ContextInformation/Provision/005_04.json +++ b/doc/files/ContextInformation/Provision/005_04.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Batch Update Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/update'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'update', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/update'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'update', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/update" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Batch Update Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/update'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'update', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-ld-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/update'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'update', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-ld.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/update" } diff --git a/doc/files/ContextInformation/Provision/006_03.json b/doc/files/ContextInformation/Provision/006_03.json index d7a8b45d..f0495039 100644 --- a/doc/files/ContextInformation/Provision/006_03.json +++ b/doc/files/ContextInformation/Provision/006_03.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Batch Delete Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/delete'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'delete', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/delete'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'delete', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/delete" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Batch Delete Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/delete'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'delete', Content-Type set to 'application/ld+json', and body set to 'batch/empty-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/delete'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'delete', Content-Type set to 'application/ld+json', and body set to 'batch/empty.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/delete" } diff --git a/doc/files/ContextInformation/Provision/007_01.json b/doc/files/ContextInformation/Provision/007_01.json index 188bc965..19bbee25 100644 --- a/doc/files/ContextInformation/Provision/007_01.json +++ b/doc/files/ContextInformation/Provision/007_01.json @@ -27,7 +27,7 @@ "teardown": "Delete Temporal Entity", "template": "Create Temporal Entity", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201 and\n Retrieve Temporal Representation Of Entity with Check Created Resource Set To and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" }, @@ -43,7 +43,7 @@ "teardown": "Delete Temporal Entity", "template": "Create Temporal Entity", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201 and\n Retrieve Temporal Representation Of Entity with Check Created Resource Set To and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation-without-context-sample.jsonld' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation-without-context.jsonld' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Provision/007_02.json b/doc/files/ContextInformation/Provision/007_02.json index 5bba381e..7193f098 100644 --- a/doc/files/ContextInformation/Provision/007_02.json +++ b/doc/files/ContextInformation/Provision/007_02.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Temporal Entity From File", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 400 and\n Create Temporal Representation Of Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Temporal Representation Of Entity Selecting Content Type with Response body containing 'title' element\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 'POST'\n Create Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: filename set to 'vehicle-temporal-representation-invalid-json-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+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 'POST'\n Create Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: filename set to 'vehicle-temporal-representation-invalid-json.jsonld' and\n Query Parameter: content_type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "temporal/entities" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Temporal Entity From File", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 400 and\n Create Temporal Representation Of Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Temporal Representation Of Entity Selecting Content Type with Response body containing 'title' element\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 'POST'\n Create Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: filename set to 'vehicle-temporal-representation-empty-json-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+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 'POST'\n Create Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: filename set to 'vehicle-temporal-representation-empty-json.jsonld' and\n Query Parameter: content_type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Provision/007_03.json b/doc/files/ContextInformation/Provision/007_03.json index e1e4e21e..2778762e 100644 --- a/doc/files/ContextInformation/Provision/007_03.json +++ b/doc/files/ContextInformation/Provision/007_03.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Temporal Entity", "then": "then {\n the SUT sends a valid Response for the operation:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 400\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${EMPTY}' and\n Query Parameter: filename set to 'vehicle-temporal-representation-without-id-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${EMPTY}' and\n Query Parameter: filename set to 'vehicle-temporal-representation-without-id.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Temporal Entity", "then": "then {\n the SUT sends a valid Response for the operation:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 400\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to 'invalidId' and\n Query Parameter: filename set to 'vehicle-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to 'invalidId' and\n Query Parameter: filename set to 'vehicle-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Provision/008_01.json b/doc/files/ContextInformation/Provision/008_01.json index ad50d4d3..2a9854c1 100644 --- a/doc/files/ContextInformation/Provision/008_01.json +++ b/doc/files/ContextInformation/Provision/008_01.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201 and\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 204 and\n Retrieve Temporal Representation Of Entity with Check Updated Entity and\n Query Parameter: 'updated_resource' set to 'temporal_entity_expectation_payload' and\n Query Parameter: 'response_body' set to 'response2.json()' and\n Query Parameter: 'ignored_keys' set to 'ignored_attributes'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Provision/016_01.json b/doc/files/ContextInformation/Provision/016_01.json index 891bc2cc..361722ba 100644 --- a/doc/files/ContextInformation/Provision/016_01.json +++ b/doc/files/ContextInformation/Provision/016_01.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201 and\n Modify Attribute Instance From Temporal Entity with Response Status Code set to 204 and\n Retrieve Temporal Representation Of Entity with Check Updated Entity and\n Query Parameter: 'ignored_keys' set to '${None}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Subscription/028_01.json b/doc/files/ContextInformation/Subscription/028_01.json index 9d5d377d..233851f6 100644 --- a/doc/files/ContextInformation/Subscription/028_01.json +++ b/doc/files/ContextInformation/Subscription/028_01.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Subscription with Check Created Resource Set To and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/028_02.json b/doc/files/ContextInformation/Subscription/028_02.json index 73207135..06602dc4 100644 --- a/doc/files/ContextInformation/Subscription/028_02.json +++ b/doc/files/ContextInformation/Subscription/028_02.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Subscription With Invalid Request", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription From File with Response Status Code set to 400 and\n Create Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Subscription From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-json-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-json.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Subscription With Invalid Request", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription From File with Response Status Code set to 400 and\n Create Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-empty-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-empty.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/028_03.json b/doc/files/ContextInformation/Subscription/028_03.json index b9c49e57..e43b41d2 100644 --- a/doc/files/ContextInformation/Subscription/028_03.json +++ b/doc/files/ContextInformation/Subscription/028_03.json @@ -27,7 +27,7 @@ "teardown": null, "template": "Create Subscription With Invalid/Empty Id", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription with Response Status Code set to 400 and\n Create Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -43,7 +43,7 @@ "teardown": null, "template": "Create Subscription With Invalid/Empty Id", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription with Response Status Code set to 400 and\n Create Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/028_04.json b/doc/files/ContextInformation/Subscription/028_04.json index 22fcf02a..95933971 100644 --- a/doc/files/ContextInformation/Subscription/028_04.json +++ b/doc/files/ContextInformation/Subscription/028_04.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription with Response Status Code set to 409 and\n Create Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/AlreadyExists' and\n Create Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/028_05.json b/doc/files/ContextInformation/Subscription/028_05.json index 3931ff5e..2594493b 100644 --- a/doc/files/ContextInformation/Subscription/028_05.json +++ b/doc/files/ContextInformation/Subscription/028_05.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Subscription With Invalid Throttling", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription From File with Response Status Code set to 400 and\n Create Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-throttling-timeInterval-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-throttling-timeInterval.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Subscription With Invalid Throttling", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription From File with Response Status Code set to 400 and\n Create Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-negative-throttling-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-negative-throttling.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/029_01.json b/doc/files/ContextInformation/Subscription/029_01.json index 1365a18e..72525dd6 100644 --- a/doc/files/ContextInformation/Subscription/029_01.json +++ b/doc/files/ContextInformation/Subscription/029_01.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Update Subscription With Non present Or Invalid Id", "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 405 and\n Update Subscription with Response Body containing the type '${EMPTY}' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Update Subscription With Non present Or Invalid Id", "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 400 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_02.json b/doc/files/ContextInformation/Subscription/029_02.json index 7c3cc63f..7f4f6a96 100644 --- a/doc/files/ContextInformation/Subscription/029_02.json +++ b/doc/files/ContextInformation/Subscription/029_02.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 404 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/ResourceNotFound' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_03.json b/doc/files/ContextInformation/Subscription/029_03.json index 00b7127b..8acec2bc 100644 --- a/doc/files/ContextInformation/Subscription/029_03.json +++ b/doc/files/ContextInformation/Subscription/029_03.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 400 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-invalid-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-invalid-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_04.json b/doc/files/ContextInformation/Subscription/029_04.json index 65656cba..6b9d566e 100644 --- a/doc/files/ContextInformation/Subscription/029_04.json +++ b/doc/files/ContextInformation/Subscription/029_04.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 400 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-null-properties-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-null-properties-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_05.json b/doc/files/ContextInformation/Subscription/029_05.json index d78e291b..20070527 100644 --- a/doc/files/ContextInformation/Subscription/029_05.json +++ b/doc/files/ContextInformation/Subscription/029_05.json @@ -26,8 +26,8 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscription-vehicle-sample.jsonld' with subscription id '${subscription_id}'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-vehicle-entities-sample.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscription-vehicle.jsonld' with subscription id '${subscription_id}'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-vehicle-entities.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" }, @@ -42,8 +42,8 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld' with subscription id '${subscription_id}'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-vehicle-entities-sample.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscription-vehicle-expanded-types.jsonld' with subscription id '${subscription_id}'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-vehicle-entities.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_06.json b/doc/files/ContextInformation/Subscription/029_06.json index 2085014f..fcb7c5fe 100644 --- a/doc/files/ContextInformation/Subscription/029_06.json +++ b/doc/files/ContextInformation/Subscription/029_06.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Check Updated Entity and\n Query Parameter: 'updated_resource' set to 'subscription' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to 'ignored_attributes'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_07.json b/doc/files/ContextInformation/Subscription/029_07.json index 8d0133d9..61dd6ce3 100644 --- a/doc/files/ContextInformation/Subscription/029_07.json +++ b/doc/files/ContextInformation/Subscription/029_07.json @@ -28,7 +28,7 @@ "teardown": null, "template": "Activate Paused Subscription With isActive Member", "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'status' and\n Query Parameter: response_body set to 'response1.json()' and\n Query Parameter: expected_attribute_value set to 'active'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-true-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-true-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_08.json b/doc/files/ContextInformation/Subscription/029_08.json index 7e10a5ad..b8e7144d 100644 --- a/doc/files/ContextInformation/Subscription/029_08.json +++ b/doc/files/ContextInformation/Subscription/029_08.json @@ -28,7 +28,7 @@ "teardown": null, "template": "Activate Paused Subscription With isActive And ExpiresAt Members", "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'status' and\n Query Parameter: response_body set to 'response1.json()' and\n Query Parameter: expected_attribute_value set to 'active'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-expiresAt-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-expiresAt-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_09.json b/doc/files/ContextInformation/Subscription/029_09.json index a0a1d90b..07e75ab4 100644 --- a/doc/files/ContextInformation/Subscription/029_09.json +++ b/doc/files/ContextInformation/Subscription/029_09.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'status' and\n Query Parameter: response_body set to 'response1.json()' and\n Query Parameter: expected_attribute_value set to 'paused'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-false-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-false-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_11.json b/doc/files/ContextInformation/Subscription/029_11.json index 0fceb80b..2c06f9d4 100644 --- a/doc/files/ContextInformation/Subscription/029_11.json +++ b/doc/files/ContextInformation/Subscription/029_11.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 400 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-expiresAt-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-expiresAt-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/030_03.json b/doc/files/ContextInformation/Subscription/030_03.json index fe35856a..9c1e3cf5 100644 --- a/doc/files/ContextInformation/Subscription/030_03.json +++ b/doc/files/ContextInformation/Subscription/030_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 Retrieve Subscription with Response Status Code set to 200 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscriptions-030-03-expectation.json' with subscription id '${subscription_id}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Subscription with Response Status Code set to 200 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscriptions-030-03.json' with subscription id '${subscription_id}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{id}'\n method set to 'GET'\n Subscription Retrieve with the following data: and\n Query Parameter: id set to '${subscription_id}' 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": "subscriptions/{id}" diff --git a/doc/files/ContextInformation/Subscription/031_01.json b/doc/files/ContextInformation/Subscription/031_01.json index 1e3423cf..322fddda 100644 --- a/doc/files/ContextInformation/Subscription/031_01.json +++ b/doc/files/ContextInformation/Subscription/031_01.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 Subscriptions with Response Status Code set to 200 and\n Query Subscriptions with Response containing:\n * file set to 'subscriptions/expectations/subscriptions-031-01-expectation.json'\n * id set to '${subscription_ids}'\n * response set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Subscriptions with Response Status Code set to 200 and\n Query Subscriptions with Response containing:\n * file set to 'subscriptions/expectations/subscriptions-031-01.json'\n * id set to '${subscription_ids}'\n * response set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'GET'\n Query Subscription Request with data: 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": "subscriptions/" diff --git a/doc/files/ContextInformation/Subscription/046_16_01.json b/doc/files/ContextInformation/Subscription/046_16_01.json index 89d9df44..17d46661 100644 --- a/doc/files/ContextInformation/Subscription/046_16_01.json +++ b/doc/files/ContextInformation/Subscription/046_16_01.json @@ -29,7 +29,7 @@ "teardown": null, "template": null, "then": "then {\n the client at '${endpoint}' receives a valid Notification containing:\n Notification received After waiting '5' seconds and\n Notification received Notification data: '${notification}[subscriptionId]' equal to '${subscription_id}' and\n Notification received Notification data: '${notification}[data][0][id]' equal to '${entity_id}' and\n Notification received The dictionary `${notification}' should contain the key 'data' and\n Notification received The variable `${notification}[data]' should not be '${EMPTY}'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Subscription/046_16_02.json b/doc/files/ContextInformation/Subscription/046_16_02.json index 507da9a5..f25cd3cb 100644 --- a/doc/files/ContextInformation/Subscription/046_16_02.json +++ b/doc/files/ContextInformation/Subscription/046_16_02.json @@ -29,7 +29,7 @@ "teardown": null, "template": null, "then": "then {\n the client at '${endpoint}' receives a valid Notification containing:\n Notification received Waiting for no Notification data and\n Query Parameter: timeout set to '5'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'vehicle-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'vehicle-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextSource/Registration/034_04.json b/doc/files/ContextSource/Registration/034_04.json index 20c777a3..f681b77e 100644 --- a/doc/files/ContextSource/Registration/034_04.json +++ b/doc/files/ContextSource/Registration/034_04.json @@ -27,7 +27,7 @@ "teardown": "Delete Initial Context Source Registration", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Context Source Registration From File with Response Status Code set to 400 and\n Update Context Source Registration From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Context Source Registration From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceRegistrations/{context_source_registration_id}'\n method set to 'PATCH'\n Update Context Source Registration with CSR Id set to '${registration_id}' and subscription update from file 'context-source-registration-invalid-json-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceRegistrations/{context_source_registration_id}'\n method set to 'PATCH'\n Update Context Source Registration with CSR Id set to '${registration_id}' and subscription update from file 'context-source-registration-invalid-json.json'\n}", "http_verb": "PATCH", "endpoint": "csourceRegistrations/{context_source_registration_id}" } diff --git a/doc/files/ContextSource/RegistrationSubscription/039_05.json b/doc/files/ContextSource/RegistrationSubscription/039_05.json index 07f28243..cc6e5e94 100644 --- a/doc/files/ContextSource/RegistrationSubscription/039_05.json +++ b/doc/files/ContextSource/RegistrationSubscription/039_05.json @@ -27,7 +27,7 @@ "teardown": "Delete Initial Context Source Registration Subscriptions", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Context Source Registration Subscription From File with Response Status Code set to 400 and\n Update Context Source Registration Subscription From File with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n method set to 'PATCH'\n Update Context Source Registration Subscription from file with subscription id set to '${subscription_id}' and subscription update fragment set to 'csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n method set to 'PATCH'\n Update Context Source Registration Subscription from file with subscription id set to '${subscription_id}' and subscription update fragment set to 'csourceSubscriptions/fragments/subscription-update-invalid-json.json'\n}", "http_verb": "PATCH", "endpoint": "csourceSubscriptions/{subscription_id}" } diff --git a/doc/files/ContextSource/RegistrationSubscription/041_01.json b/doc/files/ContextSource/RegistrationSubscription/041_01.json index b6d4be4b..b1c79170 100644 --- a/doc/files/ContextSource/RegistrationSubscription/041_01.json +++ b/doc/files/ContextSource/RegistrationSubscription/041_01.json @@ -26,7 +26,7 @@ "setup": "Setup Initial Context Source Registration Subscriptions", "teardown": "Delete Created Context Source Registration Subscriptions", "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Context Source Registration Subscriptions with Response Status Code set to 200 and\n Query Context Source Registration Subscriptions with Response containing:\n * file set to 'csourceSubscriptions/expectations/subscriptions-035-01-expectation.json'\n * id set to '${subscription_ids}'\n * response set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Context Source Registration Subscriptions with Response Status Code set to 200 and\n Query Context Source Registration Subscriptions with Response containing:\n * file set to 'csourceSubscriptions/expectations/subscriptions-035-01.json'\n * id set to '${subscription_ids}'\n * response set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceSubscriptions'\n method set to 'GET'\n Query Context Source Registration Subscriptions 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": "csourceSubscriptions" -- GitLab From 54707aad90a0b7904b1ed3585ba402f2ceddef10 Mon Sep 17 00:00:00 2001 From: ranim-n Date: Mon, 15 Jul 2024 11:29:40 +0200 Subject: [PATCH 2/3] reviewing and refactoring test data files --- .../VerifyGETWithoutAccept/045_01.robot | 8 +++---- .../VerifyLdContextNotAvailable/043_01.robot | 8 +++---- .../VerifyMergePatchJson/044_01.robot | 2 +- .../VerifyMergePatchJson/044_02.robot | 4 ++-- .../VerifyUnsupportedMediaType/048_01.robot | 10 ++++----- .../027_01.robot | 2 +- .../027_02.robot | 4 ++-- .../RetrieveAvailableAttributes/025_01.robot | 6 ++--- .../024_01.robot | 2 +- .../024_02.robot | 4 ++-- .../RetrieveAvailableEntityTypes/022_01.robot | 8 +++---- .../026_01.robot | 6 ++--- .../023_01.robot | 8 +++---- .../Entity/QueryEntities/019_01_01.robot | 4 ++-- .../Entity/QueryEntities/019_01_02.robot | 8 +++---- .../Entity/QueryEntities/019_01_03.robot | 4 ++-- .../Entity/QueryEntities/019_01_04.robot | 6 ++--- .../Entity/QueryEntities/019_01_05.robot | 4 ++-- .../Entity/QueryEntities/019_02_01.robot | 4 ++-- .../Entity/QueryEntities/019_02_02.robot | 6 ++--- .../Entity/QueryEntities/019_02_03.robot | 4 ++-- .../Entity/QueryEntities/019_02_04.robot | 6 ++--- .../Entity/QueryEntities/019_02_05.robot | 6 ++--- .../Entity/QueryEntities/019_03_01.robot | 2 +- .../Entity/QueryEntities/019_03_02.robot | 4 ++-- .../Entity/QueryEntities/019_03_03.robot | 2 +- .../Entity/QueryEntities/019_03_04.robot | 2 +- .../Entity/QueryEntities/019_03_05.robot | 2 +- .../Entity/QueryEntities/019_04.robot | 4 ++-- .../Entity/QueryEntities/019_05.robot | 2 +- .../Entity/QueryEntities/019_06.robot | 2 +- .../Entity/QueryEntities/019_07.robot | 4 ++-- .../Entity/QueryEntities/019_08.robot | 6 ++--- .../Entity/RetrieveEntity/018_01_01.robot | 4 ++-- .../Entity/RetrieveEntity/018_01_02.robot | 4 ++-- .../Entity/RetrieveEntity/018_01_03.robot | 4 ++-- .../Entity/RetrieveEntity/018_03_02.robot | 2 +- .../Entity/RetrieveEntity/018_04.robot | 4 ++-- .../Entity/RetrieveEntity/018_05.robot | 2 +- .../Entity/RetrieveEntity/018_06.robot | 6 ++--- .../Entity/RetrieveEntity/018_07.robot | 2 +- .../021_01.robot | 16 +++++++------- .../021_02.robot | 12 +++++----- .../021_03.robot | 12 +++++----- .../021_04.robot | 12 +++++----- .../021_05.robot | 11 +++++----- .../021_06.robot | 10 ++++----- .../021_07.robot | 12 +++++----- .../021_08.robot | 14 +++++------- .../021_09.robot | 18 +++++++-------- .../021_10.robot | 2 +- .../021_11.robot | 16 +++++++------- .../021_12.robot | 6 ++--- .../021_13.robot | 14 ++++++------ .../021_14.robot | 16 +++++++------- .../020_01.robot | 6 ++--- .../020_02.robot | 8 +++---- .../020_03.robot | 8 +++---- .../020_04.robot | 12 +++++----- .../020_05.robot | 10 ++++----- .../020_08.robot | 6 ++--- .../020_09.robot | 6 ++--- .../020_10.robot | 8 +++---- .../020_11.robot | 14 ++++++------ .../020_12.robot | 10 ++++----- .../CreateBatchOfEntities/003_01.robot | 8 +++---- .../CreateBatchOfEntities/003_02.robot | 9 ++++---- .../CreateBatchOfEntities/003_03.robot | 4 ++-- .../CreateBatchOfEntities/003_04.robot | 4 ++-- .../CreateBatchOfEntities/003_05.robot | 4 ++-- .../CreateBatchOfEntities/003_06.robot | 2 +- .../CreateBatchOfEntities/003_07.robot | 4 ++-- .../CreateBatchOfEntities/003_08.robot | 2 +- .../CreateBatchOfEntities/003_09.robot | 2 +- .../CreateBatchOfEntities/003_10.robot | 4 ++-- .../DeleteBatchOfEntities/006_01.robot | 2 +- .../DeleteBatchOfEntities/006_02.robot | 4 +++- .../DeleteBatchOfEntities/006_03.robot | 4 ++-- .../DeleteBatchOfEntities/006_04.robot | 2 +- .../UpdateBatchOfEntities/005_01.robot | 8 +++---- .../UpdateBatchOfEntities/005_02.robot | 8 +++---- .../UpdateBatchOfEntities/005_03.robot | 8 +++---- .../UpdateBatchOfEntities/005_04.robot | 4 ++-- .../UpsertBatchOfEntities/004_01.robot | 6 ++--- .../UpsertBatchOfEntities/004_02.robot | 10 ++++----- .../UpsertBatchOfEntities/004_03.robot | 8 +++---- .../UpsertBatchOfEntities/004_04.robot | 8 +++---- .../UpsertBatchOfEntities/004_05.robot | 6 ++--- .../UpsertBatchOfEntities/004_06.robot | 4 ++-- .../UpsertBatchOfEntities/004_07.robot | 4 ++-- .../Entities/CreateEntity/001_01.robot | 8 +++---- .../Entities/CreateEntity/001_02.robot | 6 ++--- .../Entities/CreateEntity/001_03.robot | 2 +- .../Entities/CreateEntity/001_04.robot | 2 +- .../Entities/CreateEntity/001_05.robot | 2 +- .../Entities/CreateEntity/001_06.robot | 2 +- .../Entities/CreateEntity/001_07.robot | 2 +- .../Entities/CreateEntity/001_08.robot | 2 +- .../Entities/CreateEntity/001_09.robot | 2 +- .../Entities/CreateEntity/001_10.robot | 2 +- .../Entities/DeleteEntity/002_01.robot | 2 +- .../AppendEntityAttributes/010_01.robot | 6 ++--- .../AppendEntityAttributes/010_02.robot | 2 +- .../AppendEntityAttributes/010_04.robot | 6 ++--- .../AppendEntityAttributes/010_05.robot | 2 +- .../AppendEntityAttributes/010_06.robot | 4 ++-- .../AppendEntityAttributes/010_07.robot | 4 ++-- .../DeleteEntityAttribute/013_01.robot | 8 +++---- .../DeleteEntityAttribute/013_02.robot | 2 +- .../DeleteEntityAttribute/013_03.robot | 2 +- .../DeleteEntityAttribute/013_04.robot | 2 +- .../PartialAttributeUpdate/012_01.robot | 6 ++--- .../PartialAttributeUpdate/012_02.robot | 2 +- .../PartialAttributeUpdate/012_03.robot | 2 +- .../PartialAttributeUpdate/012_04.robot | 4 ++-- .../UpdateEntityAttributes/011_01.robot | 8 +++---- .../UpdateEntityAttributes/011_02.robot | 2 +- .../UpdateEntityAttributes/011_04.robot | 4 ++-- .../UpdateEntityAttributes/011_05.robot | 6 ++--- .../007_01.robot | 4 ++-- .../007_02.robot | 4 ++-- .../007_03.robot | 4 ++-- .../009_01.robot | 2 +- .../008_01.robot | 6 ++--- .../AddAttributes/014_01.robot | 4 ++-- .../AddAttributes/014_02.robot | 2 +- .../AddAttributes/014_03.robot | 2 +- .../AddAttributes/014_04.robot | 2 +- .../DeleteAttribute/015_01.robot | 8 +++---- .../DeleteAttribute/015_02.robot | 2 +- .../DeleteAttribute/015_03.robot | 2 +- .../DeleteAttributeInstance/017_01.robot | 4 ++-- .../DeleteAttributeInstance/017_02.robot | 2 +- .../DeleteAttributeInstance/017_03.robot | 2 +- .../016_01.robot | 4 ++-- .../016_02.robot | 2 +- .../016_03.robot | 2 +- .../CreateSubscription/028_01.robot | 4 ++-- .../CreateSubscription/028_02.robot | 4 ++-- .../CreateSubscription/028_03.robot | 2 +- .../CreateSubscription/028_04.robot | 2 +- .../CreateSubscription/028_05.robot | 4 ++-- .../DeleteSubscription/032_03.robot | 2 +- .../QuerySubscriptions/031_01.robot | 8 +++---- .../QuerySubscriptions/031_02.robot | 6 ++--- .../RetrieveSubscription/030_03.robot | 4 ++-- .../046_01.robot | 2 +- .../046_02.robot | 4 ++-- .../046_03.robot | 2 +- .../046_04.robot | 2 +- .../046_05.robot | 2 +- .../046_07.robot | 2 +- .../046_08.robot | 2 +- .../046_09.robot | 2 +- .../046_10.robot | 2 +- .../046_11.robot | 2 +- .../046_12.robot | 2 +- .../046_13.robot | 2 +- .../046_14.robot | 2 +- .../046_15.robot | 4 ++-- .../046_16_01.robot | 2 +- .../046_16_02.robot | 2 +- .../UpdateSubscription/029_01.robot | 2 +- .../UpdateSubscription/029_02.robot | 2 +- .../UpdateSubscription/029_03.robot | 4 ++-- .../UpdateSubscription/029_04.robot | 4 ++-- .../UpdateSubscription/029_05.robot | 8 +++---- .../UpdateSubscription/029_06.robot | 4 ++-- .../UpdateSubscription/029_07.robot | 4 ++-- .../UpdateSubscription/029_08.robot | 4 ++-- .../UpdateSubscription/029_09.robot | 4 ++-- .../UpdateSubscription/029_10.robot | 6 ++--- .../UpdateSubscription/029_11.robot | 4 ++-- .../037_01.robot | 8 +++---- .../037_04.robot | 4 ++-- .../037_05.robot | 4 ++-- .../037_06.robot | 6 ++--- .../037_07.robot | 4 ++-- .../037_08.robot | 4 ++-- .../037_09.robot | 8 +++---- .../037_10.robot | 10 ++++----- .../037_11.robot | 6 ++--- .../036_03.robot | 2 +- .../036_04.robot | 2 +- .../036_05.robot | 2 +- .../035_01.robot | 2 +- .../035_02.robot | 2 +- .../035_03.robot | 2 +- .../RegisterContextSource/033_01_01.robot | 2 +- .../RegisterContextSource/033_01_02.robot | 2 +- .../RegisterContextSource/033_01_03.robot | 2 +- .../RegisterContextSource/033_02.robot | 2 +- .../RegisterContextSource/033_03.robot | 2 +- .../RegisterContextSource/033_04.robot | 2 +- .../RegisterContextSource/033_05.robot | 2 +- .../RegisterContextSource/033_06.robot | 2 +- .../RegisterContextSource/033_07.robot | 2 +- .../RegisterContextSource/033_08.robot | 2 +- .../RegisterContextSource/033_09.robot | 2 +- .../RegisterContextSource/033_10.robot | 4 ++-- .../034_01.robot | 4 ++-- .../034_02.robot | 10 ++++----- .../034_03.robot | 2 +- .../034_04.robot | 4 ++-- .../034_05.robot | 4 ++-- .../034_06.robot | 6 ++--- .../047_01.robot | 4 ++-- .../047_02.robot | 6 ++--- .../047_03.robot | 4 ++-- .../047_04.robot | 4 ++-- .../047_05.robot | 4 ++-- .../047_06.robot | 4 ++-- .../047_07.robot | 8 +++---- .../047_08.robot | 6 ++--- .../047_09.robot | 6 ++--- .../047_10.robot | 4 ++-- .../047_11.robot | 6 ++--- .../047_12.robot | 4 ++-- .../047_13.robot | 4 ++-- .../047_14.robot | 4 ++-- .../047_15.robot | 4 ++-- .../047_16.robot | 12 +++++----- .../038_01.robot | 2 +- .../038_02.robot | 2 +- .../038_03.robot | 2 +- .../038_04.robot | 2 +- .../038_05.robot | 2 +- .../038_06.robot | 2 +- .../038_07.robot | 2 +- .../038_08.robot | 8 +++---- .../038_09.robot | 2 +- .../042_01.robot | 2 +- .../041_01.robot | 6 ++--- .../041_02.robot | 8 +++---- .../041_03.robot | 6 ++--- .../040_01.robot | 4 ++-- .../039_01.robot | 4 ++-- .../039_02.robot | 2 +- .../039_03.robot | 2 +- .../039_04.robot | 6 ++--- .../039_05.robot | 4 ++-- ...stration-building-and-bus-entities.jsonld} | 0 ...t-source-registration-bus-entities.jsonld} | 0 ...ource-registration-csourceProperty.jsonld} | 0 ...-registration-detailed-information.jsonld} | 0 ...ext-source-registration-invalid-json.json} | 0 ...rce-registration-invalid-structure.jsonld} | 0 ... context-source-registration-invalid.json} | 0 ...ontext-source-registration-invalid.jsonld} | 0 ...ntext-source-registration-location.jsonld} | 0 ...ce-registration-managementInterval.jsonld} | 0 ... context-source-registration-no-id.jsonld} | 0 ...e-registration-observationInterval.jsonld} | 0 ...ource-registration-past-expiration.jsonld} | 0 ...registration-unretrievable-context.jsonld} | 0 ...urce-registration-vehicle-entities.jsonld} | 0 ...ource-registration-with-expiration.jsonld} | 0 ...n-with-only-properties-information.jsonld} | 0 ....json => context-source-registration.json} | 0 ...nld => context-source-registration.jsonld} | 0 ... context-source-registrations-037-01.json} | 0 ... context-source-registrations-037-04.json} | 0 ...ntext-source-registrations-037-05-01.json} | 0 ...ntext-source-registrations-037-05-02.json} | 0 ... context-source-registrations-037-06.json} | 0 ... context-source-registrations-037-07.json} | 0 ... context-source-registrations-037-08.json} | 0 ...ntext-source-registrations-037-09-01.json} | 0 ...ntext-source-registrations-037-09-02.json} | 0 ...ntext-source-registrations-037-10-01.json} | 0 ...ntext-source-registrations-037-10-02.json} | 0 ...ntext-source-registrations-037-10-03.json} | 0 ...source-registration-different-type.jsonld} | 0 ...urce-registration-update-information.json} | 0 ...> context-source-registration-update.json} | 0 ...ctation.json => subscriptions-035-01.json} | 0 ...ctation.json => subscriptions-040-01.json} | 0 ...le.json => subscription-bus-entities.json} | 0 ...son => subscription-expiresAt-update.json} | 0 ...json => subscription-isActive-update.json} | 0 ... => subscription-update-invalid-json.json} | 0 ...cription-update-invalid-notification.json} | 0 ... => subscription-update-invalid-type.json} | 0 ...e-sample.json => subscription-update.json} | 0 ...mple.jsonld => subscription-update.jsonld} | 0 ...ubscription-vehicle-and-bus-entities.json} | 0 ...son => subscription-vehicle-entities.json} | 0 ...bscription-empty-watchedAttributes.jsonld} | 0 ...ple.jsonld => subscription-expired.jsonld} | 0 ...e.jsonld => subscription-expiresAt.jsonld} | 0 ...scription-geoQ-without-geoproperty.jsonld} | 0 ...sample.jsonld => subscription-geoQ.jsonld} | 0 ...le.jsonld => subscription-inactive.jsonld} | 0 ...onld => subscription-invalid-query.jsonld} | 0 ...sonld => subscription-invalid-type.jsonld} | 0 ...> subscription-temporalQ-createdAt.jsonld} | 0 ... subscription-temporalQ-modifiedAt.jsonld} | 0 ... subscription-temporalQ-observedAt.jsonld} | 0 ...sonld => subscription-timeInterval.jsonld} | 0 ... subscription-unreachable-endpoint.jsonld} | 0 ... => subscription-watchedAttributes.jsonld} | 0 ... subscription-without-notification.jsonld} | 0 ...tion-sample.jsonld => subscription.jsonld} | 0 .../{empty-sample.jsonld => empty.jsonld} | 0 ...d-sample.jsonld => invalid-json-ld.jsonld} | 0 ...json-sample.jsonld => invalid-json.jsonld} | 0 ...ing-language-property-sub-property.jsonld} | 0 ...onld => building-language-property.jsonld} | 0 .../building-location-attribute-sample.jsonld | 22 ------------------- .../building-location-attribute.jsonld | 5 ++--- ...imal-sample.json => building-minimal.json} | 0 ...-sample.jsonld => building-minimal.jsonld} | 0 ... building-relationship-of-property.jsonld} | 0 ...le.jsonld => building-relationship.jsonld} | 0 ... building-simple-attributes-second.jsonld} | 0 ...e.json => building-simple-attributes.json} | 0 ...onld => building-simple-attributes.jsonld} | 0 ... => building-unretrievable-context.jsonld} | 0 ...ld => building-with-different-type.jsonld} | 0 ....jsonld => building-with-two-types.jsonld} | 0 .../{empty-sample.jsonld => empty.jsonld} | 0 ...on.json => building-attributes-query.json} | 0 ...onld => building-geoproperty-query.jsonld} | 0 ... building-language-property-update.jsonld} | 0 ...n.json => building-minimal-compacted.json} | 0 ...n => building-minimal-with-one-scope.json} | 0 ... => building-minimal-with-two-scopes.json} | 0 ...expectation.json => building-minimal.json} | 0 ...building-simple-attributes-compacted.json} | 0 ... building-simple-attributes-expanded.json} | 0 ...> building-simple-attributes-query.jsonld} | 0 ...uilding-simple-attributes-simplified.json} | 0 ...lding-simple-attributes-simplified.jsonld} | 0 ...onld => building-simple-attributes.jsonld} | 0 ...two-types-vehicle-offstreetparking.jsonld} | 0 ...expectation.jsonld => two-vehicles.jsonld} | 0 ... => vehicle-delete-datasetid-speed.jsonld} | 0 ...ld => vehicle-delete-default-speed.jsonld} | 0 ... => vehicle-delete-deleteall-speed.jsonld} | 0 ....jsonld => vehicle-isparked-update.jsonld} | 0 ...vehicle-language-property-appended.jsonld} | 0 ...jsonld => vehicle-multi-attributes.jsonld} | 0 ...geojson => vehicle-parking-simple.geojson} | 0 ...hicle-simple-attributes-core-context.json} | 0 ...n.jsonld => vehicle-speed-appended.jsonld} | 0 ... vehicle-speed-different-datasetid.jsonld} | 0 ...sonld => vehicle-update-attributes.jsonld} | 0 ...ehicle-update-datasetid-attributes.jsonld} | 0 ...ion.jsonld => vehicle-update-speed.jsonld} | 0 ...json-sample.jsonld => invalid-json.jsonld} | 0 ...sonld => parking-simple-attributes.jsonld} | 0 ...le.json => vehicle-simple-attributes.json} | 0 ...sonld => vehicle-simple-attributes.jsonld} | 0 ...nld => vehicle-speed-two-datasetid.jsonld} | 0 ...> vehicle-two-datasetid-attributes.jsonld} | 0 .../@context-duplicated-key.json | 7 ------ ...tion.jsonld => subscription-028-01.jsonld} | 0 ...ubscription-vehicle-expanded-types.jsonld} | 0 ...ple.jsonld => subscription-vehicle.jsonld} | 0 ...ctation.json => subscriptions-030-03.json} | 0 ...ctation.json => subscriptions-031-01.json} | 0 ...subscription-expiresAt-future-update.json} | 0 ...son => subscription-expiresAt-update.json} | 0 ....json => subscription-invalid-update.json} | 0 ...bscription-isActive-expiresAt-update.json} | 0 ...> subscription-isActive-false-update.json} | 0 ...=> subscription-isActive-true-update.json} | 0 ... subscription-null-properties-update.json} | 0 ...e-sample.json => subscription-update.json} | 0 ...son => subscription-vehicle-entities.json} | 0 ...ample.jsonld => subscription-empty.jsonld} | 0 ...le.jsonld => subscription-inactive.jsonld} | 0 ...sonld => subscription-invalid-json.jsonld} | 0 ...iption-invalid-negative-throttling.jsonld} | 0 ...on-invalid-throttling-timeInterval.jsonld} | 0 ...sonld => subscription-timeInterval.jsonld} | 0 ...subscription-unretrievable-context.jsonld} | 0 ...d => subscription-valid-throttling.jsonld} | 0 ... => subscription-watchedAttributes.jsonld} | 0 ...tion-sample.jsonld => subscription.jsonld} | 0 ...020-08-bus-temporal-representation.jsonld} | 0 ...-representation-multiple-instances.jsonld} | 0 ...08-vehicle-temporal-representation.jsonld} | 0 ...09-vehicle-temporal-representation.jsonld} | 0 ...poral-representation-with-location.jsonld} | 0 ...presentation-unretrievable-context.jsonld} | 0 ...normalized-temporal-representation.jsonld} | 0 ...simplified-temporal-representation.jsonld} | 0 ...cle-temporal-representation-020-01.jsonld} | 0 ...cle-temporal-representation-020-02.jsonld} | 0 ...icle-temporal-representation-020-03.jsonld | 21 ++++++++++++++++++ ...-temporal-representation-020-04-01.jsonld} | 0 ...-temporal-representation-020-04-02.jsonld} | 0 ...-temporal-representation-020-04-03.jsonld} | 0 ...-temporal-representation-020-05-01.jsonld} | 0 ...-temporal-representation-020-05-02.jsonld} | 0 ...cle-temporal-representation-020-10.jsonld} | 0 ...le-temporal-representation-020-11-01.json} | 0 ...le-temporal-representation-020-11-02.json} | 0 ...le-temporal-representation-020-11-03.json} | 0 ...le-temporal-representation-020-11-04.json} | 0 ...ral-representation-added-attribute.jsonld} | 0 ...resentation-create-with-no-context.jsonld} | 0 ...cle-temporal-representation-create.jsonld} | 0 ...ntation-delete-fuelLevel-datasetid.jsonld} | 0 ...al-representation-delete-fuelLevel.jsonld} | 0 ...esentation-delete-speed-instanceid.jsonld} | 0 ...representation-deleteall-fuelLevel.jsonld} | 0 ...entation-modify-attribute-instance.jsonld} | 0 ...cle-temporal-representation-update.jsonld} | 0 ...-temporal-representation-021-01-01.jsonld} | 0 ...-temporal-representation-021-01-02.jsonld} | 0 ...les-temporal-representation-021-02.jsonld} | 0 ...les-temporal-representation-021-03.jsonld} | 0 ...les-temporal-representation-021-04.jsonld} | 0 ...les-temporal-representation-021-05.jsonld} | 0 ...les-temporal-representation-021-06.jsonld} | 0 ...les-temporal-representation-021-07.jsonld} | 0 ...les-temporal-representation-021-08.jsonld} | 0 ...-temporal-representation-021-09-01.jsonld} | 0 ...-temporal-representation-021-09-02.jsonld} | 0 ...-temporal-representation-021-13-01.jsonld} | 0 ...-temporal-representation-021-13-02.jsonld} | 0 ...es-temporal-representation-021-14-01.json} | 0 ...es-temporal-representation-021-14-02.json} | 0 ...ral-representation-without-context.jsonld} | 0 ...cle-create-temporal-representation.jsonld} | 0 ...e-property-temporal-representation.jsonld} | 0 ...al-representation-empty-json-sample.jsonld | 0 ...temporal-representation-empty-json.jsonld} | 0 ...mporal-representation-invalid-json.jsonld} | 0 ...cle-temporal-representation-update.jsonld} | 0 ...temporal-representation-without-id.jsonld} | 0 ...=> vehicle-temporal-representation.jsonld} | 0 ...ectation.json => attribute-026-01-01.json} | 0 ...ectation.json => attribute-026-01-02.json} | 0 ...expectation.json => attribute-027-01.json} | 0 ...ion.json => attribute-list-025-01-01.json} | 0 ...ion.json => attribute-list-025-01-02.json} | 0 ...tation.json => entity-type-023-01-01.json} | 0 ...tation.json => entity-type-023-01-02.json} | 0 ...tion.json => entity-type-info-024-01.json} | 0 ...n.json => entity-type-list-022-01-01.json} | 0 ...n.json => entity-type-list-022-01-02.json} | 0 doc/files/CommonBehaviours/043_01.json | 6 ++--- doc/files/CommonBehaviours/044_02.json | 2 +- doc/files/CommonBehaviours/048_01.json | 8 +++---- .../Consumption/018_01_01.json | 2 +- .../Consumption/018_01_02.json | 2 +- .../Consumption/018_01_03.json | 2 +- .../Consumption/018_04.json | 2 +- .../Consumption/018_06.json | 4 ++-- .../Consumption/019_01_01.json | 2 +- .../Consumption/019_01_02.json | 2 +- .../Consumption/019_01_03.json | 2 +- .../Consumption/019_01_04.json | 2 +- .../Consumption/019_01_05.json | 2 +- .../Consumption/019_02_01.json | 2 +- .../Consumption/019_02_02.json | 2 +- .../Consumption/019_02_03.json | 2 +- .../Consumption/019_02_04.json | 2 +- .../Consumption/019_02_05.json | 2 +- .../Consumption/019_04.json | 2 +- .../Consumption/020_01.json | 2 +- .../Consumption/020_02.json | 2 +- .../Consumption/020_03.json | 2 +- .../Consumption/020_04.json | 6 ++--- .../Consumption/020_05.json | 4 ++-- .../Consumption/020_10.json | 2 +- .../Consumption/020_11.json | 8 +++---- .../Consumption/020_12.json | 4 ++-- .../Consumption/021_01.json | 4 ++-- .../Consumption/021_02.json | 2 +- .../Consumption/021_03.json | 2 +- .../Consumption/021_04.json | 2 +- .../Consumption/021_05.json | 2 +- .../Consumption/021_06.json | 2 +- .../Consumption/021_07.json | 2 +- .../Consumption/021_08.json | 2 +- .../Consumption/021_09.json | 4 ++-- .../Consumption/021_13.json | 4 ++-- .../Consumption/021_14.json | 4 ++-- .../Consumption/022_01.json | 4 ++-- .../Consumption/023_01.json | 4 ++-- .../Consumption/024_02.json | 2 +- .../Consumption/025_01.json | 4 ++-- .../Consumption/026_01.json | 4 ++-- .../Consumption/027_02.json | 2 +- .../ContextInformation/Provision/001_01.json | 8 +++---- .../ContextInformation/Provision/001_02.json | 6 ++--- .../ContextInformation/Provision/001_03.json | 2 +- .../ContextInformation/Provision/001_04.json | 4 ++-- .../ContextInformation/Provision/001_05.json | 4 ++-- .../ContextInformation/Provision/001_06.json | 2 +- .../ContextInformation/Provision/001_07.json | 4 ++-- .../ContextInformation/Provision/001_08.json | 2 +- .../ContextInformation/Provision/001_09.json | 2 +- .../ContextInformation/Provision/001_10.json | 2 +- .../ContextInformation/Provision/002_01.json | 2 +- .../ContextInformation/Provision/003_03.json | 4 ++-- .../ContextInformation/Provision/004_06.json | 4 ++-- .../ContextInformation/Provision/005_04.json | 4 ++-- .../ContextInformation/Provision/006_03.json | 4 ++-- .../ContextInformation/Provision/007_01.json | 4 ++-- .../ContextInformation/Provision/007_02.json | 4 ++-- .../ContextInformation/Provision/007_03.json | 4 ++-- .../ContextInformation/Provision/008_01.json | 2 +- .../ContextInformation/Provision/016_01.json | 2 +- .../Subscription/028_01.json | 2 +- .../Subscription/028_02.json | 4 ++-- .../Subscription/028_03.json | 4 ++-- .../Subscription/028_04.json | 2 +- .../Subscription/028_05.json | 4 ++-- .../Subscription/029_01.json | 4 ++-- .../Subscription/029_02.json | 2 +- .../Subscription/029_03.json | 2 +- .../Subscription/029_04.json | 2 +- .../Subscription/029_05.json | 8 +++---- .../Subscription/029_06.json | 2 +- .../Subscription/029_07.json | 2 +- .../Subscription/029_08.json | 2 +- .../Subscription/029_09.json | 2 +- .../Subscription/029_11.json | 2 +- .../Subscription/030_03.json | 2 +- .../Subscription/031_01.json | 2 +- .../Subscription/046_16_01.json | 2 +- .../Subscription/046_16_02.json | 2 +- .../ContextSource/Registration/034_04.json | 2 +- .../RegistrationSubscription/039_05.json | 2 +- .../RegistrationSubscription/041_01.json | 2 +- 530 files changed, 715 insertions(+), 722 deletions(-) rename data/csourceRegistrations/{context-source-registration-building-and-bus-entities-sample.jsonld => context-source-registration-building-and-bus-entities.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-bus-entities-sample.jsonld => context-source-registration-bus-entities.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-csourceProperty-sample.jsonld => context-source-registration-csourceProperty.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-detailed-information-sample.jsonld => context-source-registration-detailed-information.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-invalid-json-sample.json => context-source-registration-invalid-json.json} (100%) rename data/csourceRegistrations/{context-source-registration-invalid-structure-sample.jsonld => context-source-registration-invalid-structure.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-invalid-sample.json => context-source-registration-invalid.json} (100%) rename data/csourceRegistrations/{context-source-registration-invalid-sample.jsonld => context-source-registration-invalid.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-location-sample.jsonld => context-source-registration-location.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-managementInterval-sample.jsonld => context-source-registration-managementInterval.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-no-id-sample.jsonld => context-source-registration-no-id.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-observationInterval-sample.jsonld => context-source-registration-observationInterval.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-past-expiration-sample.jsonld => context-source-registration-past-expiration.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-unretrievable-context-sample.jsonld => context-source-registration-unretrievable-context.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-vehicle-entities-sample.jsonld => context-source-registration-vehicle-entities.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-with-expiration-sample.jsonld => context-source-registration-with-expiration.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-with-only-properties-information-sample.jsonld => context-source-registration-with-only-properties-information.jsonld} (100%) rename data/csourceRegistrations/{context-source-registration-sample.json => context-source-registration.json} (100%) rename data/csourceRegistrations/{context-source-registration-sample.jsonld => context-source-registration.jsonld} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-01-expectation.json => context-source-registrations-037-01.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-04-expectation.json => context-source-registrations-037-04.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-05-01-expectation.json => context-source-registrations-037-05-01.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-05-02-expectation.json => context-source-registrations-037-05-02.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-06-expectation.json => context-source-registrations-037-06.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-07-expectation.json => context-source-registrations-037-07.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-08-expectation.json => context-source-registrations-037-08.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-09-01-expectation.json => context-source-registrations-037-09-01.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-09-02-expectation.json => context-source-registrations-037-09-02.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-10-01-expectation.json => context-source-registrations-037-10-01.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-10-02-expectation.json => context-source-registrations-037-10-02.json} (100%) rename data/csourceRegistrations/expectations/{context-source-registrations-037-10-03-expectation.json => context-source-registrations-037-10-03.json} (100%) rename data/csourceRegistrations/fragments/{context-source-registration-different-type-sample.jsonld => context-source-registration-different-type.jsonld} (100%) rename data/csourceRegistrations/fragments/{context-source-registration-update-information-sample.json => context-source-registration-update-information.json} (100%) rename data/csourceRegistrations/fragments/{context-source-registration-update-sample.json => context-source-registration-update.json} (100%) rename data/csourceSubscriptions/expectations/{subscriptions-035-01-expectation.json => subscriptions-035-01.json} (100%) rename data/csourceSubscriptions/expectations/{subscriptions-040-01-expectation.json => subscriptions-040-01.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-bus-entities-sample.json => subscription-bus-entities.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-expiresAt-update-sample.json => subscription-expiresAt-update.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-isActive-update-sample.json => subscription-isActive-update.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-invalid-json-sample.json => subscription-update-invalid-json.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-invalid-notification-sample.json => subscription-update-invalid-notification.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-invalid-type-sample.json => subscription-update-invalid-type.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-sample.json => subscription-update.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-update-sample.jsonld => subscription-update.jsonld} (100%) rename data/csourceSubscriptions/fragments/{subscription-vehicle-and-bus-entities-sample.json => subscription-vehicle-and-bus-entities.json} (100%) rename data/csourceSubscriptions/fragments/{subscription-vehicle-entities-sample.json => subscription-vehicle-entities.json} (100%) rename data/csourceSubscriptions/{subscription-empty-watchedAttributes-sample.jsonld => subscription-empty-watchedAttributes.jsonld} (100%) rename data/csourceSubscriptions/{subscription-expired-sample.jsonld => subscription-expired.jsonld} (100%) rename data/csourceSubscriptions/{subscription-expiresAt-sample.jsonld => subscription-expiresAt.jsonld} (100%) rename data/csourceSubscriptions/{subscription-geoQ-without-geoproperty-sample.jsonld => subscription-geoQ-without-geoproperty.jsonld} (100%) rename data/csourceSubscriptions/{subscription-geoQ-sample.jsonld => subscription-geoQ.jsonld} (100%) rename data/csourceSubscriptions/{subscription-inactive-sample.jsonld => subscription-inactive.jsonld} (100%) rename data/csourceSubscriptions/{subscription-invalid-query-sample.jsonld => subscription-invalid-query.jsonld} (100%) rename data/csourceSubscriptions/{subscription-invalid-type-sample.jsonld => subscription-invalid-type.jsonld} (100%) rename data/csourceSubscriptions/{subscription-temporalQ-createdAt-sample.jsonld => subscription-temporalQ-createdAt.jsonld} (100%) rename data/csourceSubscriptions/{subscription-temporalQ-modifiedAt-sample.jsonld => subscription-temporalQ-modifiedAt.jsonld} (100%) rename data/csourceSubscriptions/{subscription-temporalQ-observedAt-sample.jsonld => subscription-temporalQ-observedAt.jsonld} (100%) rename data/csourceSubscriptions/{subscription-timeInterval-sample.jsonld => subscription-timeInterval.jsonld} (100%) rename data/csourceSubscriptions/{subscription-unreachable-endpoint-sample.jsonld => subscription-unreachable-endpoint.jsonld} (100%) rename data/csourceSubscriptions/{subscription-watchedAttributes-sample.jsonld => subscription-watchedAttributes.jsonld} (100%) rename data/csourceSubscriptions/{subscription-without-notification-sample.jsonld => subscription-without-notification.jsonld} (100%) rename data/csourceSubscriptions/{subscription-sample.jsonld => subscription.jsonld} (100%) rename data/entities/batch/{empty-sample.jsonld => empty.jsonld} (100%) rename data/entities/batch/{invalid-json-ld-sample.jsonld => invalid-json-ld.jsonld} (100%) rename data/entities/batch/{invalid-json-sample.jsonld => invalid-json.jsonld} (100%) rename data/entities/{building-language-property-sub-property-sample.jsonld => building-language-property-sub-property.jsonld} (100%) rename data/entities/{building-language-property-sample.jsonld => building-language-property.jsonld} (100%) delete mode 100644 data/entities/building-location-attribute-sample.jsonld rename data/entities/{building-minimal-sample.json => building-minimal.json} (100%) rename data/entities/{building-minimal-sample.jsonld => building-minimal.jsonld} (100%) rename data/entities/{building-relationship-of-property-sample.jsonld => building-relationship-of-property.jsonld} (100%) rename data/entities/{building-relationship-sample.jsonld => building-relationship.jsonld} (100%) rename data/entities/{building-simple-attributes-second-sample.jsonld => building-simple-attributes-second.jsonld} (100%) rename data/entities/{building-simple-attributes-sample.json => building-simple-attributes.json} (100%) rename data/entities/{building-simple-attributes-sample.jsonld => building-simple-attributes.jsonld} (100%) rename data/entities/{building-unretrievable-context-sample.jsonld => building-unretrievable-context.jsonld} (100%) rename data/entities/{building-with-different-type-sample.jsonld => building-with-different-type.jsonld} (100%) rename data/entities/{building-with-two-types-sample.jsonld => building-with-two-types.jsonld} (100%) rename data/entities/{empty-sample.jsonld => empty.jsonld} (100%) rename data/entities/expectations/{building-attributes-query-expectation.json => building-attributes-query.json} (100%) rename data/entities/expectations/{building-geoproperty-query-expectation.jsonld => building-geoproperty-query.jsonld} (100%) rename data/entities/expectations/{building-language-property-update-expectation.jsonld => building-language-property-update.jsonld} (100%) rename data/entities/expectations/{building-minimal-compacted-expectation.json => building-minimal-compacted.json} (100%) rename data/entities/expectations/{building-minimal-with-one-scope-expectation.json => building-minimal-with-one-scope.json} (100%) rename data/entities/expectations/{building-minimal-with-two-scopes-expectation.json => building-minimal-with-two-scopes.json} (100%) rename data/entities/expectations/{building-minimal-expectation.json => building-minimal.json} (100%) rename data/entities/expectations/{building-simple-attributes-sample-compacted-expectation.json => building-simple-attributes-compacted.json} (100%) rename data/entities/expectations/{building-simple-attributes-sample-expanded-expectation.json => building-simple-attributes-expanded.json} (100%) rename data/entities/expectations/{building-simple-attributes-query-expectation.jsonld => building-simple-attributes-query.jsonld} (100%) rename data/entities/expectations/{building-simple-attributes-simplified-expectation.json => building-simple-attributes-simplified.json} (100%) rename data/entities/expectations/{building-simple-attributes-simplified-expectation.jsonld => building-simple-attributes-simplified.jsonld} (100%) rename data/entities/expectations/{building-simple-attributes-expectation.jsonld => building-simple-attributes.jsonld} (100%) rename data/entities/expectations/{two-types-vehicle-offstreetparking-expectation.jsonld => two-types-vehicle-offstreetparking.jsonld} (100%) rename data/entities/expectations/{two-vehicles-expectation.jsonld => two-vehicles.jsonld} (100%) rename data/entities/expectations/{vehicle-delete-datasetid-speed-expectation.jsonld => vehicle-delete-datasetid-speed.jsonld} (100%) rename data/entities/expectations/{vehicle-delete-default-speed-expectation.jsonld => vehicle-delete-default-speed.jsonld} (100%) rename data/entities/expectations/{vehicle-delete-deleteall-speed-expectation.jsonld => vehicle-delete-deleteall-speed.jsonld} (100%) rename data/entities/expectations/{vehicle-isparked-update-expectation.jsonld => vehicle-isparked-update.jsonld} (100%) rename data/entities/expectations/{vehicle-language-property-appended-expectation.jsonld => vehicle-language-property-appended.jsonld} (100%) rename data/entities/expectations/{vehicle-multi-attributes-expectation.jsonld => vehicle-multi-attributes.jsonld} (100%) rename data/entities/expectations/{vehicle-parking-simple-expectation.geojson => vehicle-parking-simple.geojson} (100%) rename data/entities/expectations/{vehicle-simple-attributes-core-context-expectation.json => vehicle-simple-attributes-core-context.json} (100%) rename data/entities/expectations/{vehicle-speed-appended-expectation.jsonld => vehicle-speed-appended.jsonld} (100%) rename data/entities/expectations/{vehicle-speed-different-datasetid-expectation.jsonld => vehicle-speed-different-datasetid.jsonld} (100%) rename data/entities/expectations/{vehicle-update-attributes-expectation.jsonld => vehicle-update-attributes.jsonld} (100%) rename data/entities/expectations/{vehicle-update-datasetid-attributes-expectation.jsonld => vehicle-update-datasetid-attributes.jsonld} (100%) rename data/entities/expectations/{vehicle-update-speed-expectation.jsonld => vehicle-update-speed.jsonld} (100%) rename data/entities/{invalid-json-sample.jsonld => invalid-json.jsonld} (100%) rename data/entities/{parking-simple-attributes-sample.jsonld => parking-simple-attributes.jsonld} (100%) rename data/entities/{vehicle-simple-attributes-sample.json => vehicle-simple-attributes.json} (100%) rename data/entities/{vehicle-simple-attributes-sample.jsonld => vehicle-simple-attributes.jsonld} (100%) rename data/entities/{vehicle-speed-two-datasetid-sample.jsonld => vehicle-speed-two-datasetid.jsonld} (100%) rename data/entities/{vehicle-two-datasetid-attributes-sample.jsonld => vehicle-two-datasetid-attributes.jsonld} (100%) delete mode 100644 data/jsonldContext/@context-duplicated-key.json rename data/subscriptions/expectations/{subscription-028-01-expectation.jsonld => subscription-028-01.jsonld} (100%) rename data/subscriptions/expectations/{subscription-vehicle-expanded-types-sample.jsonld => subscription-vehicle-expanded-types.jsonld} (100%) rename data/subscriptions/expectations/{subscription-vehicle-sample.jsonld => subscription-vehicle.jsonld} (100%) rename data/subscriptions/expectations/{subscriptions-030-03-expectation.json => subscriptions-030-03.json} (100%) rename data/subscriptions/expectations/{subscriptions-031-01-expectation.json => subscriptions-031-01.json} (100%) rename data/subscriptions/fragments/{subscription-expiresAt-future-update-sample.json => subscription-expiresAt-future-update.json} (100%) rename data/subscriptions/fragments/{subscription-expiresAt-update-sample.json => subscription-expiresAt-update.json} (100%) rename data/subscriptions/fragments/{subscription-invalid-update-sample.json => subscription-invalid-update.json} (100%) rename data/subscriptions/fragments/{subscription-isActive-expiresAt-update-sample.json => subscription-isActive-expiresAt-update.json} (100%) rename data/subscriptions/fragments/{subscription-isActive-false-update-sample.json => subscription-isActive-false-update.json} (100%) rename data/subscriptions/fragments/{subscription-isActive-true-update-sample.json => subscription-isActive-true-update.json} (100%) rename data/subscriptions/fragments/{subscription-null-properties-update-sample.json => subscription-null-properties-update.json} (100%) rename data/subscriptions/fragments/{subscription-update-sample.json => subscription-update.json} (100%) rename data/subscriptions/fragments/{subscription-vehicle-entities-sample.json => subscription-vehicle-entities.json} (100%) rename data/subscriptions/{subscription-empty-sample.jsonld => subscription-empty.jsonld} (100%) rename data/subscriptions/{subscription-inactive-sample.jsonld => subscription-inactive.jsonld} (100%) rename data/subscriptions/{subscription-invalid-json-sample.jsonld => subscription-invalid-json.jsonld} (100%) rename data/subscriptions/{subscription-invalid-negative-throttling-sample.jsonld => subscription-invalid-negative-throttling.jsonld} (100%) rename data/subscriptions/{subscription-invalid-throttling-timeInterval-sample.jsonld => subscription-invalid-throttling-timeInterval.jsonld} (100%) rename data/subscriptions/{subscription-timeInterval-sample.jsonld => subscription-timeInterval.jsonld} (100%) rename data/subscriptions/{subscription-unretrievable-context-sample.jsonld => subscription-unretrievable-context.jsonld} (100%) rename data/subscriptions/{subscription-valid-throttling-sample.jsonld => subscription-valid-throttling.jsonld} (100%) rename data/subscriptions/{subscription-watchedAttributes-sample.jsonld => subscription-watchedAttributes.jsonld} (100%) rename data/subscriptions/{subscription-sample.jsonld => subscription.jsonld} (100%) rename data/temporalEntities/{2020-08-bus-temporal-representation-sample.jsonld => 2020-08-bus-temporal-representation.jsonld} (100%) rename data/temporalEntities/{2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld => 2020-08-vehicle-temporal-representation-multiple-instances.jsonld} (100%) rename data/temporalEntities/{2020-08-vehicule-temporal-representation-sample.jsonld => 2020-08-vehicle-temporal-representation.jsonld} (100%) rename data/temporalEntities/{2020-09-vehicule-temporal-representation-sample.jsonld => 2020-09-vehicle-temporal-representation.jsonld} (100%) rename data/temporalEntities/{2020-10-vehicule-temporal-representation-with-location-sample.jsonld => 2020-10-vehicle-temporal-representation-with-location.jsonld} (100%) rename data/temporalEntities/{bus-temporal-representation-unretrievable-context-sample.jsonld => bus-temporal-representation-unretrievable-context.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-language-property-normalized-temporal-representation-expectation.jsonld => vehicle-language-property-normalized-temporal-representation.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-language-property-simplified-temporal-representation-expectation.jsonld => vehicle-language-property-simplified-temporal-representation.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-01-expectation.jsonld => vehicle-temporal-representation-020-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-02-expectation.jsonld => vehicle-temporal-representation-020-02.jsonld} (100%) create mode 100644 data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-04-01-expectation.jsonld => vehicle-temporal-representation-020-04-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-04-02-expectation.jsonld => vehicle-temporal-representation-020-04-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-04-03-expectation.jsonld => vehicle-temporal-representation-020-04-03.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-05-01-expectation.jsonld => vehicle-temporal-representation-020-05-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-05-02-expectation.jsonld => vehicle-temporal-representation-020-05-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-10-expectation.jsonld => vehicle-temporal-representation-020-10.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-11-01-expectation.json => vehicle-temporal-representation-020-11-01.json} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-11-02-expectation.json => vehicle-temporal-representation-020-11-02.json} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-11-03-expectation.json => vehicle-temporal-representation-020-11-03.json} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-020-11-04-expectation.json => vehicle-temporal-representation-020-11-04.json} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-added-attribute-expectation.jsonld => vehicle-temporal-representation-added-attribute.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-create-with-no-context-expectation.jsonld => vehicle-temporal-representation-create-with-no-context.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-create-expectation.jsonld => vehicle-temporal-representation-create.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-delete-fuelLevel-datasetid-expectation.jsonld => vehicle-temporal-representation-delete-fuelLevel-datasetid.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld => vehicle-temporal-representation-delete-fuelLevel.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld => vehicle-temporal-representation-delete-speed-instanceid.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-deleteall-fuelLevel-expectation.jsonld => vehicle-temporal-representation-deleteall-fuelLevel.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-modify-attribute-instance-expectation.jsonld => vehicle-temporal-representation-modify-attribute-instance.jsonld} (100%) rename data/temporalEntities/expectations/{vehicle-temporal-representation-update-expectation.jsonld => vehicle-temporal-representation-update.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-01-01-expectation.jsonld => vehicles-temporal-representation-021-01-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-01-02-expectation.jsonld => vehicles-temporal-representation-021-01-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-02-expectation.jsonld => vehicles-temporal-representation-021-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-03-expectation.jsonld => vehicles-temporal-representation-021-03.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-04-expectation.jsonld => vehicles-temporal-representation-021-04.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-05-expectation.jsonld => vehicles-temporal-representation-021-05.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-06-expectation.jsonld => vehicles-temporal-representation-021-06.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-07-expectation.jsonld => vehicles-temporal-representation-021-07.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-08-expectation.jsonld => vehicles-temporal-representation-021-08.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-09-01-expectation.jsonld => vehicles-temporal-representation-021-09-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-09-02-expectation.jsonld => vehicles-temporal-representation-021-09-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-13-01-expectation.jsonld => vehicles-temporal-representation-021-13-01.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-13-02-expectation.jsonld => vehicles-temporal-representation-021-13-02.jsonld} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-14-01-expectation.json => vehicles-temporal-representation-021-14-01.json} (100%) rename data/temporalEntities/expectations/{vehicles-temporal-representation-021-14-02-expectation.json => vehicles-temporal-representation-021-14-02.json} (100%) rename data/temporalEntities/{vehicle-create-temporal-representation-without-context-sample.jsonld => vehicle-create-temporal-representation-without-context.jsonld} (100%) rename data/temporalEntities/{vehicle-create-temporal-representation-sample.jsonld => vehicle-create-temporal-representation.jsonld} (100%) rename data/temporalEntities/{vehicle-language-property-temporal-representation-sample.jsonld => vehicle-language-property-temporal-representation.jsonld} (100%) delete mode 100644 data/temporalEntities/vehicle-temporal-representation-empty-json-sample.jsonld rename data/{jsonldContext/expected-detailed-@context.json => temporalEntities/vehicle-temporal-representation-empty-json.jsonld} (100%) rename data/temporalEntities/{vehicle-temporal-representation-invalid-json-sample.jsonld => vehicle-temporal-representation-invalid-json.jsonld} (100%) rename data/temporalEntities/{vehicle-temporal-representation-update-sample.jsonld => vehicle-temporal-representation-update.jsonld} (100%) rename data/temporalEntities/{vehicle-temporal-representation-without-id-sample.jsonld => vehicle-temporal-representation-without-id.jsonld} (100%) rename data/temporalEntities/{vehicle-temporal-representation-sample.jsonld => vehicle-temporal-representation.jsonld} (100%) rename data/types/expectations/{attribute-026-01-01-expectation.json => attribute-026-01-01.json} (100%) rename data/types/expectations/{attribute-026-01-02-expectation.json => attribute-026-01-02.json} (100%) rename data/types/expectations/{attribute-027-01-expectation.json => attribute-027-01.json} (100%) rename data/types/expectations/{attribute-list-025-01-01-expectation.json => attribute-list-025-01-01.json} (100%) rename data/types/expectations/{attribute-list-025-01-02-expectation.json => attribute-list-025-01-02.json} (100%) rename data/types/expectations/{entity-type-023-01-01-expectation.json => entity-type-023-01-01.json} (100%) rename data/types/expectations/{entity-type-023-01-02-expectation.json => entity-type-023-01-02.json} (100%) rename data/types/expectations/{entity-type-info-024-01-expectation.json => entity-type-info-024-01.json} (100%) rename data/types/expectations/{entity-type-list-022-01-01-expectation.json => entity-type-list-022-01-01.json} (100%) rename data/types/expectations/{entity-type-list-022-01-02-expectation.json => entity-type-list-022-01-02.json} (100%) diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot index 04e4af9f..8dfdfcc5 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyGETWithoutAccept/045_01.robot @@ -14,14 +14,14 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${building_filename}= building-simple-attributes-sample.jsonld +${building_filename}= building-simple-attributes.jsonld ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_filename}= subscriptions/subscription-sample.jsonld +${subscription_filename}= subscriptions/subscription.jsonld ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_filename}= csourceRegistrations/context-source-registration-with-expiration-sample.jsonld +${registration_filename}= csourceRegistrations/context-source-registration-with-expiration.jsonld ${registration_type}= Vehicle ${tea_id_prefix}= urn:ngsi-ld:Vehicle: -${tea_filename}= vehicle-temporal-representation-sample.jsonld +${tea_filename}= vehicle-temporal-representation.jsonld ${teatype}= Vehicle ${content_type}= application/json diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot index 44a8ff10..dfcfd43f 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyLdContextNotAvailable/043_01.robot @@ -12,13 +12,13 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${expected_status_code}= 503 ${building_id_prefix}= urn:ngsi-ld:Building: -${building_filename}= building-unretrievable-context-sample.jsonld +${building_filename}= building-unretrievable-context.jsonld ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_filename}= subscriptions/subscription-unretrievable-context-sample.jsonld +${subscription_filename}= subscriptions/subscription-unretrievable-context.jsonld ${tea_id_prefix}= urn:ngsi-ld:Vehicle: -${tea_filename}= bus-temporal-representation-unretrievable-context-sample.jsonld +${tea_filename}= bus-temporal-representation-unretrievable-context.jsonld ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_filename}= csourceRegistrations/context-source-registration-unretrievable-context-sample.jsonld +${registration_filename}= csourceRegistrations/context-source-registration-unretrievable-context.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot index af2fbf78..d7b50946 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_01.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld ${vehicle_fragment}= vehicle-brandname-fragment.json ${attribute_id}= brandName diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot index a228f94b..70853e4b 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyMergePatchJson/044_02.robot @@ -12,8 +12,8 @@ Test Teardown Delete Initial Subscription *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_filename}= subscriptions/subscription-sample.jsonld -${subscription_fragment}= subscriptions/fragments/subscription-update-sample.json +${subscription_filename}= subscriptions/subscription.jsonld +${subscription_fragment}= subscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot index 9b0dd212..b87bbb64 100644 --- a/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot +++ b/TP/NGSI-LD/CommonBehaviours/CommonResponses/VerifyUnsupportedMediaType/048_01.robot @@ -10,16 +10,16 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld ${vehicle_attribute}= speed ${vehicle_fragment}= vehicle-brandname-fragment.jsonld ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_filename}= csourceSubscriptions/subscription-sample.jsonld -${subscription_fragment}= csourceSubscriptions/fragments/subscription-update-sample.jsonld +${subscription_filename}= csourceSubscriptions/subscription.jsonld +${subscription_fragment}= csourceSubscriptions/fragments/subscription-update.jsonld ${tea_id_prefix}= urn:ngsi-ld:Vehicle: -${tea_filename}= vehicle-temporal-representation-sample.jsonld +${tea_filename}= vehicle-temporal-representation.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${building_filename}= building-simple-attributes-sample.jsonld +${building_filename}= building-simple-attributes.jsonld ${content_type}= application/xml diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01.robot index 7b589b0a..73d9c42c 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_02.robot index b81f7f8f..f33c756a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_02.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json -${expectation_file}= types/expectations/attribute-027-01-expectation.json +${filename}= building-simple-attributes.json +${expectation_file}= types/expectations/attribute-027-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot index f51e3ee3..207eedc6 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot @@ -13,16 +13,16 @@ Test Template Retrieve Available Attributes *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** CONTEXT EXPECTATION_FILE 025_01_01 WithoutJsonLdContext [Tags] ed-attrs 5_7_8 - ${EMPTY} types/expectations/attribute-list-025-01-01-expectation.json + ${EMPTY} types/expectations/attribute-list-025-01-01.json 025_01_02 WithJsonLdContext [Tags] ed-attrs 5_7_8 - ${ngsild_test_suite_context} types/expectations/attribute-list-025-01-02-expectation.json + ${ngsild_test_suite_context} types/expectations/attribute-list-025-01-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01.robot index 8c77aa1b..8bb90236 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Initial Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_02.robot index 5416a277..928c5227 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_02.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Initial Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json -${expectation_file}= types/expectations/entity-type-info-024-01-expectation.json +${filename}= building-simple-attributes.json +${expectation_file}= types/expectations/entity-type-info-024-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot index efc8b626..4ed1a884 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot @@ -14,17 +14,17 @@ Test Template Retrieve Available Entity Types *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${first_filename}= building-simple-attributes-sample.json -${second_filename}= vehicle-simple-attributes-sample.json +${first_filename}= building-simple-attributes.json +${second_filename}= vehicle-simple-attributes.json *** Test Cases *** CONTEXT EXPECTATION_FILE 022_01_01 WithoutJsonLdContext [Tags] ed-types 5_7_5 - ${EMPTY} types/expectations/entity-type-list-022-01-01-expectation.json + ${EMPTY} types/expectations/entity-type-list-022-01-01.json 022_01_02 WithJsonLdContext [Tags] ed-types 5_7_5 - ${ngsild_test_suite_context} types/expectations/entity-type-list-022-01-02-expectation.json + ${ngsild_test_suite_context} types/expectations/entity-type-list-022-01-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot index d5ebd20b..4a60d16e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot @@ -13,16 +13,16 @@ Test Template Retrieve Details Of Available Attributes *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** CONTEXT EXPECTATION_FILE 026_01_01 WithoutJsonLdContext [Tags] ed-attrs-details 5_7_9 - ${EMPTY} types/expectations/attribute-026-01-01-expectation.json + ${EMPTY} types/expectations/attribute-026-01-01.json 026_01_02 WithJsonLdContext [Tags] ed-attrs-details 5_7_9 - ${ngsild_test_suite_context} types/expectations/attribute-026-01-02-expectation.json + ${ngsild_test_suite_context} types/expectations/attribute-026-01-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot index a1b62ddb..e5916c4f 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot @@ -14,17 +14,17 @@ Test Template Retrieve Details Of Available Entity Types *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${first_filename}= building-simple-attributes-sample.json -${second_filename}= vehicle-simple-attributes-sample.json +${first_filename}= building-simple-attributes.json +${second_filename}= vehicle-simple-attributes.json *** Test Cases *** CONTEXT EXPECTATION_FILE 023_01_01 WithoutJsonLdContext [Tags] ed-types-details 5_7_6 - ${EMPTY} types/expectations/entity-type-023-01-01-expectation.json + ${EMPTY} types/expectations/entity-type-023-01-01.json 023_01_02 WithJsonLdContext [Tags] ed-types-details 5_7_6 - ${ngsild_test_suite_context} types/expectations/entity-type-023-01-02-expectation.json + ${ngsild_test_suite_context} types/expectations/entity-type-023-01-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_01.robot index cf39e221..1e0a7beb 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_01.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-expectation.json +${filename}= building-minimal.jsonld +${expectation_filename}= building-minimal.json ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_02.robot index 8c8476ea..009e7e3d 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_02.robot @@ -14,10 +14,10 @@ Suite Teardown Delete Entities ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${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}= two-types-vehicle-offstreetparking-expectation.jsonld +${building_filename}= building-minimal.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld +${parking_filename}= parking-simple-attributes.jsonld +${expectation_filename}= two-types-vehicle-offstreetparking.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/QueryEntities/019_01_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_03.robot index 1c044f6e..8a4a3a5a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_03.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-expectation.json +${filename}= building-minimal.jsonld +${expectation_filename}= building-minimal.json ${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/QueryEntities/019_01_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_04.robot index bc942adb..4c71f701 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_04.robot @@ -12,9 +12,9 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${filename2}= building-minimal-sample.jsonld -${expectation_filename}= building-attributes-query-expectation.json +${filename}= building-simple-attributes.jsonld +${filename2}= building-minimal.jsonld +${expectation_filename}= building-attributes-query.json ${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/QueryEntities/019_01_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_05.robot index 8b699c8f..a75897ba 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_05.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-geoproperty-query-expectation.jsonld +${filename}= building-location-attribute.jsonld +${expectation_filename}= building-geoproperty-query.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${georal}= equals ${geometry}= Point diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot index ab4d07f2..254620a4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_01.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-expectation.json +${filename}= building-minimal.jsonld +${expectation_filename}= building-minimal.json ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_02.robot index 3dfb6beb..488a4200 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_02.robot @@ -13,9 +13,9 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${building_filename}= building-minimal-sample.jsonld -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld -${expectation_filename}= two-vehicles-expectation.jsonld +${building_filename}= building-minimal.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld +${expectation_filename}= two-vehicles.jsonld ${building_entity_type}= https://ngsi-ld-test-suite/context#Building ${vehicle_entity_type}= https://ngsi-ld-test-suite/context#Vehicle diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_03.robot index 7413bc2d..7dd7b463 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_03.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-expectation.json +${filename}= building-minimal.jsonld +${expectation_filename}= building-minimal.json ${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/QueryEntities/019_02_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_04.robot index fe9373d8..e9e38a6e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_04.robot @@ -13,9 +13,9 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${building_filename}= building-minimal-sample.jsonld -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld -${expectation_filename}= vehicle-simple-attributes-core-context-expectation.json +${building_filename}= building-minimal.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld +${expectation_filename}= vehicle-simple-attributes-core-context.json ${attribute_brandname}= https://ngsi-ld-test-suite/context#brandName ${attribute_isparked}= https://uri.etsi.org/ngsi-ld/default-context/isParked diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot index f8d72a98..ad2e11a3 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_02_05.robot @@ -13,9 +13,9 @@ Suite Teardown Delete Entities *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${parking_id_prefix}= urn:ngsi-ld:OffStreetParking: -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld -${parking_filename}= parking-simple-attributes-sample.jsonld -${expectation_filename}= vehicle-parking-simple-expectation.geojson +${vehicle_filename}= vehicle-simple-attributes.jsonld +${parking_filename}= parking-simple-attributes.jsonld +${expectation_filename}= vehicle-parking-simple.geojson ${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/QueryEntities/019_03_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_01.robot index d07d7d5c..44a8dd8f 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_01.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${entity_invalid_id_one}= thisisaninvaliduri1 ${entity_invalid_id_two}= thisisaninvaliduri2 diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_02.robot index 4aebd02f..2eeffcf1 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_02.robot @@ -13,8 +13,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${building_filename}= building-minimal-sample.jsonld -${vehicle_filename}= vehicle-simple-attributes-sample.jsonld +${building_filename}= building-minimal.jsonld +${vehicle_filename}= vehicle-simple-attributes.jsonld ${invalid_entity_type_one}= type ${invalid_entity_type_two}= invalid_entity_type_two diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_03.robot index a61ec755..35c35037 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_03.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${invalid_entity_id_pattern}= invalid_entity_id_pattern** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_04.robot index edd0084f..07451987 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_04.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${invalid_attribute_one}= id ${invalid_attribute_two}= type diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_05.robot index 570a7570..f671b757 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_05.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld +${filename}= building-location-attribute.jsonld ${entity_type}= Building ${georel}= invalid ${geometry}= Point diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot index 4a111049..6165d6a6 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-simplified-expectation.json +${filename}= building-simple-attributes.jsonld +${expectation_filename}= building-simple-attributes-simplified.json ${options_parameter}= keyValues ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot index 788e593c..02673972 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld +${filename}= building-location-attribute.jsonld ${expectation_filename}= two-buildings-location-attribute-normalized.geojson ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot index 091bdce4..6c6e3a14 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${limit}= 2 diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_07.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_07.robot index 91261d2c..a6976274 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_07.robot @@ -13,8 +13,8 @@ Test Template Query Entities With Count *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${first_entity_filename}= building-simple-attributes-sample.jsonld -${second_entity_filename}= building-simple-attributes-second-sample.jsonld +${first_entity_filename}= building-simple-attributes.jsonld +${second_entity_filename}= building-simple-attributes-second.jsonld ${entity_type}= Building ${airQualityLevel}= airQualityLevel==6 diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_08.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_08.robot index 25d43015..81365192 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_08.robot @@ -13,9 +13,9 @@ Test Template Query entities using Entity Type Selection Language *** Variables *** ${entity_id_prefix} urn:ngsi-ld:MultiTypes: -${first_entity_filename} building-simple-attributes-sample.jsonld -${second_entity_filename} building-with-different-type-sample.jsonld -${third_entity_filename} building-with-two-types-sample.jsonld +${first_entity_filename} building-simple-attributes.jsonld +${second_entity_filename} building-with-different-type.jsonld +${third_entity_filename} building-with-two-types.jsonld ${building_entity_type} Building ${parking_entity_type} Parking ${tourist_destination_entity_type} TouristDestination diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_01.robot index b6884f88..811a6887 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_01.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-expectation.jsonld +${filename}= building-simple-attributes.jsonld +${expectation_filename}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_02.robot index 6a01d3c8..1f16bb8b 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_02.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-query-expectation.jsonld +${filename}= building-simple-attributes.jsonld +${expectation_filename}= building-simple-attributes-query.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/RetrieveEntity/018_01_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_03.robot index 0feda2c3..3492784d 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_01_03.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-geoproperty-query-expectation.jsonld +${filename}= building-location-attribute.jsonld +${expectation_filename}= building-geoproperty-query.jsonld ${geometry_property}= location diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_03_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_03_02.robot index 06d51d19..a5724abb 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_03_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_03_02.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld +${filename}= building-simple-attributes.jsonld ${attribute_not_known}= property_not_found diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_04.robot index 741f05a8..2a68aebe 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_04.robot @@ -12,8 +12,8 @@ Test Teardown Delete Created Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld +${filename}= building-simple-attributes.jsonld +${expectation_filename}= building-simple-attributes-simplified.jsonld ${options_parameter}= keyValues diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot index f6c6094a..f063d406 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot @@ -13,7 +13,7 @@ Test Template Retrieve Entity In GeoJSON Representation *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-location-attribute-sample.jsonld +${filename}= building-location-attribute.jsonld *** Test Cases *** OPTIONS EXPECTATION_FILENAME diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_06.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_06.robot index 6ed378ef..81eeff7b 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_06.robot @@ -13,9 +13,9 @@ Test Template Review JSON-LD Resolution When retrieving an entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json -${empty_jsonld_expectation_filename}= building-simple-attributes-sample-expanded-expectation.json -${creation_jsonld_expectation_filename}= building-simple-attributes-sample-compacted-expectation.json +${filename}= building-simple-attributes.json +${empty_jsonld_expectation_filename}= building-simple-attributes-expanded.json +${creation_jsonld_expectation_filename}= building-simple-attributes-compacted.json *** Test Cases *** CONTEXT EXPECTED_PAYLOAD diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot index 9942b45e..cf211b2f 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot @@ -13,7 +13,7 @@ Test Template Retrieve Entity With Language Filter *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-language-property-sample.jsonld +${filename}= building-language-property.jsonld *** Test Cases *** LANGUAGE_FILTER OPTIONS EXPECTATION_FILENAME 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 680cc1f6..c142caa9 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot @@ -12,20 +12,20 @@ Test Template Query the temporal evolution of entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${bus_id_prefix}= urn:ngsi-ld:Bus: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${bus_payload_file}= 2020-08-bus-temporal-representation-sample.jsonld +${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 *** Test Cases *** TIMEREL TIMEAT EXPECTATION_FILE 021_01_01 After [Tags] te-query 5_7_4 - after 2020-08-01T12:04:00Z vehicles-temporal-representation-021-01-01-expectation.jsonld + after 2020-08-01T12:04:00Z vehicles-temporal-representation-021-01-01.jsonld 021_01_02 Before [Tags] te-query 5_7_4 - before 2020-09-01T13:06:00Z vehicles-temporal-representation-021-01-02-expectation.jsonld + before 2020-09-01T13:06:00Z vehicles-temporal-representation-021-01-02.jsonld *** Keywords *** @@ -50,13 +50,13 @@ Query the temporal evolution of entities ... ${response.json()} Setup Initial Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot index 74459370..143635f2 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-02-expectation.jsonld +${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 *** Test Cases *** @@ -43,13 +43,13 @@ ${expectation_file}= vehicles-temporal-representation-021-02-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 c8ddcc82..5e5d87ad 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-03-expectation.jsonld +${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 *** Test Cases *** @@ -42,13 +42,13 @@ ${expectation_file}= vehicles-temporal-representation-021-03-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 6f353cf7..1ee1a77b 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-04-expectation.jsonld +${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 *** Test Cases *** @@ -41,13 +41,13 @@ ${expectation_file}= vehicles-temporal-representation-021-04-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 d83f3598..28db30da 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot @@ -11,11 +11,11 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${bus_id_prefix}= urn:ngsi-ld:Bus: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${bus_payload_file}= 2020-08-bus-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-05-expectation.jsonld +${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 *** Test Cases *** @@ -40,7 +40,8 @@ ${expectation_file}= vehicles-temporal-representation-021-05-expectation. *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${bus_id_prefix} ${create_response1}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${first_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 76ee9cb8..463c7e48 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-06-expectation.jsonld +${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 *** Test Cases *** @@ -41,7 +41,7 @@ ${expectation_file}= vehicles-temporal-representation-021-06-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response1}= Create Temporal Representation Of Entity ... ${first_vehicle_payload_file} ... ${first_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 630c7d6e..b360a032 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-07-expectation.jsonld +${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 *** Test Cases *** @@ -42,8 +42,8 @@ ${expectation_file}= vehicles-temporal-representation-021-07-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${create_response1}= Create Temporal Representation Of Entity + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${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} 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 164cfcdf..e8b28480 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-08-expectation.jsonld +${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 *** Test Cases *** @@ -22,14 +22,12 @@ ${expectation_file}= vehicles-temporal-representation-021-08-expe [Documentation] Check that one can query the temporal evolution of entities matching the given NGSI-LD query [Tags] te-query 5_7_4 ${entity_types_to_be_retrieved}= Catenate SEPARATOR=, Vehicle - ${response}= Query Temporal Representation Of Entities ... entity_types=${entity_types_to_be_retrieved} ... ngsild_query=speed>90 ... 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} @@ -42,13 +40,13 @@ ${expectation_file}= vehicles-temporal-representation-021-08-expe *** Keywords *** Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 179afc14..a162733f 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot @@ -12,19 +12,19 @@ Test Template Query the temporal evolution of entities matching the given *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-10-vehicule-temporal-representation-with-location-sample.jsonld -${expectation_file}= vehicles-temporal-representation-021-09-expectation.jsonld +${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 *** Test Cases *** GEOREL GEOMETRY COORDINATES GEOPROPERTY EXPECTATION_FILE 021_09_01 Near Point [Tags] te-query 5_7_4 - near;maxDistance==2000 Point [-8.503,41.202] ${EMPTY} vehicles-temporal-representation-021-09-01-expectation.jsonld + near;maxDistance==2000 Point [-8.503,41.202] ${EMPTY} vehicles-temporal-representation-021-09-01.jsonld 021_09_02 Within Polygon [Tags] te-query 5_7_4 - contains Polygon [[[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-13.503,32.57],[-13.503,47.202]]] location vehicles-temporal-representation-021-09-02-expectation.jsonld + contains Polygon [[[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-13.503,32.57],[-13.503,47.202]]] location vehicles-temporal-representation-021-09-02.jsonld *** Keywords *** @@ -51,13 +51,13 @@ Query the temporal evolution of entities matching the given NGSI-LD geo-query ... ${response.json()} Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${create_response1}= Create Temporal Representation Of Entity + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 index 0a90bcfa..86ba7571 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot @@ -13,7 +13,7 @@ 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-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval.jsonld ${context_source_url}= http://${context_source_host}:${context_source_port} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot index fab5d565..c3c1cb84 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot @@ -12,9 +12,9 @@ Test Template Query the temporal evolution of entities with a limit to the *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld +${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 *** Test Cases *** LIMIT @@ -41,20 +41,20 @@ Query the temporal evolution of entities with a limit to the number of entities Check Response Body Containing Number Of Entities Vehicle ${limit} ${response.json()} Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} - ${create_response1}= Create Temporal Representation Of Entity + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 ${vehicule_id_prefix} - ${create_response3}= Create Temporal Representation Of Entity + ${third_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} + ${create_response3}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${third_temporal_entity_representation_id} Check Response Status Code 201 ${create_response3.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot index 7a84dbf6..69503712 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** @@ -32,7 +32,7 @@ ${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.json *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_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 68af1253..89f3fa6a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot @@ -12,18 +12,18 @@ Test Template Query the temporal evolution of entities using the entityOpe *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld +${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 *** Test Cases *** PAYLOAD_FILE EXPECTATION_FILE 021_13_01 After [Tags] te-query 5_7_4 - entity-operations-after-query.jsonld vehicles-temporal-representation-021-13-01-expectation.jsonld + entity-operations-after-query.jsonld vehicles-temporal-representation-021-13-01.jsonld 021_13_02 Before [Tags] te-query 5_7_4 - entity-operations-before-query.jsonld vehicles-temporal-representation-021-13-02-expectation.jsonld + entity-operations-before-query.jsonld vehicles-temporal-representation-021-13-02.jsonld *** Keywords *** @@ -43,13 +43,13 @@ Query the temporal evolution of entities using the entityOperations method ... ${response.json()} Setup Initial Temporal Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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_14.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot index 434d2f59..fe7e520d 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot @@ -12,20 +12,20 @@ Test Template Query the temporal evolution of entities *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${bus_id_prefix}= urn:ngsi-ld:Bus: -${first_vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${second_vehicle_payload_file}= 2020-09-vehicule-temporal-representation-sample.jsonld -${bus_payload_file}= 2020-08-bus-temporal-representation-sample.jsonld +${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 *** Test Cases *** TIMEREL TIMEAT EXPECTATION_FILE 021_14_01 After [Tags] te-query 5_7_4 - after 2020-08-01T12:04:00Z vehicles-temporal-representation-021-14-01-expectation.json + after 2020-08-01T12:04:00Z vehicles-temporal-representation-021-14-01.json 021_14_02 Before [Tags] te-query 5_7_4 - before 2020-09-01T13:06:00Z vehicles-temporal-representation-021-14-02-expectation.json + before 2020-09-01T13:06:00Z vehicles-temporal-representation-021-14-02.json *** Keywords *** @@ -49,13 +49,13 @@ Query the temporal evolution of entities ... ${response.json()} Setup Initial Entities - ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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/RetrieveTemporalEvolutionOfEntity/020_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot index 26606fce..bd0a9593 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** ${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${vehicle_expectation_file}= vehicle-temporal-representation-020-01-expectation.jsonld +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld +${vehicle_expectation_file}= vehicle-temporal-representation-020-01.jsonld *** Test Cases *** @@ -31,7 +31,7 @@ ${vehicle_expectation_file}= vehicle-temporal-representation-020-01-expectati *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot index 09a5c1f2..24548275 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${vehicle_expectation_file}= vehicle-temporal-representation-020-02-expectation.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld +${vehicle_expectation_file}= vehicle-temporal-representation-020-02.jsonld *** Test Cases *** @@ -32,7 +32,7 @@ ${vehicle_expectation_file}= vehicle-temporal-representation-020-02-expectati *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot index 13e462fb..bd666384 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot @@ -12,9 +12,9 @@ Test Template Retrieve the temporal evolution of certain attributes of an *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${vehicle_expectation_file}= vehicle-temporal-representation-020-03-expectation.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld +${vehicle_expectation_file}= vehicle-temporal-representation-020-03.jsonld *** Test Cases *** ATTRS EXPECTED_RESULT @@ -41,7 +41,7 @@ Retrieve the temporal evolution of certain attributes of an entity ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot index 6e540f28..c0333dd3 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot @@ -12,20 +12,20 @@ Test Template Retrieve the temporal evolution of an entity matching the gi *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-sample.jsonld *** Test Cases *** TIMEREL TIMEAT ENDTIMEAT VEHICLE_EXPECTATION_FILE 020_04_01 After [Tags] te-retrieve 5_7_3 - after 2020-08-01T13:03:00Z ${EMPTY} vehicle-temporal-representation-020-04-01-expectation.jsonld + after 2020-08-01T13:03:00Z ${EMPTY} vehicle-temporal-representation-020-04-01.jsonld 020_04_02 Before [Tags] te-retrieve 5_7_3 - before 2020-08-01T12:05:00Z ${EMPTY} vehicle-temporal-representation-020-04-02-expectation.jsonld + before 2020-08-01T12:05:00Z ${EMPTY} vehicle-temporal-representation-020-04-02.jsonld 020_04_03 Between [Tags] te-retrieve 5_7_3 - between 2020-08-01T12:00:00Z 2020-08-01T13:00:00Z vehicle-temporal-representation-020-04-03-expectation.jsonld + between 2020-08-01T12:00:00Z 2020-08-01T13:00:00Z vehicle-temporal-representation-020-04-03.jsonld *** Keywords *** @@ -45,7 +45,7 @@ Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot index a093e132..d7d3a7c0 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot @@ -12,17 +12,17 @@ Test Template Retrieve the temporal evolution of the last N instances of e *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-multiple-instances-sample.jsonld *** Test Cases *** LASTN VEHICLE_EXPECTATION_FILE 020_05_01 Retrieve Some Instances [Tags] te-retrieve 5_7_3 - ${10} vehicle-temporal-representation-020-05-01-expectation.jsonld + ${10} vehicle-temporal-representation-020-05-01.jsonld 020_05_02 Retrieve All Instances [Tags] te-retrieve 5_7_3 - ${20} vehicle-temporal-representation-020-05-02-expectation.jsonld + ${20} vehicle-temporal-representation-020-05-02.jsonld *** Keywords *** @@ -40,7 +40,7 @@ Retrieve the temporal evolution of the last N instances of entity attributes ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot index 512691e2..91d20cac 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-sample.jsonld *** Test Cases *** @@ -33,7 +33,7 @@ ${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.json *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot index 91780611..e78207a4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot @@ -12,8 +12,8 @@ Test Template Retrieve the temporal evolution of an entity with an invalid *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-sample.jsonld *** Test Cases *** TIMEREL TIMEAT ENDTIMEAT @@ -44,7 +44,7 @@ Retrieve the temporal evolution of an entity with an invalid request content Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot index 3804078d..b70232cb 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot @@ -11,9 +11,9 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld -${vehicle_expectation_file}= vehicle-temporal-representation-020-10-expectation.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld +${vehicle_expectation_file}= vehicle-temporal-representation-020-10.jsonld *** Test Cases *** @@ -34,7 +34,7 @@ ${vehicle_expectation_file}= vehicle-temporal-representation-020-10-expectati *** Keywords *** Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot index fe81ed1d..23e151a5 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot @@ -12,23 +12,23 @@ Test Template Retrieve the temporal evolution of an entity with the aggreg *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicule-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** AGGRMETHODS AGGRPERIODDURATION ATTRS VEHICLE_EXPECTATION_FILE 020_11_01 One aggregate method aggregated by one hour duration [Tags] te-retrieve 5_7_3 4_5_19 since_v1.4.1 - avg PT1H ${EMPTY} vehicle-temporal-representation-020-11-01-expectation.json + avg PT1H ${EMPTY} vehicle-temporal-representation-020-11-01.json 020_11_02 One aggregate method aggregated by one hour duration asking for one attribute [Tags] te-retrieve 5_7_3 4_5_19 since_v1.4.1 - avg PT1H fuelLevel vehicle-temporal-representation-020-11-02-expectation.json + avg PT1H fuelLevel vehicle-temporal-representation-020-11-02.json 020_11_03 Multiple aggregate methods aggregated by one hour duration [Tags] te-retrieve 5_7_3 4_5_19 since_v1.4.1 - avg,max PT1H ${EMPTY} vehicle-temporal-representation-020-11-03-expectation.json + avg,max PT1H ${EMPTY} vehicle-temporal-representation-020-11-03.json 020_11_04 Multiple aggregate methods aggregated by one day duration [Tags] te-retrieve 5_7_3 4_5_19 since_v1.4.1 - min,max P1D ${EMPTY} vehicle-temporal-representation-020-11-04-expectation.json + min,max P1D ${EMPTY} vehicle-temporal-representation-020-11-04.json *** Keywords *** @@ -50,7 +50,7 @@ Retrieve the temporal evolution of an entity with the aggregated temporal repres ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot index d995a827..f064d8af 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot @@ -12,17 +12,17 @@ Test Template Retrieve Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= vehicle-language-property-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= vehicle-language-property-temporal-representation.jsonld *** Test Cases *** REPRESENTATION EXPECTATION_FILENAME 020_12_01 Retrieve the normalized temporal representation of an entity with a LanguageProperty property [Tags] te-retrieve 5_7_3 4_5_7 4_5_18 since_v1.4.1 - ${EMPTY} vehicle-language-property-normalized-temporal-representation-expectation.jsonld + ${EMPTY} vehicle-language-property-normalized-temporal-representation.jsonld 020_12_02 Retrieve the simplified temporal representation of an entity with a LanguageProperty property [Tags] te-retrieve 5_7_3 4_5_9 4_5_18 since_v1.4.1 - temporalValues vehicle-language-property-simplified-temporal-representation-expectation.jsonld + temporalValues vehicle-language-property-simplified-temporal-representation.jsonld *** Keywords *** @@ -40,7 +40,7 @@ Retrieve Temporal Entity ... ${response.json()} Create Temporal Entity - ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} + ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${create_response}= Create Temporal Representation Of Entity ... ${vehicle_payload_file} ... ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot index 85545c9b..d722c601 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot @@ -17,16 +17,16 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME 003_01_01 MinimalEntity [Tags] be-create 5_6_7 - building-minimal-sample.jsonld + building-minimal.jsonld 003_01_02 EntityWithSimpleProperties [Tags] be-create 5_6_7 - building-simple-attributes-sample.jsonld + building-simple-attributes.jsonld 003_01_03 EntityWithSimpleRelationships [Tags] be-create 5_6_7 - building-relationship-sample.jsonld + building-relationship.jsonld 003_01_04 EntityWithRelationshipsProperties [Tags] be-create 5_6_7 - building-relationship-of-property-sample.jsonld + building-relationship-of-property.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot index 13b39dbc..5c7af583 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot @@ -23,9 +23,9 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} Set Suite Variable ${second_entity_id} # TODO: Use Load Test Sample keyword instead - ${first_entity}= Load Entity building-minimal-sample.jsonld ${first_entity_id} - ${second_entity}= Load Entity building-minimal-sample.jsonld ${second_entity_id} - ${already_existing_entity}= Load Entity building-minimal-sample.jsonld ${existing_entity_id} + ${first_entity}= Load Entity building-minimal.jsonld ${first_entity_id} + ${second_entity}= Load Entity building-minimal.jsonld ${second_entity_id} + ${already_existing_entity}= Load Entity building-minimal.jsonld ${existing_entity_id} @{entities_to_be_created}= Create List ${first_entity} ${second_entity} ${already_existing_entity} ${response}= Batch Create Entities @{entities_to_be_created} @@ -36,6 +36,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: &{expected_batch_operation_result}= Create Batch Operation Result ... ${expected_successful_entities_ids} ... ${expected_failed_entities_ids} + Check Response Status Code 207 ${response.status_code} Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} ${response.json()} ${expected_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} ${response1}= Query Entities @@ -50,7 +51,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Keywords *** Setup Initial Entity ${existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${create_response}= Create Entity building-minimal-sample.jsonld ${existing_entity_id} + ${create_response}= Create Entity building-minimal.jsonld ${existing_entity_id} Check Response Status Code 201 ${create_response.status_code} Set Suite Variable ${existing_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_03.robot index dfa686db..749cfeec 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_03.robot @@ -10,10 +10,10 @@ Test Template Create Batch Entity With Invalid Request Scenarios *** Test Cases *** FILENAME PROBLEM_TYPE 003_03_01 InvalidJson [Tags] be-create 5_6_7 - batch/invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + batch/invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 003_03_02 EmptyJson [Tags] be-create 5_6_7 - batch/empty-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + batch/empty.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot index 3620cfd6..f8a786cc 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot @@ -20,7 +20,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @@ -43,7 +43,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot index 2e1f63d7..d2b017bd 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot @@ -20,7 +20,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_JSON} @@ -38,7 +38,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_JSON} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_06.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_06.robot index e8980eaf..0efc4737 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_06.robot @@ -15,7 +15,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Documentation] Check that an HTTP error response of type BadRequestData is raised if the Content-Type header is "application/json" and the request payload body (as JSON) contains a "@context" term [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} - ${entity}= Load Entity building-simple-attributes-sample.jsonld ${entity_id} + ${entity}= Load Entity building-simple-attributes.jsonld ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_JSON} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot index e84b5ba6..7b2ead68 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot @@ -19,7 +19,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.jsonld ${entity_id} + ${entity}= Load Entity building-simple-attributes.jsonld ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_LD_JSON} @@ -38,7 +38,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} Set Test Variable ${entity_id} - ${entity}= Load Entity building-simple-attributes-sample.jsonld ${entity_id} + ${entity}= Load Entity building-simple-attributes.jsonld ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_LD_JSON} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_08.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_08.robot index d4eb3ed2..389bc846 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_08.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_08.robot @@ -15,7 +15,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Documentation] Check that an HTTP error response of type BadRequestData is raised if the Content-Type header is "application/ld+json" and the request payload body does not contain a @context term [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} - ${entity}= Load Entity building-simple-attributes-sample.json ${entity_id} + ${entity}= Load Entity building-simple-attributes.json ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities @{entities_to_be_created} content_type=${CONTENT_TYPE_LD_JSON} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_09.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_09.robot index a634b394..d5b90bee 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_09.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_09.robot @@ -15,7 +15,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Documentation] Check that an HTTP error response of type BadRequestData is raised if the Content-Type header is "application/ld+json" and a JSON-LD Link header is present in the incoming HTTP request [Tags] be-create 6_3_5 ${entity_id}= Generate Random Entity Id ${building_id_prefix} - ${entity}= Load Entity building-simple-attributes-sample.jsonld ${entity_id} + ${entity}= Load Entity building-simple-attributes.jsonld ${entity_id} @{entities_to_be_created}= Create List ${entity} ${response}= Batch Create Entities diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_10.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_10.robot index d38303b6..5aac2a07 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_10.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_10.robot @@ -21,8 +21,8 @@ ${building_id_prefix}= urn:ngsi-ld:Building: Set Suite Variable ${first_entity_id} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} Set Suite Variable ${second_entity_id} - ${first_entity}= Load Entity building-minimal-sample.jsonld ${first_entity_id} - ${second_entity}= Load Entity building-minimal-sample.jsonld ${second_entity_id} + ${first_entity}= Load Entity building-minimal.jsonld ${first_entity_id} + ${second_entity}= Load Entity building-minimal.jsonld ${second_entity_id} @{entities_to_be_created}= Create List ${first_entity} ${second_entity} ${first_entity} ${response}= Batch Create Entities @{entities_to_be_created} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot index 9c488889..88b25929 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot @@ -31,7 +31,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Keywords *** Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${create_response1}= Create Entity building-simple-attributes-sample.jsonld ${first_entity_id} + ${create_response1}= Create Entity building-simple-attributes.jsonld ${first_entity_id} Check Response Status Code 201 ${create_response1.status_code} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} ${create_response2}= Create Entity building-simple-attributes-sample.jsonld ${second_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot index 52ebe3e6..0e6ebc08 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot @@ -26,9 +26,11 @@ ${building_id_prefix}= urn:ngsi-ld:Building: @{expected_successful_entities_ids}= Create List ${existing_entity_id} @{expected_failed_entities_ids}= Create List ${new_entity_id} Set Test Variable ${expected_successful_entities_ids} + &{response1}= Create Batch Operation Result ... ${expected_successful_entities_ids} ... ${expected_failed_entities_ids} + Check Response Status Code 207 ${response.status_code} Check Response Body Containing Batch Operation Result ${response1} ${response.json()} ${expected_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} @@ -42,6 +44,6 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Keywords *** Setup Initial Entity ${existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${create_response}= Create Entity building-simple-attributes-sample.jsonld ${existing_entity_id} + ${create_response}= Create Entity building-simple-attributes.jsonld ${existing_entity_id} Check Response Status Code 201 ${create_response.status_code} Set Test Variable ${existing_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_03.robot index 365d4757..ff22f729 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_03.robot @@ -10,10 +10,10 @@ Test Template Batch Delete Entity With Invalid Request Scenarios *** Test Cases *** FILENAME PROBLEM_TYPE 006_03_01 InvalidJson [Tags] be-delete 5_6_10 - batch/invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + batch/invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 006_03_02 EmptyJson [Tags] be-delete 5_6_10 - batch/empty-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + batch/empty.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_04.robot index 34d343bb..459fa6de 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_04.robot @@ -34,6 +34,6 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Keywords *** Setup Initial Entity ${entity_id}= Generate Random Entity Id ${building_id_prefix} - ${create_response}= Create Entity building-simple-attributes-sample.jsonld ${entity_id} + ${create_response}= Create Entity building-simple-attributes.jsonld ${entity_id} Check Response Status Code 201 ${create_response.status_code} Set Test Variable ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot index eca48d12..f02488a8 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -13,19 +13,19 @@ Test Template Batch Update Entity Scenarios *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_payload_filename}= building-simple-attributes-sample.jsonld +${entity_payload_filename}= building-simple-attributes.jsonld *** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME 005_01_01 EntityWithSimpleProperties [Tags] be-update 5_6_9 - building-simple-attributes-sample.jsonld fragmentEntities/empty-fragment.json + building-simple-attributes.jsonld fragmentEntities/empty-fragment.json 005_01_02 EntityWithSimpleRelationships [Tags] be-update 5_6_9 - building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json + building-relationship.jsonld fragmentEntities/locatedAt-fragment.json 005_01_03 EntityWithRelationshipsProperties [Tags] be-update 5_6_9 - building-relationship-of-property-sample.jsonld fragmentEntities/airQualityLevel-with-relationship-fragment.json + building-relationship-of-property.jsonld fragmentEntities/airQualityLevel-with-relationship-fragment.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot index 0312fe87..97f8ebdb 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -13,19 +13,19 @@ Test Template Batch Update Entity With NoOverwrite Option Scenarios *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_payload_filename}= building-simple-attributes-sample.jsonld +${entity_payload_filename}= building-simple-attributes.jsonld *** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME EXPECTED_STATUS 005_02_01 EntityWithExistingAttributes [Tags] be-update 5_6_9 - building-simple-attributes-sample.jsonld fragmentEntities/empty-fragment.json 204 + building-simple-attributes.jsonld fragmentEntities/empty-fragment.json 204 005_02_02 EntityWithNewAttribute [Tags] be-update 5_6_9 - building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json 204 + building-relationship.jsonld fragmentEntities/locatedAt-fragment.json 204 005_02_03 EntityWithNewAndExistingAttribute [Tags] be-update 5_6_9 - building-location-attribute-sample.jsonld fragmentEntities/location-fragment.json 204 + building-location-attribute.jsonld fragmentEntities/location-fragment.json 204 *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot index 81bbaba3..ea069a31 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Initial Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_payload_filename}= building-simple-attributes-sample.jsonld +${entity_payload_filename}= building-simple-attributes.jsonld ${update_fragment_filename}= fragmentEntities/simple-attributes-relationship-of-property-fragment.json @@ -21,13 +21,13 @@ ${update_fragment_filename}= fragmentEntities/simple-attributes-relationship- [Documentation] Check that one can update a batch of non-existing and existing entities [Tags] be-update 5_6_9 ${first_existing_entity}= Load Entity - ... building-relationship-of-property-sample.jsonld + ... building-relationship-of-property.jsonld ... ${first_existing_entity_id} ${second_existing_entity}= Load Entity - ... building-relationship-of-property-sample.jsonld + ... building-relationship-of-property.jsonld ... ${second_existing_entity_id} ${new_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${new_entity}= Load Entity building-relationship-of-property-sample.jsonld ${new_entity_id} + ${new_entity}= Load Entity building-relationship-of-property.jsonld ${new_entity_id} @{entities_to_be_updated}= Create List ${first_existing_entity} ${second_existing_entity} ${new_entity} ${response}= Batch Update Entities @{entities_to_be_updated} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_04.robot index 8a183135..dda91ad5 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_04.robot @@ -10,10 +10,10 @@ Test Template Batch Update Entity With Invalid Request Scenarios *** Test Cases *** FILENAME PROBLEM_TYPE 005_04_01 InvalidJson [Tags] be-update 5_6_9 - batch/invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + batch/invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 005_04_02 InvalidJsonLd [Tags] be-update 5_6_9 - batch/invalid-json-ld-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + batch/invalid-json-ld.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot index 809ee1fc..4a38b317 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot @@ -17,13 +17,13 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME 004_01_01 EntityWithSimpleProperties [Tags] be-upsert 5_6_8 - building-simple-attributes-sample.jsonld + building-simple-attributes.jsonld 004_01_02 EntityWithSimpleRelationships [Tags] be-upsert 5_6_8 - building-relationship-sample.jsonld + building-relationship.jsonld 004_01_03 EntityWithRelationshipsProperties [Tags] be-upsert 5_6_8 - building-relationship-of-property-sample.jsonld + building-relationship-of-property.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot index ca99756b..7212be86 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot @@ -17,13 +17,13 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME 004_02_01 EntityWithSimpleProperties [Tags] be-upsert 5_6_8 - building-simple-attributes-sample.jsonld + building-simple-attributes.jsonld 004_02_02 EntityWithSimpleRelationships [Tags] be-upsert 5_6_8 - building-relationship-sample.jsonld + building-relationship.jsonld 004_02_03 EntityWithRelationshipsProperties [Tags] be-upsert 5_6_8 - building-relationship-of-property-sample.jsonld + building-relationship-of-property.jsonld *** Keywords *** @@ -53,8 +53,8 @@ Prepare Entities To Upsert [Arguments] ${filename} ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-minimal-sample.jsonld ${first_existing_entity_id} - Create Entity building-minimal-sample.jsonld ${second_existing_entity_id} + Create Entity building-minimal.jsonld ${first_existing_entity_id} + Create Entity building-minimal.jsonld ${second_existing_entity_id} Set Test Variable ${first_existing_entity_id} Set Test Variable ${second_existing_entity_id} ${new_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot index 76410037..7cd2590f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -18,13 +18,13 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME 004_03_01 EntityWithSimpleProperties [Tags] be-upsert 5_6_8 - building-simple-attributes-sample.jsonld + building-simple-attributes.jsonld 004_03_02 EntityWithSimpleRelationships [Tags] be-upsert 5_6_8 - building-relationship-sample.jsonld + building-relationship.jsonld 004_03_03 EntityWithRelationshipsProperties [Tags] be-upsert 5_6_8 - building-relationship-of-property-sample.jsonld + building-relationship-of-property.jsonld *** Keywords *** @@ -49,7 +49,7 @@ Batch Upsert Existing Entities Scenarios Setup Initial Entities ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${create_response1}= Create Entity building-minimal-sample.jsonld ${first_existing_entity_id} + ${create_response1}= Create Entity building-minimal.jsonld ${first_existing_entity_id} Check Response Status Code 201 ${create_response1.status_code} Set Test Variable ${first_existing_entity_id} ${second_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot index c96a4ed7..6ed310ed 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot @@ -13,19 +13,19 @@ Test Template Batch Upsert Entities With Update Option Scenarios *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${existing_entity_payload_filename}= building-minimal-sample.jsonld +${existing_entity_payload_filename}= building-minimal.jsonld *** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME 004_04_01 EntityWithSimpleProperties [Tags] be-upsert 5_6_8 - building-simple-attributes-sample.jsonld fragmentEntities/simple-attributes-fragment.json + building-simple-attributes.jsonld fragmentEntities/simple-attributes-fragment.json 004_04_02 EntityWithSimpleRelationships [Tags] be-upsert 5_6_8 - building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json + building-relationship.jsonld fragmentEntities/locatedAt-fragment.json 004_04_03 EntityWithRelationshipsProperties [Tags] be-upsert 5_6_8 - building-relationship-of-property-sample.jsonld fragmentEntities/simple-attributes-relationship-of-property-fragment.json + building-relationship-of-property.jsonld fragmentEntities/simple-attributes-relationship-of-property-fragment.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot index 936cc776..c96f5de8 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot @@ -20,9 +20,9 @@ ${building_id_prefix}= urn:ngsi-ld:Building: ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} ${third_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${first_entity}= Load Entity building-minimal-sample.jsonld ${first_entity_id} - ${second_entity}= Load Entity building-minimal-sample.jsonld ${second_entity_id} - ${third_entity}= Load Entity building-minimal-sample.jsonld ${third_entity_id} + ${first_entity}= Load Entity building-minimal.jsonld ${first_entity_id} + ${second_entity}= Load Entity building-minimal.jsonld ${second_entity_id} + ${third_entity}= Load Entity building-minimal.jsonld ${third_entity_id} ${invalid_entity}= Remove Entity Type ${third_entity} @{entities_to_be_upserted}= Create List ${first_entity} ${second_entity} ${invalid_entity} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_06.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_06.robot index 4d8211e6..29cbb283 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_06.robot @@ -10,10 +10,10 @@ Test Template Batch Upsert Entity With Invalid Request Scenarios *** Test Cases *** FILENAME PROBLEM_TYPE 004_06_01 InvalidJson [Tags] be-upsert 5_6_8 - batch/invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + batch/invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 004_06_02 InvalidJsonLd [Tags] be-upsert 5_6_8 - batch/invalid-json-ld-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + batch/invalid-json-ld.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_07.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_07.robot index 943666e9..abd5aad4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_07.robot @@ -19,8 +19,8 @@ ${building_id_prefix}= urn:ngsi-ld:Building: [Tags] be-upsert 5_6_8 since_v1.5.1 ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${first_entity}= Load Entity building-minimal-sample.jsonld ${first_entity_id} - ${second_entity}= Load Entity building-minimal-sample.jsonld ${second_entity_id} + ${first_entity}= Load Entity building-minimal.jsonld ${first_entity_id} + ${second_entity}= Load Entity building-minimal.jsonld ${second_entity_id} @{entities_to_be_upserted}= Create List ${first_entity} ${second_entity} ${first_entity} ${response}= Batch Upsert Entities @{entities_to_be_upserted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot index a164793e..3f963fb6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot @@ -17,16 +17,16 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME CONTENT_TYPE 001_01_01 MinimalEntity [Tags] e-create 5_6_1 - building-minimal-sample.json application/json + building-minimal.json application/json 001_01_02 EntityWithSimpleProperties [Tags] e-create 5_6_1 - building-simple-attributes-sample.jsonld application/ld+json + building-simple-attributes.jsonld application/ld+json 001_01_03 EntityWithRelationshipsProperties [Tags] e-create 5_6_1 - building-relationship-of-property-sample.jsonld application/ld+json + building-relationship-of-property.jsonld application/ld+json 001_01_04 EntityWithLocationAttribute [Tags] e-create 5_6_1 - building-location-attribute-sample.jsonld application/ld+json + building-location-attribute.jsonld application/ld+json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot index 03c4f2ef..2878b9a1 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot @@ -10,13 +10,13 @@ Test Template Create Entity With Invalid Request Scenarios *** Test Cases *** FILENAME ERROR_TYPE 001_02_01 InvalidJson [Tags] e-create 5_6_1 - invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 001_02_02 EmptyJson [Tags] e-create 5_6_1 - empty-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + empty.jsonld ${ERROR_TYPE_INVALID_REQUEST} 001_02_03 EntityWithNoContext [Tags] e-create 5_6_1 - building-minimal-sample.json ${ERROR_TYPE_BAD_REQUEST_DATA} + building-minimal.json ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_03.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_03.robot index d78c44d2..2c1d7e14 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_03.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-minimal-sample.jsonld +${filename}= building-minimal.jsonld ${content_type}= application/ld+json diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot index 8badd392..58f228c6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot index 375fd6aa..4fcab0c4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_06.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_06.robot index 0a6cc028..464cfe76 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_06.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld +${filename}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot index eb74295b..20cb883e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld +${filename}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_08.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_08.robot index 6ec9f5e5..2b44b19f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_08.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_08.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.json +${filename}= building-simple-attributes.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_09.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_09.robot index 13e06ecb..47917f10 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_09.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_09.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-simple-attributes-sample.jsonld +${filename}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot index 6948bf84..2dcf2ec5 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_10.robot @@ -17,7 +17,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: *** Test Cases *** FILENAME CONTENT_TYPE 001_10_01 EntityWithLanguageProperty [Tags] e-create 5_6_1 4_5_18 since_v1.4.1 - building-language-property-sample.jsonld application/ld+json + building-language-property.jsonld application/ld+json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot index bc5210dd..a9ecdf6e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot @@ -27,7 +27,7 @@ ${building_id_prefix}= urn:ngsi-ld:Building: Setup Initial Entity ${entity_id}= Generate Random Entity Id ${building_id_prefix} ${response}= Create Entity Selecting Content Type - ... building-simple-attributes-sample.jsonld + ... building-simple-attributes.jsonld ... ${entity_id} ... application/ld+json Check Response Status Code 201 ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot index 1a1c9c92..30a523c2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot @@ -13,16 +13,16 @@ Test Template Append Attributes Without Params *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_FILENAME 010_01_01 Append entity attributes [Tags] ea-append 5_6_3 - 204 vehicle-new-attribute-fragment.jsonld vehicle-speed-appended-expectation.jsonld + 204 vehicle-new-attribute-fragment.jsonld vehicle-speed-appended.jsonld 010_01_02 Append entity attributes with different datasetid [Tags] ea-append 5_6_3 - 204 vehicle-speed-different-datasetid-fragment.jsonld vehicle-speed-different-datasetid-expectation.jsonld + 204 vehicle-speed-different-datasetid-fragment.jsonld vehicle-speed-different-datasetid.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_02.robot index 630a3ff4..dd5c5b63 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_02.robot @@ -12,7 +12,7 @@ Test Template Append Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld ${fragment_filename}= vehicle-attribute-to-add-fragment.jsonld ${status_code}= 400 ${invalid_fragment_filename}= invalid-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot index 9186b2df..564840ba 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_04.robot @@ -13,14 +13,14 @@ Test Template Append Attributes With Params *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_FILENAME 010_04_01 Append entity attributes and ignore existing multi-attribute instance - 204 vehicle-attribute-to-add-fragment.jsonld vehicle-speed-appended-expectation.jsonld + 204 vehicle-attribute-to-add-fragment.jsonld vehicle-speed-appended.jsonld 010_04_02 Append entity attributes with a new multi-attribute instance - 204 vehicle-speed-different-datasetid-fragment.jsonld vehicle-speed-different-datasetid-expectation.jsonld + 204 vehicle-speed-different-datasetid-fragment.jsonld vehicle-speed-different-datasetid.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_05.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_05.robot index 7aa6734e..48022c6a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_05.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld ${fragment_filename}= vehicle-attribute-to-add-fragment.jsonld ${status_code}= 400 ${invalid_fragment_filename}= invalid-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot index 99a5f908..aa010555 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_06.robot @@ -13,13 +13,13 @@ Test Template Append Attributes Without Params *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_FILENAME 010_06_01 Append a LanguageProperty property [Tags] ea-append 5_6_3 4_5_18 since_v1.4.1 - 204 vehicle-new-language-property-fragment.jsonld vehicle-language-property-appended-expectation.jsonld + 204 vehicle-new-language-property-fragment.jsonld vehicle-language-property-appended.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot index 4c2ab4e6..2f2ef05f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_07.robot @@ -25,7 +25,7 @@ ${scope_fragment_filename}= one-scope-fragment.json ... ${scope_fragment_filename} ... ${CONTENT_TYPE_JSON} Check Response Status Code 204 ${response.status_code} - ${expectation_filename}= Set Variable building-minimal-with-one-scope-expectation.json + ${expectation_filename}= Set Variable building-minimal-with-one-scope.json ${entity_expectation_payload}= Load Test Sample entities/expectations/${expectation_filename} ${entity_id} ${response}= Retrieve Entity by Id ... ${entity_id} @@ -42,7 +42,7 @@ ${scope_fragment_filename}= one-scope-fragment.json ... ${CONTENT_TYPE_JSON} ... noOverwrite Check Response Status Code 204 ${response.status_code} - ${expectation_filename}= Set Variable building-minimal-with-two-scopes-expectation.json + ${expectation_filename}= Set Variable building-minimal-with-two-scopes.json ${entity_expectation_payload}= Load Test Sample entities/expectations/${expectation_filename} ${entity_id} ${response}= Retrieve Entity by Id ... ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot index eee8857f..e92c21dd 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot @@ -14,17 +14,17 @@ Test Template Delete Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${status_code}= 204 -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld ${attribute_id}= speed *** Test Cases *** DATASETID DELETEALL EXPECTATION_FILENAME 013_01_01 Delete an attribute with the default instance - ${EMPTY} false vehicle-delete-default-speed-expectation.jsonld + ${EMPTY} false vehicle-delete-default-speed.jsonld 013_01_02 Delete an attribute with the datasetId - urn:ngsi-ld:Property:gpsBxyz123-speed false vehicle-delete-datasetid-speed-expectation.jsonld + urn:ngsi-ld:Property:gpsBxyz123-speed false vehicle-delete-datasetid-speed.jsonld 013_01_03 Delete all target attribute instances - ${EMPTY} true vehicle-delete-deleteall-speed-expectation.jsonld + ${EMPTY} true vehicle-delete-deleteall-speed.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_02.robot index 363032da..36b23f39 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_02.robot @@ -12,7 +12,7 @@ Test Template Delete Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld *** Test Cases *** ENTITY_ID ATTRIBUTE_ID EXPECTED_STATUS_CODE diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_03.robot index 2fe08d7e..b1c0448d 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_03.robot @@ -13,7 +13,7 @@ Test Template Delete Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${status_code}= 404 -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld *** Test Cases *** ENTITY_ID ATTRIBUTE_ID DATASETID diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot index df4b17f8..bc4464f0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_04.robot @@ -13,7 +13,7 @@ Test Teardown Delete Initial Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= building-minimal-with-one-scope.json -${expectation_filename}= building-minimal-compacted-expectation.json +${expectation_filename}= building-minimal-compacted.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot index 5a0b22a4..214864fb 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot @@ -13,15 +13,15 @@ Test Template Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld ${status_code}= 204 *** Test Cases *** FRAGMENT_FILENAME ATTRIBUTE_ID EXPECTATION_FILENAME 012_01_01 Check that one can partially update an attribute - vehicle-isparked-fragment.jsonld isParked vehicle-isparked-update-expectation.jsonld + vehicle-isparked-fragment.jsonld isParked vehicle-isparked-update.jsonld 012_01_02 Check that one can partially update an attribute by specifying the datasetId - vehicle-speed-equal-datasetid-fragment.jsonld speed vehicle-update-speed-expectation.jsonld + vehicle-speed-equal-datasetid-fragment.jsonld speed vehicle-update-speed.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_02.robot index 11940056..1e7e675a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_02.robot @@ -12,7 +12,7 @@ Test Template Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld ${status_code}= 400 diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot index ade2e05b..c6fbdec3 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot @@ -12,7 +12,7 @@ Test Template Partial Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld ${status_code}= 404 ${default_attr_id}= speed diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot index 91620737..10948bc1 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_04.robot @@ -13,14 +13,14 @@ Test Template Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Building: -${filename}= building-language-property-sub-property-sample.jsonld +${filename}= building-language-property-sub-property.jsonld ${status_code}= 204 *** Test Cases *** FRAGMENT_FILENAME ATTRIBUTE_ID EXPECTATION_FILENAME 012_04_01 Check that one can partially update a LanguageProperty property [Tags] ea-partial-update 5_6_4 4_5_18 since_v1.4.1 - building-language-property-fragment.jsonld street building-language-property-update-expectation.jsonld + building-language-property-fragment.jsonld street building-language-property-update.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot index f1377d4f..cdc9c053 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot @@ -13,16 +13,16 @@ Test Template Update Attributes *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-two-datasetid-attributes-sample.jsonld +${filename}= vehicle-two-datasetid-attributes.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_RESPONSE_FILENAME EXPECTATION_FILENAME 011_01_01 Check that one can update existing attributes with no datasetId - 204 vehicle-speed-two-datasetid-01-fragment.jsonld ${EMPTY} expectations/vehicle-update-attributes-expectation.jsonld + 204 vehicle-speed-two-datasetid-01-fragment.jsonld ${EMPTY} expectations/vehicle-update-attributes.jsonld 011_01_02 Check that one can update existing attributes with the datasetId - 204 vehicle-speed-two-datasetid-02-fragment.jsonld ${EMPTY} expectations/vehicle-update-datasetid-attributes-expectation.jsonld + 204 vehicle-speed-two-datasetid-02-fragment.jsonld ${EMPTY} expectations/vehicle-update-datasetid-attributes.jsonld 011_01_03 Check that one can update only some attributes while unknown are ignored - 204 vehicle-speed-two-datasetid-03-fragment.jsonld ${EMPTY} expectations/vehicle-multi-attributes-expectation.jsonld + 204 vehicle-speed-two-datasetid-03-fragment.jsonld ${EMPTY} expectations/vehicle-multi-attributes.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_02.robot index 09607dd0..57b5ba0c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_02.robot @@ -37,7 +37,7 @@ Initialize Environment ${entity_id}= Generate Random Entity Id ${vehicle_id_prefix} Set Test Variable ${entity_id} ${response}= Create Entity Selecting Content Type - ... vehicle-two-datasetid-attributes-sample.jsonld + ... vehicle-two-datasetid-attributes.jsonld ... ${entity_id} ... ${CONTENT_TYPE_LD_JSON} Check Response Status Code 201 ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_04.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_04.robot index cffffe4a..b47bf235 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_04.robot @@ -11,12 +11,12 @@ Test Template Update entity attributes with invalid entity fragments *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-speed-two-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid.jsonld *** Test Cases *** 011_04_01 Update entity attributes with invalid entity fragments - vehicle-speed-two-datasetid-sample.jsonld invalid-fragment.jsonld + vehicle-speed-two-datasetid.jsonld invalid-fragment.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot index becf67af..379ebefe 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_05.robot @@ -24,7 +24,7 @@ ${scope_fragment_filename}= one-scope-fragment.json ... ${scope_fragment_filename} ... ${CONTENT_TYPE_JSON} Check Response Status Code 204 ${response.status_code} - ${expectation_filename}= Set Variable building-minimal-with-one-scope-expectation.json + ${expectation_filename}= Set Variable building-minimal-with-one-scope.json ${entity_expectation_payload}= Load Test Sample entities/expectations/${expectation_filename} ${entity_id} ${response}= Retrieve Entity by Id ... ${entity_id} @@ -35,13 +35,13 @@ ${scope_fragment_filename}= one-scope-fragment.json 011_05_02 Update scope to an entity not having a scope [Documentation] Check that scope is not added if entity does not already have a scope [Tags] ea-append 5_6_2 4_18 since_v1.5.1 - [Setup] Create Initial Entity building-minimal-sample.json + [Setup] Create Initial Entity building-minimal.json ${response}= Update Entity Attributes ... ${entity_id} ... ${scope_fragment_filename} ... ${CONTENT_TYPE_JSON} Check Response Status Code 207 ${response.status_code} - ${expectation_filename}= Set Variable building-minimal-compacted-expectation.json + ${expectation_filename}= Set Variable building-minimal-compacted.json ${entity_expectation_payload}= Load Test Sample entities/expectations/${expectation_filename} ${entity_id} ${response}= Retrieve Entity by Id ... ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot index 213ceee0..cc49b06f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot @@ -16,9 +16,9 @@ ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: *** Test Cases *** FILENAME EXPECTATION_FILENAME CONTENT_TYPE 007_01_01 Create a temporal representation of an entity - vehicle-create-temporal-representation-sample.jsonld vehicle-temporal-representation-create-expectation.jsonld application/ld+json + vehicle-create-temporal-representation.jsonld vehicle-temporal-representation-create.jsonld application/ld+json 007_01_02 Create a temporal entity with no context - vehicle-create-temporal-representation-without-context-sample.jsonld vehicle-temporal-representation-create-with-no-context-expectation.jsonld application/json + vehicle-create-temporal-representation-without-context.jsonld vehicle-temporal-representation-create-with-no-context.jsonld application/json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_02.robot index 1d39a82f..49659f81 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_02.robot @@ -14,9 +14,9 @@ ${status_code}= 400 *** Test Cases *** FILENAME 007_02_01 Create a temporal entity with an invalid json - vehicle-temporal-representation-invalid-json-sample.jsonld + vehicle-temporal-representation-invalid-json.jsonld 007_02_02 Create a temporal entity with an empty json - vehicle-temporal-representation-empty-json-sample.jsonld + vehicle-temporal-representation-empty-json.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_03.robot index 71e721b2..5c4c2bfe 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_03.robot @@ -14,9 +14,9 @@ ${status_code}= 400 *** Test Cases *** ENTITY_ID FILENAME 007_03_01 Create a temporal entity with missing id - ${EMPTY} vehicle-temporal-representation-without-id-sample.jsonld + ${EMPTY} vehicle-temporal-representation-without-id.jsonld 007_03_02 Create a temporal invalid URI - invalidId vehicle-temporal-representation-sample.jsonld + invalidId vehicle-temporal-representation.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot index e2cdf8ba..b101168e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot @@ -11,7 +11,7 @@ Test Setup Create Initial Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot index 0880d6b5..baa4e31e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot @@ -12,9 +12,9 @@ Suite Teardown Delete Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-create-temporal-representation-sample.jsonld -${update_filename}= vehicle-temporal-representation-update-sample.jsonld -${expectation_filename}= vehicle-temporal-representation-update-expectation.jsonld +${filename}= vehicle-create-temporal-representation.jsonld +${update_filename}= vehicle-temporal-representation-update.jsonld +${expectation_filename}= vehicle-temporal-representation-update.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot index 0e550d27..9e4d4047 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_01.robot @@ -12,9 +12,9 @@ Suite Teardown Delete Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-representation-fragment.jsonld -${expectation_filename}= vehicle-temporal-representation-added-attribute-expectation.jsonld +${expectation_filename}= vehicle-temporal-representation-added-attribute.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_02.robot index d522cb21..960b7db7 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_02.robot @@ -12,7 +12,7 @@ Test Template Add Attribute To Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 400 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_03.robot index dfca906b..46c42b3d 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_03.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 404 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_04.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_04.robot index 59e2245a..24a19441 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AddAttributes/014_04.robot @@ -12,7 +12,7 @@ Test Template Add an Attribute To a Temporal Entity From File *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 400 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot index 8f868ef9..a3d0e607 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot @@ -13,18 +13,18 @@ Test Template Delete Attribute From A Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${status_code}= 204 ${attribute_id}= fuelLevel *** Test Cases *** DELETE_ALL DATASET_ID EXPECTATION_FILE 015_01_01 Delete an attribute from a temporal representation of an entity without deleteAll/datasetId - false ${EMPTY} vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld + false ${EMPTY} vehicle-temporal-representation-delete-fuelLevel.jsonld 015_01_02 Delete an attribute from a temporal representation of an entity with datasetId - false urn:ngsi-ld:Vehicle:12345-fuel vehicle-temporal-representation-delete-fuelLevel-datasetid-expectation.jsonld + false urn:ngsi-ld:Vehicle:12345-fuel vehicle-temporal-representation-delete-fuelLevel-datasetid.jsonld 015_01_03 Delete an attribute from a temporal representation of an entity with deleteAll - true ${EMPTY} vehicle-temporal-representation-deleteall-fuelLevel-expectation.jsonld + true ${EMPTY} vehicle-temporal-representation-deleteall-fuelLevel.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_02.robot index fe31762b..861752c0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_02.robot @@ -13,7 +13,7 @@ Test Template Delete attribute from temporal entity with unknow entity/att *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${status_code}= 400 -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld *** Test Cases *** ENTITY_ID ATTRIBUTE_ID diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_03.robot index 0353c87a..493bdae7 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_03.robot @@ -12,7 +12,7 @@ Test Template Delete An Attribute *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${status_code}= 404 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot index 25161e5a..7c1a3794 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot @@ -12,9 +12,9 @@ Suite Teardown Delete Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${attributeId}= speed -${expectation_filename}= vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld +${expectation_filename}= vehicle-temporal-representation-delete-speed-instanceid.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_02.robot index 7f0eb277..98adc7bc 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_02.robot @@ -13,7 +13,7 @@ Test Template Delete attribute instance *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${status_code}= 400 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_03.robot index 97b94491..dcdb0de0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_03.robot @@ -13,7 +13,7 @@ Test Template Delete An Attribute Instance *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${status_code}= 404 diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot index 1e9461fc..48cfee35 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_01.robot @@ -12,9 +12,9 @@ Suite Teardown Delete Intitial Temporal Representation Of Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-modify-attribute-instance-fragment.jsonld -${expectation_filename}= vehicle-temporal-representation-modify-attribute-instance-expectation.jsonld +${expectation_filename}= vehicle-temporal-representation-modify-attribute-instance.jsonld ${attributeId}= speed diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_02.robot index 7191c02d..b65a5f4b 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_02.robot @@ -13,7 +13,7 @@ Test Template Modify Attribute Instance Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-modify-attribute-instance-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_03.robot index 10d73b83..3b2a8633 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/PartialUpdateAttributeInstance/016_03.robot @@ -13,7 +13,7 @@ Test Template Modify Attribute Instance Temporal Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-temporal-representation-sample.jsonld +${filename}= vehicle-temporal-representation.jsonld ${fragment_filename}= vehicle-temporal-modify-attribute-instance-fragment.jsonld ${status_code}= 404 diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot index 1ff8fec9..8c618ad7 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot @@ -10,8 +10,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_expectation_file_path}= subscriptions/expectations/subscription-028-01-expectation.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_expectation_file_path}= subscriptions/expectations/subscription-028-01.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_02.robot index ccfac130..f4dc443e 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_02.robot @@ -9,9 +9,9 @@ Test Template Create Subscription With Invalid Request *** Test Cases *** FILENAME EXPECTED_STATUS 028_02_01 InvalidJson - subscription-invalid-json-sample.jsonld ${ERROR_TYPE_INVALID_REQUEST} + subscription-invalid-json.jsonld ${ERROR_TYPE_INVALID_REQUEST} 028_02_02 EmptyJson - subscription-empty-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + subscription-empty.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_03.robot index 1685c588..fff953cf 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_03.robot @@ -10,7 +10,7 @@ Test Template Create Subscription With Invalid/Empty Id *** Variables *** -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld *** Test Cases *** ID diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot index ee7a99dd..dde6d4c4 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_05.robot index b11792e1..1a4b19ad 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_05.robot @@ -9,9 +9,9 @@ Test Template Create Subscription With Invalid Throttling *** Test Cases *** FILENAME EXPECTED_STATUS 028_05_01 ThrottlingAndTimeIntervalConjunction - subscription-invalid-throttling-timeInterval-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + subscription-invalid-throttling-timeInterval.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} 028_05_02 NegativeThrottling - subscription-invalid-negative-throttling-sample.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} + subscription-invalid-negative-throttling.jsonld ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot index abee53d5..066f7c38 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot @@ -10,7 +10,7 @@ Suite Setup Setup Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot index bb64269b..7e94cad0 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= subscriptions/subscription-watchedAttributes-sample.jsonld -${third_subscription_payload_file_path}= subscriptions/subscription-inactive-sample.jsonld -${expectation_file_path}= subscriptions/expectations/subscriptions-031-01-expectation.json +${first_subscription_payload_file_path}= subscriptions/subscription.jsonld +${second_subscription_payload_file_path}= subscriptions/subscription-watchedAttributes.jsonld +${third_subscription_payload_file_path}= subscriptions/subscription-inactive.jsonld +${expectation_file_path}= subscriptions/expectations/subscriptions-031-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot index 2d5995b0..0440eb19 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot @@ -12,9 +12,9 @@ Test Template Query Subscriptions With Limit And Page Parameters *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= subscriptions/subscription-watchedAttributes-sample.jsonld -${third_subscription_payload_file_path}= subscriptions/subscription-inactive-sample.jsonld +${first_subscription_payload_file_path}= subscriptions/subscription.jsonld +${second_subscription_payload_file_path}= subscriptions/subscription-watchedAttributes.jsonld +${third_subscription_payload_file_path}= subscriptions/subscription-inactive.jsonld *** Test Cases *** LIMIT OFFSET EXPECTED_SUBSCRIPTION_NUMBER PREV_LINK NEXT_LINK diff --git a/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot index b365e370..69baa4d0 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${expectation_file_path}= subscriptions/expectations/subscriptions-030-03-expectation.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${expectation_file_path}= subscriptions/expectations/subscriptions-030-03.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot index 12f6fcfd..36af1c75 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_01.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot index 69cc5e9b..c14633af 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_02.robot @@ -13,10 +13,10 @@ Suite Teardown After Test *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-timeInterval-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription-timeInterval.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot index 4e934ff7..7257da2b 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_03.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-default.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot index 75939377..dfa3c812 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_04.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active-watchedAttributes.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot index c94b1e8d..4ec55b20 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_05.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active-watchedAttributes-query.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot index 549c4211..a7f2bc3a 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_07.robot @@ -19,7 +19,7 @@ ${subscription_payload_file_path_notificationAttributes} subscriptions/subscr ${subscription_payload_file_path_default_context} subscriptions/subscription-building-entities-active-default-context.jsonld ${building_id_prefix} urn:ngsi-ld:Building: ${notification_server_send_url} http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${date_format} %Y-%m-%dT%H:%M:%SZ ${date_format_with_millis} %Y-%m-%dT%H:%M:%S.%fZ diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot index 35fbe3b2..65213d78 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_08.robot @@ -18,7 +18,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot index 72a5d949..3a5c11ea 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_09.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-active-endpoint-info.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${notification_server_send_url} http://${notification_server_host}:${notification_server_port}/notify diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot index 9f61ff5d..5b3e2eb2 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_10.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-default.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${notification_server_send_url} http://${notification_server_host}:${notification_server_port}/notify ${expected_header_links} <${ngsild_test_suite_context}>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot index bab90df1..b036cf94 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_11.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify ${date_format}= %Y-%m-%dT%H:%M:%SZ diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot index 42eaae30..d3569130 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_12.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot index 336ac77e..7f391cfd 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_13.robot @@ -16,7 +16,7 @@ Suite Teardown After Test ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-active.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot index 31d75153..bd158467 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_14.robot @@ -15,7 +15,7 @@ Suite Teardown After Test ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-accept-jsonld.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${notification_server_send_url} http://${notification_server_host}:${notification_server_port}/notify diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot index a04c3fc9..951aa319 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_15.robot @@ -13,10 +13,10 @@ Suite Teardown After Test *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-valid-throttling-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription-valid-throttling.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${fragment_filename}= airQualityLevel-fragment.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_01.robot index ef421c35..2ff7515a 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_01.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-type-selection.jsonld ${building_id_prefix}= urn:ngsi-ld:Building: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_building_filepath}= building-simple-attributes-sample.jsonld +${entity_building_filepath}= building-simple-attributes.jsonld ${content_type}= application/ld+json diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_02.robot index 25a8cfcc..d9b6f08d 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/046_16_02.robot @@ -16,7 +16,7 @@ ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= subscriptions/subscription-building-entities-type-selection.jsonld ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${notification_server_send_url}= http://${notification_server_host}:${notification_server_port}/notify -${entity_vehicle_filepath}= vehicle-simple-attributes-sample.jsonld +${entity_vehicle_filepath}= vehicle-simple-attributes.jsonld ${content_type}= application/ld+json diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_01.robot index a31ea8f0..dcd45c14 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_01.robot @@ -9,7 +9,7 @@ Test Template Update Subscription With Non present Or Invalid Id *** Variables *** -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update-sample.json +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update.json *** Test Cases *** ID EXPECTED_STATUS_CODE PROBLEM_TYPE diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_02.robot index f28c640a..3c6103a9 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update-sample.json +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot index 5d6edc22..31b5bceb 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-invalid-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-invalid-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot index 2459501e..8ca7ab55 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-null-properties-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-null-properties-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot index a2256913..f5100d6a 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot @@ -11,10 +11,10 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-vehicle-entities-sample.json -${expected_subscription_payload_file_path}= subscriptions/expectations/subscription-vehicle-sample.jsonld -${expected_expanded_subscription_payload_file_path}= subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-vehicle-entities.json +${expected_subscription_payload_file_path}= subscriptions/expectations/subscription-vehicle.jsonld +${expected_expanded_subscription_payload_file_path}= subscriptions/expectations/subscription-vehicle-expanded-types.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot index 060dbcfa..c51ad7a4 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot index 525501e6..d3f6278d 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot @@ -12,13 +12,13 @@ Test Template Activate Paused Subscription With isActive Member *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-inactive-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription-inactive.jsonld *** Test Cases *** SUBSCRIPTION_UPDATE_FRAGMENT_FILE_PATH 029_07_01 ActiveTrue [Tags] sub-update 5_8_2 - subscriptions/fragments/subscription-isActive-true-update-sample.json + subscriptions/fragments/subscription-isActive-true-update.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot index dc3c381a..0a497a27 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot @@ -12,13 +12,13 @@ Test Template Activate Paused Subscription With isActive And ExpiresAt Mem *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-inactive-sample.jsonld +${subscription_payload_file_path}= subscriptions/subscription-inactive.jsonld *** Test Cases *** SUBSCRIPTION_UPDATE_FRAGMENT_FILE_PATH 029_08_01 ActiveTrueExpiresAt [Tags] sub-update 5_8_2 - subscriptions/fragments/subscription-isActive-expiresAt-update-sample.json + subscriptions/fragments/subscription-isActive-expiresAt-update.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot index 1b44edff..4012ed41 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-isActive-false-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-isActive-false-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot index 5192a8e5..5c4cebbc 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix} urn:ngsi-ld:Subscription: -${subscription_payload_file_path} subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path} subscriptions/fragments/subscription-expiresAt-future-update-sample.json +${subscription_payload_file_path} subscriptions/subscription.jsonld +${subscription_update_fragment_file_path} subscriptions/fragments/subscription-expiresAt-future-update.json *** Test Cases *** @@ -23,7 +23,7 @@ ${subscription_update_fragment_file_path} subscriptions/fragments/subscrip ${now}= Get Current Date time_zone=UTC ${in_5_seconds}= Add Time To Date ${now} 5s result_format=%Y-%m-%dT%H:%M:%SZ ${update_template_fragment}= Load JSON From File - ... ${EXECDIR}/data/subscriptions/fragments/subscription-expiresAt-update-sample.json + ... ${EXECDIR}/data/subscriptions/fragments/subscription-expiresAt-update.json ${update_fragment}= Update Value To JSON ${update_template_fragment} $..expiresAt ${in_5_seconds} ${update_response}= Update Subscription With Payload ... ${subscription_id} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot index ec00bf80..52c64231 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= subscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-expiresAt-update-sample.json +${subscription_payload_file_path}= subscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= subscriptions/fragments/subscription-expiresAt-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_01.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_01.robot index 3ef177fd..5561471b 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_01.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_01.robot @@ -13,17 +13,17 @@ Test Template Query A Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld +${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld *** Test Cases *** QUERY_PARAM_NAME QUERY_PARAM_VALUE EXPECTATION_FILE_PATH EXPECTED_CONTEXT_SOURCE_REGISTRATION_IDS 037_01_01 With list of entity types [Tags] csr-query 5_10_2 - type Building csourceRegistrations/expectations/context-source-registrations-037-01-expectation.json ${second_context_source_registration_id} + type Building csourceRegistrations/expectations/context-source-registrations-037-01.json ${second_context_source_registration_id} 037_01_02 With list of attribute names [Tags] csr-query 5_10_2 - attrs name csourceRegistrations/expectations/context-source-registrations-037-01-expectation.json ${second_context_source_registration_id} + attrs name csourceRegistrations/expectations/context-source-registrations-037-01.json ${second_context_source_registration_id} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_04.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_04.robot index 67ad6c29..ce6506be 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_04.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_04.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Created Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld -${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-04-expectation.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld +${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-04.json ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_05.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_05.robot index 452528f0..64d0e75f 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_05.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_05.robot @@ -17,10 +17,10 @@ ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistr *** Test Cases *** REGISTRATION_FILE_PATH EXPECTATION_FILE_PATH 037_05_01 Registration With EntityInfo Matching The Query [Tags] csr-query 5_10_2 - csourceRegistrations/context-source-registration-sample.jsonld csourceRegistrations/expectations/context-source-registrations-037-05-01-expectation.json + csourceRegistrations/context-source-registration.jsonld csourceRegistrations/expectations/context-source-registrations-037-05-01.json 037_05_02 Registration Without EntityInfo [Tags] csr-query 5_10_2 - csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld csourceRegistrations/expectations/context-source-registrations-037-05-02-expectation.json + csourceRegistrations/context-source-registration-with-only-properties-information.jsonld csourceRegistrations/expectations/context-source-registrations-037-05-02.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_06.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_06.robot index c2b927d7..dbc54401 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_06.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_06.robot @@ -13,16 +13,16 @@ Test Template Query Context Source Registration Matching Properties And Re *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld *** Test Cases *** ATTRS_VALUE EXPECTATION_FILE_PATH 037_06_01 Query With Matching Properties And Relationships [Tags] csr-query 5_10_2 - name,locatedAt csourceRegistrations/expectations/context-source-registrations-037-06-expectation.json + name,locatedAt csourceRegistrations/expectations/context-source-registrations-037-06.json 037_06_02 Query Without Properties And Relationships [Tags] csr-query 5_10_2 - ${EMPTY} csourceRegistrations/expectations/context-source-registrations-037-06-expectation.json + ${EMPTY} csourceRegistrations/expectations/context-source-registrations-037-06.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_07.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_07.robot index 3e695829..6503341a 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_07.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_07.robot @@ -13,8 +13,8 @@ Test Template Query Context Source Registration Matching Geoquery *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location-sample.jsonld -${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-07-expectation.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location.jsonld +${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-07.json *** Test Cases *** GEOREL GEOMETRY COORDINATES GEOPROPERTY EXPECTATION_FILE_PATH diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_08.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_08.robot index 0209b0e0..1cfc5140 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_08.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_08.robot @@ -12,8 +12,8 @@ Suite Teardown Delete Created Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-08-expectation.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-08.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot index 2d38c69e..46fed3a9 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_09.robot @@ -12,10 +12,10 @@ Test Template Query Context Source Registration Matching Temporal Query *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_observation_interval_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval-sample.jsonld -${context_source_registration_management_interval_payload_file_path}= csourceRegistrations/context-source-registration-managementInterval-sample.jsonld -${observation_interval_expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-09-01-expectation.json -${management_interval_expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-09-02-expectation.json +${context_source_registration_observation_interval_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval.jsonld +${context_source_registration_management_interval_payload_file_path}= csourceRegistrations/context-source-registration-managementInterval.jsonld +${observation_interval_expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-09-01.json +${management_interval_expectation_file_path}= csourceRegistrations/expectations/context-source-registrations-037-09-02.json *** Test Cases *** PAYLOAD_FILE_PATH TIMEPROPERTY EXPECTATION_FILE_PATH diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_10.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_10.robot index 1472e9bb..5d6010a8 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_10.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_10.robot @@ -13,18 +13,18 @@ Test Template Query Context Source Registration With Query Params *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld -${third_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-csourceProperty-sample.jsonld +${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld +${third_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-csourceProperty.jsonld *** Test Cases *** QUERY_PARAM_NAME QUERY_PARAM_VALUE EXPECTATION_FILE_PATH EXPECTED_CONTEXT_SOURCE_REGISTRATION_IDS 037_10_01 With list of Entity Ids [Tags] csr-query 5_10_2 - id ${first_context_source_registration_id},${third_context_source_registration_id} csourceRegistrations/expectations/context-source-registrations-037-10-01-expectation.json ${first_context_source_registration_id},${third_context_source_registration_id} + id ${first_context_source_registration_id},${third_context_source_registration_id} csourceRegistrations/expectations/context-source-registrations-037-10-01.json ${first_context_source_registration_id},${third_context_source_registration_id} 037_10_02 With NGSI-LD Query [Tags] csr-query 5_10_2 - q csourceProperty1=="aValue" csourceRegistrations/expectations/context-source-registrations-037-10-02-expectation.json ${third_context_source_registration_id} + q csourceProperty1=="aValue" csourceRegistrations/expectations/context-source-registrations-037-10-02.json ${third_context_source_registration_id} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot index a69bd870..5de8035b 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/QueryContextSourceRegistrations/037_11.robot @@ -13,9 +13,9 @@ Test Template Query Context Source Registration With Limit And Offset Para *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location-sample.jsonld -${third_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld +${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location.jsonld +${third_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld *** Test Cases *** LIMIT OFFSET EXPECTED_NUMBER PREV_LINK NEXT_LINK diff --git a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_03.robot b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_03.robot index 568e712b..799b458e 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_03.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_03.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Created Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld ${expectation_file_path}= csourceRegistrations/expectations/context-source-registration-expanded-format.json diff --git a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_04.robot b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_04.robot index e79e73e9..8036b1f1 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_04.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_04.robot @@ -12,7 +12,7 @@ Suite Teardown Delete Created Context Source Registration *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld ${expectation_file_path}= csourceRegistrations/expectations/context-source-registration.json diff --git a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_05.robot b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_05.robot index 653ca1c3..5b4f372e 100644 --- a/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_05.robot +++ b/TP/NGSI-LD/ContextSource/Discovery/RetrieveContextSourceRegistration/036_05.robot @@ -13,7 +13,7 @@ Test Template Review JSON-LD resolution when retrieving a context source r *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld ${expectation_file_path_compacted}= csourceRegistrations/expectations/context-source-registration.json ${expectation_file_path_expanded}= csourceRegistrations/expectations/context-source-registration-expanded-format.json diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot index cc8b4ec9..08bdca8a 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot @@ -12,7 +12,7 @@ Test Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= context-source-registration-sample.jsonld +${registration_payload_file_path}= context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot index 0d7e55de..fef11c19 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot @@ -12,7 +12,7 @@ Test Template Delete A Context Source *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld +${filename}= context-source-registration.jsonld *** Test Cases *** INVALID_REGISTRATION_ID EXPECTED_STATUS_CODE PROBLEM_TYPE diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot index 15682aec..444f867b 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= context-source-registration-simple-sample.jsonld +${registration_payload_file_path}= context-source-registration-simple.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot index 773841e1..ac196405 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_01.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-with-expiration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-with-expiration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot index 2c741fa5..236dc7e6 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_02.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot index 3008ec2b..55d7e793 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_01_03.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-no-id-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-no-id.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_02.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_02.robot index 1e8063d3..b68aee12 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_02.robot @@ -9,7 +9,7 @@ Library OperatingSystem *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-invalid-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-invalid.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_03.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_03.robot index 904cbe09..cc2b14de 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_03.robot @@ -11,7 +11,7 @@ Test Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= csourceRegistrations/context-source-registration-sample.jsonld +${filename}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot index 9a4bb29d..57019f01 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_04.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.json +${registration_payload_file_path}= csourceRegistrations/context-source-registration.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot index 31efe47e..a53ca256 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_05.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.json +${registration_payload_file_path}= csourceRegistrations/context-source-registration.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_06.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_06.robot index 8247cb99..660538a5 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_06.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_06.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot index 3010951f..74754b15 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_07.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registrations *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_08.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_08.robot index bcd08070..e1fda055 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_08.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_08.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.json +${registration_payload_file_path}= csourceRegistrations/context-source-registration.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_09.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_09.robot index cc17f1d9..e7c14fc0 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_09.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_09.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_10.robot b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_10.robot index 42595a5f..280fb4dd 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_10.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RegisterContextSource/033_10.robot @@ -14,9 +14,9 @@ ${registration_id_prefix}= urn:ngsi-ld:Registration: *** Test Cases *** 033_10_01 Create a context source registration with a different data structure than CSourceRegistration data type - csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld + csourceRegistrations/context-source-registration-invalid-structure.jsonld 033_10_02 Create a context source registration with a date in the past - csourceRegistrations/context-source-registration-past-expiration-sample.jsonld + csourceRegistrations/context-source-registration-past-expiration.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot index 7f2ff3e5..a28c07ef 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot @@ -18,7 +18,7 @@ ${registration_id_prefix}= urn:ngsi-ld:Registration: *** Test Cases *** FILENAME UPDATE_FILENAME 034_01_01 Update a context source registration by id [Tags] csr-update 5_9_3 - context-source-registration-sample.jsonld context-source-registration-update-sample.json + context-source-registration.jsonld context-source-registration-update.json *** Keywords *** @@ -47,7 +47,7 @@ Initialize the Test Case ${registration_id}= Generate Random Entity Id ${registration_id_prefix} Set Test Variable ${registration_id} ${payload}= Load JSON From File - ... ${EXECDIR}/data/csourceRegistrations/context-source-registration-sample.jsonld + ... ${EXECDIR}/data/csourceRegistrations/context-source-registration.jsonld ${registration_payload}= Update Value To JSON ${payload} $..id ${registration_id} Set Test Variable ${registration_payload} ${response}= Create Context Source Registration With Return ${registration_payload} diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot index 78a92552..30f2a85a 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot @@ -12,18 +12,18 @@ Test Template Update A Context Source *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld -${registration_payload_file_path}= context-source-registration-invalid-sample.jsonld +${filename}= context-source-registration.jsonld +${registration_payload_file_path}= context-source-registration-invalid.jsonld ${reason_400}= Bad Request *** Test Cases *** REGISTRATION_ID FRAGMENT_FILENAME EXPECTED_STATUS_CODE PROBLEM_TYPE 034_02_01 Update a context source registration by id if the Id is not a valid URI - invalidURI fragments/context-source-registration-different-type-sample.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} + invalidURI fragments/context-source-registration-different-type.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} 034_02_02 Update a context source registration if the request body is not of the same data type - ${valid_registration_id} fragments/context-source-registration-different-type-sample.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} + ${valid_registration_id} fragments/context-source-registration-different-type.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} 034_02_03 Update a context source registration if one attempts to remove a mandatory property - ${valid_registration_id} context-source-registration-invalid-sample.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} + ${valid_registration_id} context-source-registration-invalid.jsonld 400 ${ERROR_TYPE_BAD_REQUEST_DATA} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot index ead47111..9505f6fa 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld +${filename}= context-source-registration.jsonld ${reason_404}= Not Found diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_04.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_04.robot index aed9efb5..7f71d98d 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_04.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_04.robot @@ -11,8 +11,8 @@ Test Teardown Delete Initial Context Source Registration *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld -${registration_payload_file_path}= context-source-registration-invalid-json-sample.json +${filename}= context-source-registration.jsonld +${registration_payload_file_path}= context-source-registration-invalid-json.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot index efa3fb3e..58a12db0 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_05.robot @@ -18,7 +18,7 @@ ${registration_id_prefix}= urn:ngsi-ld:Registration: *** Test Cases *** FILENAME UPDATE_FILENAME 034_05_01 Update a context source registration to never expire [Tags] csr-update 5_9_3 - context-source-registration-with-expiration-sample.jsonld context-source-registration-null-expiresAt.json + context-source-registration-with-expiration.jsonld context-source-registration-null-expiresAt.json *** Keywords *** @@ -46,7 +46,7 @@ Initialize the Test Case ${registration_id}= Generate Random Entity Id ${registration_id_prefix} Set Test Variable ${registration_id} ${payload}= Load JSON From File - ... ${EXECDIR}/data/csourceRegistrations/context-source-registration-sample.jsonld + ... ${EXECDIR}/data/csourceRegistrations/context-source-registration.jsonld ${registration_payload}= Update Value To JSON ${payload} $..id ${registration_id} Set Test Variable ${registration_payload} ${response}= Create Context Source Registration With Return ${registration_payload} diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_06.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_06.robot index 342c6e46..e1383a39 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_06.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_06.robot @@ -12,14 +12,14 @@ Test Template Update A Context Source *** Variables *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= context-source-registration-sample.jsonld -${registration_payload_file_path}= context-source-registration-invalid-sample.jsonld +${filename}= context-source-registration.jsonld +${registration_payload_file_path}= context-source-registration-invalid.jsonld ${reason_405}= Method Not Allowed *** Test Cases *** FRAGMENT_FILENAME EXPECTED_STATUS_CODE REASON 034_06_01 Update a context source registration by id if the Id is not present - fragments/context-source-registration-different-type-sample.jsonld 405 ${reason_405} + fragments/context-source-registration-different-type.jsonld 405 ${reason_405} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_01.robot index e94e8425..60ec4659 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_01.robot @@ -14,8 +14,8 @@ Suite Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-timeInterval-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-timeInterval.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot index 1f71e361..6b92474a 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_02.robot @@ -14,9 +14,9 @@ Test Teardown Delete Created Context Source Registration And Context Sourc *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update-sample.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot index cbb9dd06..748b0d27 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_03.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-building-and-bus-entities.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot index a8669618..4de52e9c 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_04.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot index 8d235f30..1c2af17a 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_05.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld ${notification_expectation_file_path}= notifications/expectations/1-timesSent-ok.json diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_06.robot index 7905417f..48d4fcc0 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_06.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_06.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-unreachable-endpoint.jsonld ${notification_expectation_file_path}= notifications/expectations/1-timesSent-failed.json diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot index e7b13197..5491a36b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_07.robot @@ -15,17 +15,17 @@ Test Template Do Not Receive cSourceNotification If Subscription Status Is *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** FILEPATH 047_07_01 PausedSubscription [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-isActive-update-sample.json + csourceSubscriptions/fragments/subscription-isActive-update.json 047_07_02 ExpiredSubscription [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-expiresAt-update-sample.json + csourceSubscriptions/fragments/subscription-expiresAt-update.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_08.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_08.robot index b1c1cbfd..5beccbae 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_08.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_08.robot @@ -14,9 +14,9 @@ Test Teardown Delete Created Context Source Registration And Context Sourc *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update-sample.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_09.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_09.robot index e525e9ee..ef6575b1 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_09.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_09.robot @@ -14,9 +14,9 @@ Suite Teardown Delete Created Context Source Registration And Context Sourc *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update-information-sample.json +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${update_fragment_file_path}= csourceRegistrations/fragments/context-source-registration-update-information.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_10.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_10.robot index d7d0bece..bb549e92 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_10.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_10.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-observationInterval.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-temporalQ-observedAt.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_11.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_11.robot index ddc53ca4..b3d487d3 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_11.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_11.robot @@ -16,14 +16,14 @@ Test Template Receive cSourceNotification For Matching Context Source Regi *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-managementInterval-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-managementInterval.jsonld *** Test Cases *** FILEPATH 047_11_01 CreatedAt [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld + csourceSubscriptions/subscription-temporalQ-createdAt.jsonld 047_11_02 ModifiedAt [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld + csourceSubscriptions/subscription-temporalQ-modifiedAt.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_12.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_12.robot index 9d8db6c9..e09fbf9b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_12.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_12.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_13.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_13.robot index 515be442..1d8a2325 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_13.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_13.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-detailed-information.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_14.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_14.robot index 532e5def..1334f778 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_14.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_14.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_15.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_15.robot index 7413bb8f..b2d6176b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_15.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_15.robot @@ -14,8 +14,8 @@ Test Teardown Delete Created Context Source Registration And Subscription *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld +${context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-location.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-without-geoproperty.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot index 541c8c26..435363db 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/ContextSourceRegistrationSubscriptionNotificationBehaviour/047_16.robot @@ -15,21 +15,21 @@ Test Template Receive cSourceNotification For Newly Matching Context Sourc *** Variables *** ${context_source_registration_id_prefix}= urn:ngsi-ld:ContextSourceRegistration: ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld -${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-bus-entities-sample.jsonld -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${first_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-vehicle-entities.jsonld +${second_context_source_registration_payload_file_path}= csourceRegistrations/context-source-registration-bus-entities.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** FILEPATH NOTIFICATION_CSR_IDS 047_16_01 MatchFirstContextSourceRegistration [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-vehicle-entities-sample.json ${first_context_source_registration_id} + csourceSubscriptions/fragments/subscription-vehicle-entities.json ${first_context_source_registration_id} 047_16_02 MatchSecondContextSourceRegistration [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-bus-entities-sample.json ${second_context_source_registration_id} + csourceSubscriptions/fragments/subscription-bus-entities.json ${second_context_source_registration_id} 047_16_03 MatchBothContextSourceRegistrations [Tags] csrsub-notification 5_11_7 - csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities-sample.json ${first_context_source_registration_id} ${second_context_source_registration_id} + csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities.json ${first_context_source_registration_id} ${second_context_source_registration_id} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot index a34c68a4..d8e75e0b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot index 6d33309b..48da4ed1 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot @@ -9,7 +9,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld ${subscription_id}= ${EMPTY} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot index 277cf962..9a933e4c 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot index cfc3d652..7f72e686 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-inactive-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-inactive.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot index ea783a83..5a5107a4 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-expiresAt-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-expiresAt.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot index 659c8d65..43232ead 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot index 32f82eef..6f23bf1b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot @@ -11,7 +11,7 @@ Test Teardown Delete Initial Context Source Registration Subscription *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot index 10e1f080..32b69a6d 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_08.robot @@ -16,16 +16,16 @@ ${subscription_payload_file_path}= ${EMPTY} *** Test Cases *** FILEPATH 038_08_01 WithoutNotification [Tags] csrsub-create 5_11_2 - csourceSubscriptions/subscription-without-notification-sample.jsonld + csourceSubscriptions/subscription-without-notification.jsonld 038_08_02 InvalidType [Tags] csrsub-create 5_11_2 - csourceSubscriptions/subscription-invalid-type-sample.jsonld + csourceSubscriptions/subscription-invalid-type.jsonld 038_08_03 InvalidQuery [Tags] csrsub-create 5_11_2 - csourceSubscriptions/subscription-invalid-query-sample.jsonld + csourceSubscriptions/subscription-invalid-query.jsonld 038_08_04 EmptyWatchedAttributes [Tags] csrsub-create 5_11_2 - csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld + csourceSubscriptions/subscription-empty-watchedAttributes.jsonld *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot index ad3c72eb..dfc61917 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_09.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-expired-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription-expired.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot index 1a4ba225..9211f097 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot @@ -10,7 +10,7 @@ Test Setup Setup Initial Context Source Registration Subscription *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot index 07f1e7ea..da7ef392 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot @@ -11,9 +11,9 @@ Test Teardown Delete Created Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes-sample.jsonld -${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-035-01-expectation.json +${first_subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes.jsonld +${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-035-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot index 8c92178c..2a0c803e 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot @@ -12,10 +12,10 @@ Test Template Query Context Source Registration Subscriptions With Limit P *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes-sample.jsonld -${third_subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-sample.jsonld -${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-035-01-expectation.json +${first_subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes.jsonld +${third_subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ.jsonld +${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-035-01.json *** Test Cases *** LIMIT EXPECTED_SUBSCRIPTION_NUMBER diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot index b8b75e79..a239006b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot @@ -12,9 +12,9 @@ Test Template Query Context Source Registration Subscriptions With Limit A *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${first_subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes-sample.jsonld -${third_subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ-sample.jsonld +${first_subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${second_subscription_payload_file_path}= csourceSubscriptions/subscription-watchedAttributes.jsonld +${third_subscription_payload_file_path}= csourceSubscriptions/subscription-geoQ.jsonld *** Test Cases *** LIMIT PAGE EXPECTED_SUBSCRIPTION_NUMBER PREV_LINK NEXT_LINK diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot index b5926844..8e0dfe80 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot @@ -11,8 +11,8 @@ Test Teardown Delete Created Context Source Registration Subscription *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-040-01-expectation.json +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${expectation_file_path}= csourceSubscriptions/expectations/subscriptions-040-01.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot index 3f56e955..7f4e6e21 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot @@ -11,8 +11,8 @@ Test Teardown Delete Initial Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-sample.json +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot index a0369b61..012d8e02 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** -${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-sample.json +${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot index 889fa4f5..c530e0d1 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variables *** -${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-sample.json +${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update.json *** Test Cases *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot index f938efa3..f3fdf28a 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_04.robot @@ -12,16 +12,16 @@ Test Template Update Context Source Registration Subscription With Invalid *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld *** Test Cases *** FILEPATH 039_04_01 InvalidType [Tags] csrsub-update 5_11_3 - csourceSubscriptions/fragments/subscription-update-invalid-type-sample.json + csourceSubscriptions/fragments/subscription-update-invalid-type.json 039_04_02 InvalidNotification [Tags] csrsub-update 5_11_3 - csourceSubscriptions/fragments/subscription-update-invalid-notification-sample.json + csourceSubscriptions/fragments/subscription-update-invalid-notification.json *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot index 06baea39..10f0799b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot @@ -11,8 +11,8 @@ Test Teardown Delete Initial Context Source Registration Subscriptions *** Variables *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: -${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld -${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json +${subscription_payload_file_path}= csourceSubscriptions/subscription.jsonld +${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-invalid-json.json *** Test Cases *** diff --git a/data/csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-building-and-bus-entities.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld rename to data/csourceRegistrations/context-source-registration-building-and-bus-entities.jsonld diff --git a/data/csourceRegistrations/context-source-registration-bus-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-bus-entities.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-bus-entities-sample.jsonld rename to data/csourceRegistrations/context-source-registration-bus-entities.jsonld diff --git a/data/csourceRegistrations/context-source-registration-csourceProperty-sample.jsonld b/data/csourceRegistrations/context-source-registration-csourceProperty.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-csourceProperty-sample.jsonld rename to data/csourceRegistrations/context-source-registration-csourceProperty.jsonld diff --git a/data/csourceRegistrations/context-source-registration-detailed-information-sample.jsonld b/data/csourceRegistrations/context-source-registration-detailed-information.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-detailed-information-sample.jsonld rename to data/csourceRegistrations/context-source-registration-detailed-information.jsonld diff --git a/data/csourceRegistrations/context-source-registration-invalid-json-sample.json b/data/csourceRegistrations/context-source-registration-invalid-json.json similarity index 100% rename from data/csourceRegistrations/context-source-registration-invalid-json-sample.json rename to data/csourceRegistrations/context-source-registration-invalid-json.json diff --git a/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid-structure.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld rename to data/csourceRegistrations/context-source-registration-invalid-structure.jsonld diff --git a/data/csourceRegistrations/context-source-registration-invalid-sample.json b/data/csourceRegistrations/context-source-registration-invalid.json similarity index 100% rename from data/csourceRegistrations/context-source-registration-invalid-sample.json rename to data/csourceRegistrations/context-source-registration-invalid.json diff --git a/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-invalid-sample.jsonld rename to data/csourceRegistrations/context-source-registration-invalid.jsonld diff --git a/data/csourceRegistrations/context-source-registration-location-sample.jsonld b/data/csourceRegistrations/context-source-registration-location.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-location-sample.jsonld rename to data/csourceRegistrations/context-source-registration-location.jsonld diff --git a/data/csourceRegistrations/context-source-registration-managementInterval-sample.jsonld b/data/csourceRegistrations/context-source-registration-managementInterval.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-managementInterval-sample.jsonld rename to data/csourceRegistrations/context-source-registration-managementInterval.jsonld diff --git a/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld b/data/csourceRegistrations/context-source-registration-no-id.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-no-id-sample.jsonld rename to data/csourceRegistrations/context-source-registration-no-id.jsonld diff --git a/data/csourceRegistrations/context-source-registration-observationInterval-sample.jsonld b/data/csourceRegistrations/context-source-registration-observationInterval.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-observationInterval-sample.jsonld rename to data/csourceRegistrations/context-source-registration-observationInterval.jsonld diff --git a/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-past-expiration.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-past-expiration.jsonld diff --git a/data/csourceRegistrations/context-source-registration-unretrievable-context-sample.jsonld b/data/csourceRegistrations/context-source-registration-unretrievable-context.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-unretrievable-context-sample.jsonld rename to data/csourceRegistrations/context-source-registration-unretrievable-context.jsonld diff --git a/data/csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-vehicle-entities.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld rename to data/csourceRegistrations/context-source-registration-vehicle-entities.jsonld diff --git a/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-with-expiration.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-with-expiration.jsonld diff --git a/data/csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld b/data/csourceRegistrations/context-source-registration-with-only-properties-information.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld rename to data/csourceRegistrations/context-source-registration-with-only-properties-information.jsonld diff --git a/data/csourceRegistrations/context-source-registration-sample.json b/data/csourceRegistrations/context-source-registration.json similarity index 100% rename from data/csourceRegistrations/context-source-registration-sample.json rename to data/csourceRegistrations/context-source-registration.json diff --git a/data/csourceRegistrations/context-source-registration-sample.jsonld b/data/csourceRegistrations/context-source-registration.jsonld similarity index 100% rename from data/csourceRegistrations/context-source-registration-sample.jsonld rename to data/csourceRegistrations/context-source-registration.jsonld diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-01-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-01.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-01-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-01.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-04-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-04.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-04-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-04.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-05-01-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-05-01.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-05-01-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-05-01.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-05-02-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-05-02.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-05-02-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-05-02.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-06-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-06.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-06-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-06.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-07-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-07.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-07-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-07.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-08-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-08.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-08-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-08.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-09-01-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-09-01.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-09-01-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-09-01.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-09-02-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-09-02.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-09-02-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-09-02.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-10-01-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-10-01.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-10-01-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-10-01.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-10-02-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-10-02.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-10-02-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-10-02.json diff --git a/data/csourceRegistrations/expectations/context-source-registrations-037-10-03-expectation.json b/data/csourceRegistrations/expectations/context-source-registrations-037-10-03.json similarity index 100% rename from data/csourceRegistrations/expectations/context-source-registrations-037-10-03-expectation.json rename to data/csourceRegistrations/expectations/context-source-registrations-037-10-03.json diff --git a/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld b/data/csourceRegistrations/fragments/context-source-registration-different-type.jsonld similarity index 100% rename from data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld rename to data/csourceRegistrations/fragments/context-source-registration-different-type.jsonld diff --git a/data/csourceRegistrations/fragments/context-source-registration-update-information-sample.json b/data/csourceRegistrations/fragments/context-source-registration-update-information.json similarity index 100% rename from data/csourceRegistrations/fragments/context-source-registration-update-information-sample.json rename to data/csourceRegistrations/fragments/context-source-registration-update-information.json diff --git a/data/csourceRegistrations/fragments/context-source-registration-update-sample.json b/data/csourceRegistrations/fragments/context-source-registration-update.json similarity index 100% rename from data/csourceRegistrations/fragments/context-source-registration-update-sample.json rename to data/csourceRegistrations/fragments/context-source-registration-update.json diff --git a/data/csourceSubscriptions/expectations/subscriptions-035-01-expectation.json b/data/csourceSubscriptions/expectations/subscriptions-035-01.json similarity index 100% rename from data/csourceSubscriptions/expectations/subscriptions-035-01-expectation.json rename to data/csourceSubscriptions/expectations/subscriptions-035-01.json diff --git a/data/csourceSubscriptions/expectations/subscriptions-040-01-expectation.json b/data/csourceSubscriptions/expectations/subscriptions-040-01.json similarity index 100% rename from data/csourceSubscriptions/expectations/subscriptions-040-01-expectation.json rename to data/csourceSubscriptions/expectations/subscriptions-040-01.json diff --git a/data/csourceSubscriptions/fragments/subscription-bus-entities-sample.json b/data/csourceSubscriptions/fragments/subscription-bus-entities.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-bus-entities-sample.json rename to data/csourceSubscriptions/fragments/subscription-bus-entities.json diff --git a/data/csourceSubscriptions/fragments/subscription-expiresAt-update-sample.json b/data/csourceSubscriptions/fragments/subscription-expiresAt-update.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-expiresAt-update-sample.json rename to data/csourceSubscriptions/fragments/subscription-expiresAt-update.json diff --git a/data/csourceSubscriptions/fragments/subscription-isActive-update-sample.json b/data/csourceSubscriptions/fragments/subscription-isActive-update.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-isActive-update-sample.json rename to data/csourceSubscriptions/fragments/subscription-isActive-update.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json b/data/csourceSubscriptions/fragments/subscription-update-invalid-json.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json rename to data/csourceSubscriptions/fragments/subscription-update-invalid-json.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-invalid-notification-sample.json b/data/csourceSubscriptions/fragments/subscription-update-invalid-notification.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-invalid-notification-sample.json rename to data/csourceSubscriptions/fragments/subscription-update-invalid-notification.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-invalid-type-sample.json b/data/csourceSubscriptions/fragments/subscription-update-invalid-type.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-invalid-type-sample.json rename to data/csourceSubscriptions/fragments/subscription-update-invalid-type.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-sample.json b/data/csourceSubscriptions/fragments/subscription-update.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-sample.json rename to data/csourceSubscriptions/fragments/subscription-update.json diff --git a/data/csourceSubscriptions/fragments/subscription-update-sample.jsonld b/data/csourceSubscriptions/fragments/subscription-update.jsonld similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-update-sample.jsonld rename to data/csourceSubscriptions/fragments/subscription-update.jsonld diff --git a/data/csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities-sample.json b/data/csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities-sample.json rename to data/csourceSubscriptions/fragments/subscription-vehicle-and-bus-entities.json diff --git a/data/csourceSubscriptions/fragments/subscription-vehicle-entities-sample.json b/data/csourceSubscriptions/fragments/subscription-vehicle-entities.json similarity index 100% rename from data/csourceSubscriptions/fragments/subscription-vehicle-entities-sample.json rename to data/csourceSubscriptions/fragments/subscription-vehicle-entities.json diff --git a/data/csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld b/data/csourceSubscriptions/subscription-empty-watchedAttributes.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld rename to data/csourceSubscriptions/subscription-empty-watchedAttributes.jsonld diff --git a/data/csourceSubscriptions/subscription-expired-sample.jsonld b/data/csourceSubscriptions/subscription-expired.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-expired-sample.jsonld rename to data/csourceSubscriptions/subscription-expired.jsonld diff --git a/data/csourceSubscriptions/subscription-expiresAt-sample.jsonld b/data/csourceSubscriptions/subscription-expiresAt.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-expiresAt-sample.jsonld rename to data/csourceSubscriptions/subscription-expiresAt.jsonld diff --git a/data/csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld b/data/csourceSubscriptions/subscription-geoQ-without-geoproperty.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld rename to data/csourceSubscriptions/subscription-geoQ-without-geoproperty.jsonld diff --git a/data/csourceSubscriptions/subscription-geoQ-sample.jsonld b/data/csourceSubscriptions/subscription-geoQ.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-geoQ-sample.jsonld rename to data/csourceSubscriptions/subscription-geoQ.jsonld diff --git a/data/csourceSubscriptions/subscription-inactive-sample.jsonld b/data/csourceSubscriptions/subscription-inactive.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-inactive-sample.jsonld rename to data/csourceSubscriptions/subscription-inactive.jsonld diff --git a/data/csourceSubscriptions/subscription-invalid-query-sample.jsonld b/data/csourceSubscriptions/subscription-invalid-query.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-invalid-query-sample.jsonld rename to data/csourceSubscriptions/subscription-invalid-query.jsonld diff --git a/data/csourceSubscriptions/subscription-invalid-type-sample.jsonld b/data/csourceSubscriptions/subscription-invalid-type.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-invalid-type-sample.jsonld rename to data/csourceSubscriptions/subscription-invalid-type.jsonld diff --git a/data/csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-createdAt.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld rename to data/csourceSubscriptions/subscription-temporalQ-createdAt.jsonld diff --git a/data/csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-modifiedAt.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld rename to data/csourceSubscriptions/subscription-temporalQ-modifiedAt.jsonld diff --git a/data/csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-observedAt.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld rename to data/csourceSubscriptions/subscription-temporalQ-observedAt.jsonld diff --git a/data/csourceSubscriptions/subscription-timeInterval-sample.jsonld b/data/csourceSubscriptions/subscription-timeInterval.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-timeInterval-sample.jsonld rename to data/csourceSubscriptions/subscription-timeInterval.jsonld diff --git a/data/csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld b/data/csourceSubscriptions/subscription-unreachable-endpoint.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld rename to data/csourceSubscriptions/subscription-unreachable-endpoint.jsonld diff --git a/data/csourceSubscriptions/subscription-watchedAttributes-sample.jsonld b/data/csourceSubscriptions/subscription-watchedAttributes.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-watchedAttributes-sample.jsonld rename to data/csourceSubscriptions/subscription-watchedAttributes.jsonld diff --git a/data/csourceSubscriptions/subscription-without-notification-sample.jsonld b/data/csourceSubscriptions/subscription-without-notification.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-without-notification-sample.jsonld rename to data/csourceSubscriptions/subscription-without-notification.jsonld diff --git a/data/csourceSubscriptions/subscription-sample.jsonld b/data/csourceSubscriptions/subscription.jsonld similarity index 100% rename from data/csourceSubscriptions/subscription-sample.jsonld rename to data/csourceSubscriptions/subscription.jsonld diff --git a/data/entities/batch/empty-sample.jsonld b/data/entities/batch/empty.jsonld similarity index 100% rename from data/entities/batch/empty-sample.jsonld rename to data/entities/batch/empty.jsonld diff --git a/data/entities/batch/invalid-json-ld-sample.jsonld b/data/entities/batch/invalid-json-ld.jsonld similarity index 100% rename from data/entities/batch/invalid-json-ld-sample.jsonld rename to data/entities/batch/invalid-json-ld.jsonld diff --git a/data/entities/batch/invalid-json-sample.jsonld b/data/entities/batch/invalid-json.jsonld similarity index 100% rename from data/entities/batch/invalid-json-sample.jsonld rename to data/entities/batch/invalid-json.jsonld diff --git a/data/entities/building-language-property-sub-property-sample.jsonld b/data/entities/building-language-property-sub-property.jsonld similarity index 100% rename from data/entities/building-language-property-sub-property-sample.jsonld rename to data/entities/building-language-property-sub-property.jsonld diff --git a/data/entities/building-language-property-sample.jsonld b/data/entities/building-language-property.jsonld similarity index 100% rename from data/entities/building-language-property-sample.jsonld rename to data/entities/building-language-property.jsonld diff --git a/data/entities/building-location-attribute-sample.jsonld b/data/entities/building-location-attribute-sample.jsonld deleted file mode 100644 index 081c7a01..00000000 --- a/data/entities/building-location-attribute-sample.jsonld +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "urn:ngsi-ld:Building:randomUUID", - "type": "Building", - "name": { - "type": "Property", - "value": "Eiffel Tower" - }, - "subCategory": { - "type": "Property", - "value": "tourism" - }, - "location": { - "type": "GeoProperty", - "value": { - "type": "Point", - "coordinates": [13.3986, 52.5547] - } - }, - "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" - ] -} \ No newline at end of file diff --git a/data/entities/building-location-attribute.jsonld b/data/entities/building-location-attribute.jsonld index 778fe8f9..081c7a01 100644 --- a/data/entities/building-location-attribute.jsonld +++ b/data/entities/building-location-attribute.jsonld @@ -1,5 +1,5 @@ { - "id": "urn:ngsi-ld:Building:3009ef20-9f62-41f5-bd66-92f041b428b9", + "id": "urn:ngsi-ld:Building:randomUUID", "type": "Building", "name": { "type": "Property", @@ -17,7 +17,6 @@ } }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-minimal-sample.json b/data/entities/building-minimal.json similarity index 100% rename from data/entities/building-minimal-sample.json rename to data/entities/building-minimal.json diff --git a/data/entities/building-minimal-sample.jsonld b/data/entities/building-minimal.jsonld similarity index 100% rename from data/entities/building-minimal-sample.jsonld rename to data/entities/building-minimal.jsonld diff --git a/data/entities/building-relationship-of-property-sample.jsonld b/data/entities/building-relationship-of-property.jsonld similarity index 100% rename from data/entities/building-relationship-of-property-sample.jsonld rename to data/entities/building-relationship-of-property.jsonld diff --git a/data/entities/building-relationship-sample.jsonld b/data/entities/building-relationship.jsonld similarity index 100% rename from data/entities/building-relationship-sample.jsonld rename to data/entities/building-relationship.jsonld diff --git a/data/entities/building-simple-attributes-second-sample.jsonld b/data/entities/building-simple-attributes-second.jsonld similarity index 100% rename from data/entities/building-simple-attributes-second-sample.jsonld rename to data/entities/building-simple-attributes-second.jsonld diff --git a/data/entities/building-simple-attributes-sample.json b/data/entities/building-simple-attributes.json similarity index 100% rename from data/entities/building-simple-attributes-sample.json rename to data/entities/building-simple-attributes.json diff --git a/data/entities/building-simple-attributes-sample.jsonld b/data/entities/building-simple-attributes.jsonld similarity index 100% rename from data/entities/building-simple-attributes-sample.jsonld rename to data/entities/building-simple-attributes.jsonld diff --git a/data/entities/building-unretrievable-context-sample.jsonld b/data/entities/building-unretrievable-context.jsonld similarity index 100% rename from data/entities/building-unretrievable-context-sample.jsonld rename to data/entities/building-unretrievable-context.jsonld diff --git a/data/entities/building-with-different-type-sample.jsonld b/data/entities/building-with-different-type.jsonld similarity index 100% rename from data/entities/building-with-different-type-sample.jsonld rename to data/entities/building-with-different-type.jsonld diff --git a/data/entities/building-with-two-types-sample.jsonld b/data/entities/building-with-two-types.jsonld similarity index 100% rename from data/entities/building-with-two-types-sample.jsonld rename to data/entities/building-with-two-types.jsonld diff --git a/data/entities/empty-sample.jsonld b/data/entities/empty.jsonld similarity index 100% rename from data/entities/empty-sample.jsonld rename to data/entities/empty.jsonld diff --git a/data/entities/expectations/building-attributes-query-expectation.json b/data/entities/expectations/building-attributes-query.json similarity index 100% rename from data/entities/expectations/building-attributes-query-expectation.json rename to data/entities/expectations/building-attributes-query.json diff --git a/data/entities/expectations/building-geoproperty-query-expectation.jsonld b/data/entities/expectations/building-geoproperty-query.jsonld similarity index 100% rename from data/entities/expectations/building-geoproperty-query-expectation.jsonld rename to data/entities/expectations/building-geoproperty-query.jsonld diff --git a/data/entities/expectations/building-language-property-update-expectation.jsonld b/data/entities/expectations/building-language-property-update.jsonld similarity index 100% rename from data/entities/expectations/building-language-property-update-expectation.jsonld rename to data/entities/expectations/building-language-property-update.jsonld diff --git a/data/entities/expectations/building-minimal-compacted-expectation.json b/data/entities/expectations/building-minimal-compacted.json similarity index 100% rename from data/entities/expectations/building-minimal-compacted-expectation.json rename to data/entities/expectations/building-minimal-compacted.json diff --git a/data/entities/expectations/building-minimal-with-one-scope-expectation.json b/data/entities/expectations/building-minimal-with-one-scope.json similarity index 100% rename from data/entities/expectations/building-minimal-with-one-scope-expectation.json rename to data/entities/expectations/building-minimal-with-one-scope.json diff --git a/data/entities/expectations/building-minimal-with-two-scopes-expectation.json b/data/entities/expectations/building-minimal-with-two-scopes.json similarity index 100% rename from data/entities/expectations/building-minimal-with-two-scopes-expectation.json rename to data/entities/expectations/building-minimal-with-two-scopes.json diff --git a/data/entities/expectations/building-minimal-expectation.json b/data/entities/expectations/building-minimal.json similarity index 100% rename from data/entities/expectations/building-minimal-expectation.json rename to data/entities/expectations/building-minimal.json diff --git a/data/entities/expectations/building-simple-attributes-sample-compacted-expectation.json b/data/entities/expectations/building-simple-attributes-compacted.json similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-compacted-expectation.json rename to data/entities/expectations/building-simple-attributes-compacted.json diff --git a/data/entities/expectations/building-simple-attributes-sample-expanded-expectation.json b/data/entities/expectations/building-simple-attributes-expanded.json similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-expanded-expectation.json rename to data/entities/expectations/building-simple-attributes-expanded.json diff --git a/data/entities/expectations/building-simple-attributes-query-expectation.jsonld b/data/entities/expectations/building-simple-attributes-query.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-query-expectation.jsonld rename to data/entities/expectations/building-simple-attributes-query.jsonld diff --git a/data/entities/expectations/building-simple-attributes-simplified-expectation.json b/data/entities/expectations/building-simple-attributes-simplified.json similarity index 100% rename from data/entities/expectations/building-simple-attributes-simplified-expectation.json rename to data/entities/expectations/building-simple-attributes-simplified.json diff --git a/data/entities/expectations/building-simple-attributes-simplified-expectation.jsonld b/data/entities/expectations/building-simple-attributes-simplified.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-simplified-expectation.jsonld rename to data/entities/expectations/building-simple-attributes-simplified.jsonld diff --git a/data/entities/expectations/building-simple-attributes-expectation.jsonld b/data/entities/expectations/building-simple-attributes.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-expectation.jsonld rename to data/entities/expectations/building-simple-attributes.jsonld diff --git a/data/entities/expectations/two-types-vehicle-offstreetparking-expectation.jsonld b/data/entities/expectations/two-types-vehicle-offstreetparking.jsonld similarity index 100% rename from data/entities/expectations/two-types-vehicle-offstreetparking-expectation.jsonld rename to data/entities/expectations/two-types-vehicle-offstreetparking.jsonld diff --git a/data/entities/expectations/two-vehicles-expectation.jsonld b/data/entities/expectations/two-vehicles.jsonld similarity index 100% rename from data/entities/expectations/two-vehicles-expectation.jsonld rename to data/entities/expectations/two-vehicles.jsonld diff --git a/data/entities/expectations/vehicle-delete-datasetid-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-datasetid-speed.jsonld similarity index 100% rename from data/entities/expectations/vehicle-delete-datasetid-speed-expectation.jsonld rename to data/entities/expectations/vehicle-delete-datasetid-speed.jsonld diff --git a/data/entities/expectations/vehicle-delete-default-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-default-speed.jsonld similarity index 100% rename from data/entities/expectations/vehicle-delete-default-speed-expectation.jsonld rename to data/entities/expectations/vehicle-delete-default-speed.jsonld diff --git a/data/entities/expectations/vehicle-delete-deleteall-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-deleteall-speed.jsonld similarity index 100% rename from data/entities/expectations/vehicle-delete-deleteall-speed-expectation.jsonld rename to data/entities/expectations/vehicle-delete-deleteall-speed.jsonld diff --git a/data/entities/expectations/vehicle-isparked-update-expectation.jsonld b/data/entities/expectations/vehicle-isparked-update.jsonld similarity index 100% rename from data/entities/expectations/vehicle-isparked-update-expectation.jsonld rename to data/entities/expectations/vehicle-isparked-update.jsonld diff --git a/data/entities/expectations/vehicle-language-property-appended-expectation.jsonld b/data/entities/expectations/vehicle-language-property-appended.jsonld similarity index 100% rename from data/entities/expectations/vehicle-language-property-appended-expectation.jsonld rename to data/entities/expectations/vehicle-language-property-appended.jsonld diff --git a/data/entities/expectations/vehicle-multi-attributes-expectation.jsonld b/data/entities/expectations/vehicle-multi-attributes.jsonld similarity index 100% rename from data/entities/expectations/vehicle-multi-attributes-expectation.jsonld rename to data/entities/expectations/vehicle-multi-attributes.jsonld diff --git a/data/entities/expectations/vehicle-parking-simple-expectation.geojson b/data/entities/expectations/vehicle-parking-simple.geojson similarity index 100% rename from data/entities/expectations/vehicle-parking-simple-expectation.geojson rename to data/entities/expectations/vehicle-parking-simple.geojson diff --git a/data/entities/expectations/vehicle-simple-attributes-core-context-expectation.json b/data/entities/expectations/vehicle-simple-attributes-core-context.json similarity index 100% rename from data/entities/expectations/vehicle-simple-attributes-core-context-expectation.json rename to data/entities/expectations/vehicle-simple-attributes-core-context.json diff --git a/data/entities/expectations/vehicle-speed-appended-expectation.jsonld b/data/entities/expectations/vehicle-speed-appended.jsonld similarity index 100% rename from data/entities/expectations/vehicle-speed-appended-expectation.jsonld rename to data/entities/expectations/vehicle-speed-appended.jsonld diff --git a/data/entities/expectations/vehicle-speed-different-datasetid-expectation.jsonld b/data/entities/expectations/vehicle-speed-different-datasetid.jsonld similarity index 100% rename from data/entities/expectations/vehicle-speed-different-datasetid-expectation.jsonld rename to data/entities/expectations/vehicle-speed-different-datasetid.jsonld diff --git a/data/entities/expectations/vehicle-update-attributes-expectation.jsonld b/data/entities/expectations/vehicle-update-attributes.jsonld similarity index 100% rename from data/entities/expectations/vehicle-update-attributes-expectation.jsonld rename to data/entities/expectations/vehicle-update-attributes.jsonld diff --git a/data/entities/expectations/vehicle-update-datasetid-attributes-expectation.jsonld b/data/entities/expectations/vehicle-update-datasetid-attributes.jsonld similarity index 100% rename from data/entities/expectations/vehicle-update-datasetid-attributes-expectation.jsonld rename to data/entities/expectations/vehicle-update-datasetid-attributes.jsonld diff --git a/data/entities/expectations/vehicle-update-speed-expectation.jsonld b/data/entities/expectations/vehicle-update-speed.jsonld similarity index 100% rename from data/entities/expectations/vehicle-update-speed-expectation.jsonld rename to data/entities/expectations/vehicle-update-speed.jsonld diff --git a/data/entities/invalid-json-sample.jsonld b/data/entities/invalid-json.jsonld similarity index 100% rename from data/entities/invalid-json-sample.jsonld rename to data/entities/invalid-json.jsonld diff --git a/data/entities/parking-simple-attributes-sample.jsonld b/data/entities/parking-simple-attributes.jsonld similarity index 100% rename from data/entities/parking-simple-attributes-sample.jsonld rename to data/entities/parking-simple-attributes.jsonld diff --git a/data/entities/vehicle-simple-attributes-sample.json b/data/entities/vehicle-simple-attributes.json similarity index 100% rename from data/entities/vehicle-simple-attributes-sample.json rename to data/entities/vehicle-simple-attributes.json diff --git a/data/entities/vehicle-simple-attributes-sample.jsonld b/data/entities/vehicle-simple-attributes.jsonld similarity index 100% rename from data/entities/vehicle-simple-attributes-sample.jsonld rename to data/entities/vehicle-simple-attributes.jsonld diff --git a/data/entities/vehicle-speed-two-datasetid-sample.jsonld b/data/entities/vehicle-speed-two-datasetid.jsonld similarity index 100% rename from data/entities/vehicle-speed-two-datasetid-sample.jsonld rename to data/entities/vehicle-speed-two-datasetid.jsonld diff --git a/data/entities/vehicle-two-datasetid-attributes-sample.jsonld b/data/entities/vehicle-two-datasetid-attributes.jsonld similarity index 100% rename from data/entities/vehicle-two-datasetid-attributes-sample.jsonld rename to data/entities/vehicle-two-datasetid-attributes.jsonld diff --git a/data/jsonldContext/@context-duplicated-key.json b/data/jsonldContext/@context-duplicated-key.json deleted file mode 100644 index 2f5d5a43..00000000 --- a/data/jsonldContext/@context-duplicated-key.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "@context": { - "A1": "urn:ngsi-ld:attributes:A1", - "A1": "urn:ngsi-ld:attributes:A2", - "A3": "urn:ngsi-ld:attributes:A3" - } -} diff --git a/data/subscriptions/expectations/subscription-028-01-expectation.jsonld b/data/subscriptions/expectations/subscription-028-01.jsonld similarity index 100% rename from data/subscriptions/expectations/subscription-028-01-expectation.jsonld rename to data/subscriptions/expectations/subscription-028-01.jsonld diff --git a/data/subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld b/data/subscriptions/expectations/subscription-vehicle-expanded-types.jsonld similarity index 100% rename from data/subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld rename to data/subscriptions/expectations/subscription-vehicle-expanded-types.jsonld diff --git a/data/subscriptions/expectations/subscription-vehicle-sample.jsonld b/data/subscriptions/expectations/subscription-vehicle.jsonld similarity index 100% rename from data/subscriptions/expectations/subscription-vehicle-sample.jsonld rename to data/subscriptions/expectations/subscription-vehicle.jsonld diff --git a/data/subscriptions/expectations/subscriptions-030-03-expectation.json b/data/subscriptions/expectations/subscriptions-030-03.json similarity index 100% rename from data/subscriptions/expectations/subscriptions-030-03-expectation.json rename to data/subscriptions/expectations/subscriptions-030-03.json diff --git a/data/subscriptions/expectations/subscriptions-031-01-expectation.json b/data/subscriptions/expectations/subscriptions-031-01.json similarity index 100% rename from data/subscriptions/expectations/subscriptions-031-01-expectation.json rename to data/subscriptions/expectations/subscriptions-031-01.json diff --git a/data/subscriptions/fragments/subscription-expiresAt-future-update-sample.json b/data/subscriptions/fragments/subscription-expiresAt-future-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-expiresAt-future-update-sample.json rename to data/subscriptions/fragments/subscription-expiresAt-future-update.json diff --git a/data/subscriptions/fragments/subscription-expiresAt-update-sample.json b/data/subscriptions/fragments/subscription-expiresAt-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-expiresAt-update-sample.json rename to data/subscriptions/fragments/subscription-expiresAt-update.json diff --git a/data/subscriptions/fragments/subscription-invalid-update-sample.json b/data/subscriptions/fragments/subscription-invalid-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-invalid-update-sample.json rename to data/subscriptions/fragments/subscription-invalid-update.json diff --git a/data/subscriptions/fragments/subscription-isActive-expiresAt-update-sample.json b/data/subscriptions/fragments/subscription-isActive-expiresAt-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-isActive-expiresAt-update-sample.json rename to data/subscriptions/fragments/subscription-isActive-expiresAt-update.json diff --git a/data/subscriptions/fragments/subscription-isActive-false-update-sample.json b/data/subscriptions/fragments/subscription-isActive-false-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-isActive-false-update-sample.json rename to data/subscriptions/fragments/subscription-isActive-false-update.json diff --git a/data/subscriptions/fragments/subscription-isActive-true-update-sample.json b/data/subscriptions/fragments/subscription-isActive-true-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-isActive-true-update-sample.json rename to data/subscriptions/fragments/subscription-isActive-true-update.json diff --git a/data/subscriptions/fragments/subscription-null-properties-update-sample.json b/data/subscriptions/fragments/subscription-null-properties-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-null-properties-update-sample.json rename to data/subscriptions/fragments/subscription-null-properties-update.json diff --git a/data/subscriptions/fragments/subscription-update-sample.json b/data/subscriptions/fragments/subscription-update.json similarity index 100% rename from data/subscriptions/fragments/subscription-update-sample.json rename to data/subscriptions/fragments/subscription-update.json diff --git a/data/subscriptions/fragments/subscription-vehicle-entities-sample.json b/data/subscriptions/fragments/subscription-vehicle-entities.json similarity index 100% rename from data/subscriptions/fragments/subscription-vehicle-entities-sample.json rename to data/subscriptions/fragments/subscription-vehicle-entities.json diff --git a/data/subscriptions/subscription-empty-sample.jsonld b/data/subscriptions/subscription-empty.jsonld similarity index 100% rename from data/subscriptions/subscription-empty-sample.jsonld rename to data/subscriptions/subscription-empty.jsonld diff --git a/data/subscriptions/subscription-inactive-sample.jsonld b/data/subscriptions/subscription-inactive.jsonld similarity index 100% rename from data/subscriptions/subscription-inactive-sample.jsonld rename to data/subscriptions/subscription-inactive.jsonld diff --git a/data/subscriptions/subscription-invalid-json-sample.jsonld b/data/subscriptions/subscription-invalid-json.jsonld similarity index 100% rename from data/subscriptions/subscription-invalid-json-sample.jsonld rename to data/subscriptions/subscription-invalid-json.jsonld diff --git a/data/subscriptions/subscription-invalid-negative-throttling-sample.jsonld b/data/subscriptions/subscription-invalid-negative-throttling.jsonld similarity index 100% rename from data/subscriptions/subscription-invalid-negative-throttling-sample.jsonld rename to data/subscriptions/subscription-invalid-negative-throttling.jsonld diff --git a/data/subscriptions/subscription-invalid-throttling-timeInterval-sample.jsonld b/data/subscriptions/subscription-invalid-throttling-timeInterval.jsonld similarity index 100% rename from data/subscriptions/subscription-invalid-throttling-timeInterval-sample.jsonld rename to data/subscriptions/subscription-invalid-throttling-timeInterval.jsonld diff --git a/data/subscriptions/subscription-timeInterval-sample.jsonld b/data/subscriptions/subscription-timeInterval.jsonld similarity index 100% rename from data/subscriptions/subscription-timeInterval-sample.jsonld rename to data/subscriptions/subscription-timeInterval.jsonld diff --git a/data/subscriptions/subscription-unretrievable-context-sample.jsonld b/data/subscriptions/subscription-unretrievable-context.jsonld similarity index 100% rename from data/subscriptions/subscription-unretrievable-context-sample.jsonld rename to data/subscriptions/subscription-unretrievable-context.jsonld diff --git a/data/subscriptions/subscription-valid-throttling-sample.jsonld b/data/subscriptions/subscription-valid-throttling.jsonld similarity index 100% rename from data/subscriptions/subscription-valid-throttling-sample.jsonld rename to data/subscriptions/subscription-valid-throttling.jsonld diff --git a/data/subscriptions/subscription-watchedAttributes-sample.jsonld b/data/subscriptions/subscription-watchedAttributes.jsonld similarity index 100% rename from data/subscriptions/subscription-watchedAttributes-sample.jsonld rename to data/subscriptions/subscription-watchedAttributes.jsonld diff --git a/data/subscriptions/subscription-sample.jsonld b/data/subscriptions/subscription.jsonld similarity index 100% rename from data/subscriptions/subscription-sample.jsonld rename to data/subscriptions/subscription.jsonld diff --git a/data/temporalEntities/2020-08-bus-temporal-representation-sample.jsonld b/data/temporalEntities/2020-08-bus-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/2020-08-bus-temporal-representation-sample.jsonld rename to data/temporalEntities/2020-08-bus-temporal-representation.jsonld diff --git a/data/temporalEntities/2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld b/data/temporalEntities/2020-08-vehicle-temporal-representation-multiple-instances.jsonld similarity index 100% rename from data/temporalEntities/2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld rename to data/temporalEntities/2020-08-vehicle-temporal-representation-multiple-instances.jsonld diff --git a/data/temporalEntities/2020-08-vehicule-temporal-representation-sample.jsonld b/data/temporalEntities/2020-08-vehicle-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/2020-08-vehicule-temporal-representation-sample.jsonld rename to data/temporalEntities/2020-08-vehicle-temporal-representation.jsonld diff --git a/data/temporalEntities/2020-09-vehicule-temporal-representation-sample.jsonld b/data/temporalEntities/2020-09-vehicle-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/2020-09-vehicule-temporal-representation-sample.jsonld rename to data/temporalEntities/2020-09-vehicle-temporal-representation.jsonld diff --git a/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld b/data/temporalEntities/2020-10-vehicle-temporal-representation-with-location.jsonld similarity index 100% rename from data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld rename to data/temporalEntities/2020-10-vehicle-temporal-representation-with-location.jsonld diff --git a/data/temporalEntities/bus-temporal-representation-unretrievable-context-sample.jsonld b/data/temporalEntities/bus-temporal-representation-unretrievable-context.jsonld similarity index 100% rename from data/temporalEntities/bus-temporal-representation-unretrievable-context-sample.jsonld rename to data/temporalEntities/bus-temporal-representation-unretrievable-context.jsonld diff --git a/data/temporalEntities/expectations/vehicle-language-property-normalized-temporal-representation-expectation.jsonld b/data/temporalEntities/expectations/vehicle-language-property-normalized-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-language-property-normalized-temporal-representation-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-language-property-normalized-temporal-representation.jsonld diff --git a/data/temporalEntities/expectations/vehicle-language-property-simplified-temporal-representation-expectation.jsonld b/data/temporalEntities/expectations/vehicle-language-property-simplified-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-language-property-simplified-temporal-representation-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-language-property-simplified-temporal-representation.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-01-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-01.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-02-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-02.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld new file mode 100644 index 00000000..0c4045ef --- /dev/null +++ b/data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld @@ -0,0 +1,21 @@ +{ + "id":"urn:ngsi-ld:Vehicle:randomUUID", + "type":"Vehicle", + "fuelLevel":[ + { + "type":"Property", + "value":67, + "observedAt":"2020-08-01T12:03:00Z" + }, + { + "type":"Property", + "value":53, + "observedAt":"2020-08-01T13:05:00Z" + }, + { + "type":"Property", + "value":40, + "observedAt":"2020-08-01T14:07:00Z" + } + ] +} \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-04-01.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-05-01-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-05-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-05-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-05-01.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-05-02-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-05-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-05-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-05-02.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-10-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-10.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-10-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-10.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-01-expectation.json b/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-01.json similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-11-01-expectation.json rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-11-01.json diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-02-expectation.json b/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-02.json similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-11-02-expectation.json rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-11-02.json diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-03-expectation.json b/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-03.json similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-11-03-expectation.json rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-11-03.json diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-04-expectation.json b/data/temporalEntities/expectations/vehicle-temporal-representation-020-11-04.json similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-020-11-04-expectation.json rename to data/temporalEntities/expectations/vehicle-temporal-representation-020-11-04.json diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-added-attribute-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-added-attribute.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-added-attribute-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-added-attribute.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-create-with-no-context-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-create-with-no-context.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-create-with-no-context-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-create-with-no-context.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-create-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-create.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-create-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-create.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-datasetid-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-datasetid.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-datasetid-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-datasetid.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-deleteall-fuelLevel-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-deleteall-fuelLevel.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-deleteall-fuelLevel-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-deleteall-fuelLevel.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-modify-attribute-instance-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-modify-attribute-instance.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-modify-attribute-instance-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-modify-attribute-instance.jsonld diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-update-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-update.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicle-temporal-representation-update-expectation.jsonld rename to data/temporalEntities/expectations/vehicle-temporal-representation-update.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-01-01.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-01-02.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-02.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-03-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-03.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-03-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-03.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-04-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-04.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-04-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-04.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-05-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-05.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-05-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-05.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-06-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-06.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-06-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-06.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-07-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-07.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-07-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-07.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-08-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-08.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-08-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-08.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-09-01.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-09-02.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-13-01.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02-expectation.jsonld b/data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02.jsonld similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02-expectation.jsonld rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-13-02.jsonld diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01-expectation.json b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01.json similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01-expectation.json rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-14-01.json diff --git a/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02-expectation.json b/data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02.json similarity index 100% rename from data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02-expectation.json rename to data/temporalEntities/expectations/vehicles-temporal-representation-021-14-02.json diff --git a/data/temporalEntities/vehicle-create-temporal-representation-without-context-sample.jsonld b/data/temporalEntities/vehicle-create-temporal-representation-without-context.jsonld similarity index 100% rename from data/temporalEntities/vehicle-create-temporal-representation-without-context-sample.jsonld rename to data/temporalEntities/vehicle-create-temporal-representation-without-context.jsonld diff --git a/data/temporalEntities/vehicle-create-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-create-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/vehicle-create-temporal-representation-sample.jsonld rename to data/temporalEntities/vehicle-create-temporal-representation.jsonld diff --git a/data/temporalEntities/vehicle-language-property-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-language-property-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/vehicle-language-property-temporal-representation-sample.jsonld rename to data/temporalEntities/vehicle-language-property-temporal-representation.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-empty-json-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-empty-json-sample.jsonld deleted file mode 100644 index e69de29b..00000000 diff --git a/data/jsonldContext/expected-detailed-@context.json b/data/temporalEntities/vehicle-temporal-representation-empty-json.jsonld similarity index 100% rename from data/jsonldContext/expected-detailed-@context.json rename to data/temporalEntities/vehicle-temporal-representation-empty-json.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-invalid-json-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-invalid-json.jsonld similarity index 100% rename from data/temporalEntities/vehicle-temporal-representation-invalid-json-sample.jsonld rename to data/temporalEntities/vehicle-temporal-representation-invalid-json.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-update-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-update.jsonld similarity index 100% rename from data/temporalEntities/vehicle-temporal-representation-update-sample.jsonld rename to data/temporalEntities/vehicle-temporal-representation-update.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-without-id-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-without-id.jsonld similarity index 100% rename from data/temporalEntities/vehicle-temporal-representation-without-id-sample.jsonld rename to data/temporalEntities/vehicle-temporal-representation-without-id.jsonld diff --git a/data/temporalEntities/vehicle-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation.jsonld similarity index 100% rename from data/temporalEntities/vehicle-temporal-representation-sample.jsonld rename to data/temporalEntities/vehicle-temporal-representation.jsonld diff --git a/data/types/expectations/attribute-026-01-01-expectation.json b/data/types/expectations/attribute-026-01-01.json similarity index 100% rename from data/types/expectations/attribute-026-01-01-expectation.json rename to data/types/expectations/attribute-026-01-01.json diff --git a/data/types/expectations/attribute-026-01-02-expectation.json b/data/types/expectations/attribute-026-01-02.json similarity index 100% rename from data/types/expectations/attribute-026-01-02-expectation.json rename to data/types/expectations/attribute-026-01-02.json diff --git a/data/types/expectations/attribute-027-01-expectation.json b/data/types/expectations/attribute-027-01.json similarity index 100% rename from data/types/expectations/attribute-027-01-expectation.json rename to data/types/expectations/attribute-027-01.json diff --git a/data/types/expectations/attribute-list-025-01-01-expectation.json b/data/types/expectations/attribute-list-025-01-01.json similarity index 100% rename from data/types/expectations/attribute-list-025-01-01-expectation.json rename to data/types/expectations/attribute-list-025-01-01.json diff --git a/data/types/expectations/attribute-list-025-01-02-expectation.json b/data/types/expectations/attribute-list-025-01-02.json similarity index 100% rename from data/types/expectations/attribute-list-025-01-02-expectation.json rename to data/types/expectations/attribute-list-025-01-02.json diff --git a/data/types/expectations/entity-type-023-01-01-expectation.json b/data/types/expectations/entity-type-023-01-01.json similarity index 100% rename from data/types/expectations/entity-type-023-01-01-expectation.json rename to data/types/expectations/entity-type-023-01-01.json diff --git a/data/types/expectations/entity-type-023-01-02-expectation.json b/data/types/expectations/entity-type-023-01-02.json similarity index 100% rename from data/types/expectations/entity-type-023-01-02-expectation.json rename to data/types/expectations/entity-type-023-01-02.json diff --git a/data/types/expectations/entity-type-info-024-01-expectation.json b/data/types/expectations/entity-type-info-024-01.json similarity index 100% rename from data/types/expectations/entity-type-info-024-01-expectation.json rename to data/types/expectations/entity-type-info-024-01.json diff --git a/data/types/expectations/entity-type-list-022-01-01-expectation.json b/data/types/expectations/entity-type-list-022-01-01.json similarity index 100% rename from data/types/expectations/entity-type-list-022-01-01-expectation.json rename to data/types/expectations/entity-type-list-022-01-01.json diff --git a/data/types/expectations/entity-type-list-022-01-02-expectation.json b/data/types/expectations/entity-type-list-022-01-02.json similarity index 100% rename from data/types/expectations/entity-type-list-022-01-02-expectation.json rename to data/types/expectations/entity-type-list-022-01-02.json diff --git a/doc/files/CommonBehaviours/043_01.json b/doc/files/CommonBehaviours/043_01.json index a2c342ab..d14a18af 100644 --- a/doc/files/CommonBehaviours/043_01.json +++ b/doc/files/CommonBehaviours/043_01.json @@ -25,7 +25,7 @@ "teardown": "Delete Entity by Id", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 503 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/LdContextNotAvailable' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-unretrievable-context-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-unretrievable-context.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": "Delete Subscription", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription with Response Status Code set to 503 and\n Create Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/LdContextNotAvailable' and\n Create Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-unretrievable-context-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-unretrievable-context.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -59,7 +59,7 @@ "teardown": "Delete Temporal Representation Of Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 503 and\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/LdContextNotAvailable' and\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response body containing 'title' element\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'bus-temporal-representation-unretrievable-context-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'bus-temporal-representation-unretrievable-context.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" }, diff --git a/doc/files/CommonBehaviours/044_02.json b/doc/files/CommonBehaviours/044_02.json index 80ee4040..750143ed 100644 --- a/doc/files/CommonBehaviours/044_02.json +++ b/doc/files/CommonBehaviours/044_02.json @@ -28,7 +28,7 @@ "teardown": "Delete Initial Subscription", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Update Subscription with Response Status Code set to 204\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/merge-patch+json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/merge-patch+json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/CommonBehaviours/048_01.json b/doc/files/CommonBehaviours/048_01.json index 5721211f..057be248 100644 --- a/doc/files/CommonBehaviours/048_01.json +++ b/doc/files/CommonBehaviours/048_01.json @@ -42,7 +42,7 @@ "teardown": "Delete Subscription", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Update Subscription with Response Status Code set to 415\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/xml' and\nPayload defined in file 'csourceSubscriptions/fragments/subscription-update-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/xml' and\nPayload defined in file 'csourceSubscriptions/fragments/subscription-update.jsonld'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" }, @@ -59,7 +59,7 @@ "teardown": "Delete Entity by Id", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Create Entity Selecting Content Type with Response Status Code set to 415\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/xml' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/xml' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -76,7 +76,7 @@ "teardown": "Delete Subscription", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Create Subscription with Response Status Code set to 415\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/xml' and\n payload defined in file: 'csourceSubscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/xml' and\n payload defined in file: 'csourceSubscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -110,7 +110,7 @@ "teardown": "Delete Temporal Representation Of Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 415\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/xml' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/xml' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Consumption/018_01_01.json b/doc/files/ContextInformation/Consumption/018_01_01.json index d25620ac..a2b58640 100644 --- a/doc/files/ContextInformation/Consumption/018_01_01.json +++ b/doc/files/ContextInformation/Consumption/018_01_01.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-expectation.jsonld'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes.jsonld'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/ld+json'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/018_01_02.json b/doc/files/ContextInformation/Consumption/018_01_02.json index 4aff9ddf..86e65131 100644 --- a/doc/files/ContextInformation/Consumption/018_01_02.json +++ b/doc/files/ContextInformation/Consumption/018_01_02.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-query-expectation.jsonld'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-query.jsonld'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: attrs set to '${attributes_to_be_retrieved}'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/018_01_03.json b/doc/files/ContextInformation/Consumption/018_01_03.json index 2e7bef60..cdbec4fc 100644 --- a/doc/files/ContextInformation/Consumption/018_01_03.json +++ b/doc/files/ContextInformation/Consumption/018_01_03.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-geoproperty-query-expectation.jsonld'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-geoproperty-query.jsonld'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: geoproperty set to 'location'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/018_04.json b/doc/files/ContextInformation/Consumption/018_04.json index ed301135..8ff6c45c 100644 --- a/doc/files/ContextInformation/Consumption/018_04.json +++ b/doc/files/ContextInformation/Consumption/018_04.json @@ -25,7 +25,7 @@ "setup": null, "teardown": "Delete Created Entity", "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-simplified-expectation.jsonld'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-simplified.jsonld'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: options set to 'keyValues'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/018_06.json b/doc/files/ContextInformation/Consumption/018_06.json index a17ae1c3..3a40c482 100644 --- a/doc/files/ContextInformation/Consumption/018_06.json +++ b/doc/files/ContextInformation/Consumption/018_06.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Created Entity", "template": "Review JSON-LD Resolution When retrieving an entity", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-sample-expanded-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-expanded.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/json' and\n Query Parameter: Link set to '<$${EMPTY}>; rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\"'\n}", "http_verb": "GET", "endpoint": "entities/{id}" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Created Entity", "template": "Review JSON-LD Resolution When retrieving an entity", - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-sample-compacted-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entity with Response Status Code set to 200 and\n Query Entity with Response Body containing en entity element with id set to '${entity_id}' and body content set to 'building-simple-attributes-compacted.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/{id}'\n method set to 'GET'\n Get Entity Request: and\n Query Parameter: id set to '${entity_id}' and\n Query Parameter: accept set to 'application/json' 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\"'\n}", "http_verb": "GET", "endpoint": "entities/{id}" diff --git a/doc/files/ContextInformation/Consumption/019_01_01.json b/doc/files/ContextInformation/Consumption/019_01_01.json index f9955fb4..929a1d81 100644 --- a/doc/files/ContextInformation/Consumption/019_01_01.json +++ b/doc/files/ContextInformation/Consumption/019_01_01.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_ids set to '${entities_ids_to_be_retrieved}' and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_01_02.json b/doc/files/ContextInformation/Consumption/019_01_02.json index f06d0445..e0b05772 100644 --- a/doc/files/ContextInformation/Consumption/019_01_02.json +++ b/doc/files/ContextInformation/Consumption/019_01_02.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response body containing a list containing entity elements with different types and\n Query Parameter: filename set to 'two-types-vehicle-offstreetparking-expectation.jsonld' and\n Query Parameter: entities_representation_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'True'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response body containing a list containing entity elements with different types and\n Query Parameter: filename set to 'two-types-vehicle-offstreetparking.jsonld' and\n Query Parameter: entities_representation_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'True'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: accept set to 'application/ld+json'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_01_03.json b/doc/files/ContextInformation/Consumption/019_01_03.json index ab0e60a1..53010519 100644 --- a/doc/files/ContextInformation/Consumption/019_01_03.json +++ b/doc/files/ContextInformation/Consumption/019_01_03.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_id_pattern set to 'urn:ngsi-ld:Building:.*' and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_01_04.json b/doc/files/ContextInformation/Consumption/019_01_04.json index f5ea11c9..244bc1b7 100644 --- a/doc/files/ContextInformation/Consumption/019_01_04.json +++ b/doc/files/ContextInformation/Consumption/019_01_04.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-attributes-query-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-attributes-query.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: attrs set to '${attributes_to_be_retrieved}'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_01_05.json b/doc/files/ContextInformation/Consumption/019_01_05.json index d7a48e2f..5344a9ca 100644 --- a/doc/files/ContextInformation/Consumption/019_01_05.json +++ b/doc/files/ContextInformation/Consumption/019_01_05.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-geoproperty-query-expectation.jsonld' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-geoproperty-query.jsonld' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: georel set to 'equals' and\n Query Parameter: geometry set to 'Point' and\n Query Parameter: coordinates set to '[13.3986, 52.5547]'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/019_02_01.json b/doc/files/ContextInformation/Consumption/019_02_01.json index d7ec3a92..7dc151cd 100644 --- a/doc/files/ContextInformation/Consumption/019_02_01.json +++ b/doc/files/ContextInformation/Consumption/019_02_01.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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: entity_ids set to '${first_entity_id}' and\n Query Parameter: entity_types set to 'https://ngsi-ld-test-suite/context#Building' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_02_02.json b/doc/files/ContextInformation/Consumption/019_02_02.json index 8e26de62..a43aeb3f 100644 --- a/doc/files/ContextInformation/Consumption/019_02_02.json +++ b/doc/files/ContextInformation/Consumption/019_02_02.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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response body containing a list containing entity elements with different types and\n Query Parameter: filename set to 'two-vehicles-expectation.jsonld' and\n Query Parameter: entities_representation_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'True'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response body containing a list containing entity elements with different types and\n Query Parameter: filename set to 'two-vehicles.jsonld' and\n Query Parameter: entities_representation_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: ignore_core_context_version set to 'True'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: entity_types set to 'https://ngsi-ld-test-suite/context#Vehicle' and\n Query Parameter: accept set to 'application/ld+json' and\n Query Parameter: content_type set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_02_03.json b/doc/files/ContextInformation/Consumption/019_02_03.json index 192ca38a..0d14ad59 100644 --- a/doc/files/ContextInformation/Consumption/019_02_03.json +++ b/doc/files/ContextInformation/Consumption/019_02_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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-minimal.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: entity_id_pattern set to 'urn:ngsi-ld:Building:.*' and\n Query Parameter: entity_types set to 'https://ngsi-ld-test-suite/context#Building' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_02_04.json b/doc/files/ContextInformation/Consumption/019_02_04.json index 88dc4256..4daecbeb 100644 --- a/doc/files/ContextInformation/Consumption/019_02_04.json +++ b/doc/files/ContextInformation/Consumption/019_02_04.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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'vehicle-simple-attributes-core-context-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_retrieved' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'vehicle-simple-attributes-core-context.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_retrieved' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: attrs set to '${attributes_to_be_retrieved}' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_02_05.json b/doc/files/ContextInformation/Consumption/019_02_05.json index fa79b393..a968ef31 100644 --- a/doc/files/ContextInformation/Consumption/019_02_05.json +++ b/doc/files/ContextInformation/Consumption/019_02_05.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 Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Check Response Body Content and\n Query Parameter: expectation_filename set to 'vehicle-parking-simple-expectation.geojson' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: additional_ignored_path set to '${EMPTY}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Entities Via POST with Response Status Code set to 200 and\n Query Entities Via POST with Check Response Body Content and\n Query Parameter: expectation_filename set to 'vehicle-parking-simple.geojson' and\n Query Parameter: response_body set to 'response.json()' and\n Query Parameter: additional_ignored_path set to '${EMPTY}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/query'\n method set to 'POST'\n Get Entities Via POST Request: and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: accept set to 'application/geo+json' 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: content_type set to 'application/json'\n}", "http_verb": "POST", "endpoint": "entityOperations/query" diff --git a/doc/files/ContextInformation/Consumption/019_04.json b/doc/files/ContextInformation/Consumption/019_04.json index d8cfcf5e..c3ddfe8f 100644 --- a/doc/files/ContextInformation/Consumption/019_04.json +++ b/doc/files/ContextInformation/Consumption/019_04.json @@ -25,7 +25,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-simple-attributes-simplified-expectation.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Query Entities with Response Status Code set to 200 and\n Query Entities with Response Body containing a list containing Entity Elements and\n Query Parameter: expectation_filename set to 'building-simple-attributes-simplified.json' and\n Query Parameter: entities_ids set to 'entities_ids_to_be_compared' and\n Query Parameter: ignore_core_context_version set to 'False'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'GET'\n Get Entities Request: and\n Query Parameter: entity_ids set to '${entities_ids_to_be_retrieved}' and\n Query Parameter: entity_types set to '${entity_types_to_be_retrieved}' and\n Query Parameter: options set to 'keyValues'\n}", "http_verb": "GET", "endpoint": "entities/" diff --git a/doc/files/ContextInformation/Consumption/020_01.json b/doc/files/ContextInformation/Consumption/020_01.json index 0e8cc7c6..39c753da 100644 --- a/doc/files/ContextInformation/Consumption/020_01.json +++ b/doc/files/ContextInformation/Consumption/020_01.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-01-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-01.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}'\n}", "http_verb": "GET", "endpoint": "temporal/entities/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_02.json b/doc/files/ContextInformation/Consumption/020_02.json index ed48c4f7..77c2bb6e 100644 --- a/doc/files/ContextInformation/Consumption/020_02.json +++ b/doc/files/ContextInformation/Consumption/020_02.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-02-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-02.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_03.json b/doc/files/ContextInformation/Consumption/020_03.json index 55afadde..b7f89959 100644 --- a/doc/files/ContextInformation/Consumption/020_03.json +++ b/doc/files/ContextInformation/Consumption/020_03.json @@ -26,7 +26,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-03-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-03.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_04.json b/doc/files/ContextInformation/Consumption/020_04.json index 2a74af7d..74ef58d6 100644 --- a/doc/files/ContextInformation/Consumption/020_04.json +++ b/doc/files/ContextInformation/Consumption/020_04.json @@ -27,7 +27,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal query", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-01-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-01.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: timerel set to 'after' and\n Query Parameter: timeAt set to '2020-08-01T13:03:00Z' and\n Query Parameter: endTimeAt set to '${EMPTY}' 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/{temporal_entity_representation_id}" @@ -43,7 +43,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal query", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-02-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-02.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: timerel set to 'before' and\n Query Parameter: timeAt set to '2020-08-01T12:05:00Z' and\n Query Parameter: endTimeAt set to '${EMPTY}' 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/{temporal_entity_representation_id}" @@ -59,7 +59,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal query", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-03-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-04-03.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: timerel set to 'between' and\n Query Parameter: timeAt set to '2020-08-01T12:00:00Z' and\n Query Parameter: endTimeAt set to '2020-08-01T13:00: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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_05.json b/doc/files/ContextInformation/Consumption/020_05.json index b47b4651..d110043d 100644 --- a/doc/files/ContextInformation/Consumption/020_05.json +++ b/doc/files/ContextInformation/Consumption/020_05.json @@ -27,7 +27,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of the last N instances of entity attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-05-01-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-05-01.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: lastN set to '10' 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/{temporal_entity_representation_id}" @@ -43,7 +43,7 @@ "setup": "Create Temporal Entity", "teardown": "Delete Initial Temporal Entity", "template": "Retrieve the temporal evolution of the last N instances of entity attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-05-02-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-05-02.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: lastN set to '20' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_10.json b/doc/files/ContextInformation/Consumption/020_10.json index 151f1dd5..2b038cff 100644 --- a/doc/files/ContextInformation/Consumption/020_10.json +++ b/doc/files/ContextInformation/Consumption/020_10.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-10-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-10.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: options set to '${options}' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_11.json b/doc/files/ContextInformation/Consumption/020_11.json index 340890f8..dcbd3a16 100644 --- a/doc/files/ContextInformation/Consumption/020_11.json +++ b/doc/files/ContextInformation/Consumption/020_11.json @@ -30,7 +30,7 @@ "setup": null, "teardown": null, "template": "Retrieve the temporal evolution of an entity with the aggregated temporal representation", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-01-expectation.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-01.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: attrs set to '${EMPTY}' and\n Query Parameter: options set to '${options}' and\n Query Parameter: aggrMethods set to 'avg' and\n Query Parameter: aggrPeriodDuration set to 'PT1H' 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/{temporal_entity_representation_id}" @@ -48,7 +48,7 @@ "setup": null, "teardown": null, "template": "Retrieve the temporal evolution of an entity with the aggregated temporal representation", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-02-expectation.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-02.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: attrs set to 'fuelLevel' and\n Query Parameter: options set to '${options}' and\n Query Parameter: aggrMethods set to 'avg' and\n Query Parameter: aggrPeriodDuration set to 'PT1H' 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/{temporal_entity_representation_id}" @@ -66,7 +66,7 @@ "setup": null, "teardown": null, "template": "Retrieve the temporal evolution of an entity with the aggregated temporal representation", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-03-expectation.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-03.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: attrs set to '${EMPTY}' and\n Query Parameter: options set to '${options}' and\n Query Parameter: aggrMethods set to 'avg,max' and\n Query Parameter: aggrPeriodDuration set to 'PT1H' 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/{temporal_entity_representation_id}" @@ -84,7 +84,7 @@ "setup": null, "teardown": null, "template": "Retrieve the temporal evolution of an entity with the aggregated temporal representation", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-04-expectation.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-temporal-representation-020-11-04.json'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: attrs set to '${EMPTY}' and\n Query Parameter: options set to '${options}' and\n Query Parameter: aggrMethods set to 'min,max' and\n Query Parameter: aggrPeriodDuration set to 'P1D' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/020_12.json b/doc/files/ContextInformation/Consumption/020_12.json index 4031111e..69aba745 100644 --- a/doc/files/ContextInformation/Consumption/020_12.json +++ b/doc/files/ContextInformation/Consumption/020_12.json @@ -33,7 +33,7 @@ "setup": null, "teardown": null, "template": "Retrieve Temporal Entity", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-language-property-normalized-temporal-representation-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-language-property-normalized-temporal-representation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: options set to '${EMPTY}' 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/{temporal_entity_representation_id}" @@ -52,7 +52,7 @@ "setup": null, "teardown": null, "template": "Retrieve Temporal Entity", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-language-property-simplified-temporal-representation-expectation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Temporal Representation Of Entity with Response Status Code set to 200 and\n Retrieve Temporal Representation Of Entity with Response Body containing EntityTemporal element containing attribute instances in the time range specified by the NGSI-LD temporal query:\n * the payload is defined in the file set to 'vehicle-language-property-simplified-temporal-representation.jsonld'\n * the id was changed to '${temporal_entity_representation_id}'\n * response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/temporal/entities/{temporal_entity_representation_id}'\n method set to 'GET'\n Retrieve Temporal Representation of Entity and\n Query Parameter: id set to '${temporal_entity_representation_id}' and\n Query Parameter: options set to 'temporalValues' 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/{temporal_entity_representation_id}" diff --git a/doc/files/ContextInformation/Consumption/021_01.json b/doc/files/ContextInformation/Consumption/021_01.json index ccf6e75f..796ffa31 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 'vehicles-temporal-representation-021-01-01-expectation.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-01-01.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\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-08-01T12:04: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 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 'vehicles-temporal-representation-021-01-02-expectation.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-01-02.jsonld'\n and using the list of entity ids define in '${temporal_entities_representation_ids}'\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 '2020-09-01T13:06: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_02.json b/doc/files/ContextInformation/Consumption/021_02.json index f06d4efc..d03c732f 100644 --- a/doc/files/ContextInformation/Consumption/021_02.json +++ b/doc/files/ContextInformation/Consumption/021_02.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-02-expectation.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 '${temporal_entities_representation_ids}'\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 21060d4e..9a4345ef 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-expectation.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 '${temporal_entities_representation_ids}'\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 '14' 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 7b34c686..0790c8ac 100644 --- a/doc/files/ContextInformation/Consumption/021_04.json +++ b/doc/files/ContextInformation/Consumption/021_04.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-04-expectation.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 '${temporal_entities_representation_ids}'\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 761143a1..b2f80cf1 100644 --- a/doc/files/ContextInformation/Consumption/021_05.json +++ b/doc/files/ContextInformation/Consumption/021_05.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-05-expectation.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 '${temporal_entities_representation_ids}'\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 287ef1d2..0e21e6d8 100644 --- a/doc/files/ContextInformation/Consumption/021_06.json +++ b/doc/files/ContextInformation/Consumption/021_06.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-06-expectation.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 '${temporal_entities_representation_ids}'\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 e7e51ca7..8bf6f1a9 100644 --- a/doc/files/ContextInformation/Consumption/021_07.json +++ b/doc/files/ContextInformation/Consumption/021_07.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-07-expectation.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 '${temporal_entities_representation_ids}'\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 8d9727be..5a0bda2e 100644 --- a/doc/files/ContextInformation/Consumption/021_08.json +++ b/doc/files/ContextInformation/Consumption/021_08.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-08-expectation.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 '${temporal_entities_representation_ids}'\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 914b6475..baa9bb4a 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-expectation.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 '${temporal_entities_representation_ids}'\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-expectation.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 '${temporal_entities_representation_ids}'\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 'contains' 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_13.json b/doc/files/ContextInformation/Consumption/021_13.json index ec2c4f63..4d47ea6d 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-expectation.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 '${temporal_entities_representation_ids}'\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-expectation.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 '${temporal_entities_representation_ids}'\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" diff --git a/doc/files/ContextInformation/Consumption/021_14.json b/doc/files/ContextInformation/Consumption/021_14.json index 2257cdf0..5960c7dc 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 'vehicles-temporal-representation-021-14-01-expectation.json'\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 '${temporal_entities_representation_ids}'\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-08-01T12:04: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' 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 'vehicles-temporal-representation-021-14-02-expectation.json'\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 '${temporal_entities_representation_ids}'\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 '2020-09-01T13:06: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' and\n Query Parameter: options set to 'temporalValues'\n}", "http_verb": "GET", "endpoint": "temporal/entities" diff --git a/doc/files/ContextInformation/Consumption/022_01.json b/doc/files/ContextInformation/Consumption/022_01.json index c81516bc..d9d0acd3 100644 --- a/doc/files/ContextInformation/Consumption/022_01.json +++ b/doc/files/ContextInformation/Consumption/022_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Retrieve Available Entity Types", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type List with expectation body equal to file: 'types/expectations/entity-type-list-022-01-01-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type List with expectation body equal to file: 'types/expectations/entity-type-list-022-01-01.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types'\n method set to 'GET'\n Retrieve entity types: and\n Query Parameter: context set to '${EMPTY}'\n}", "http_verb": "GET", "endpoint": "types" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Retrieve Available Entity Types", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type List with expectation body equal to file: 'types/expectations/entity-type-list-022-01-02-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type List with expectation body equal to file: 'types/expectations/entity-type-list-022-01-02.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types'\n method set to 'GET'\n Retrieve entity types: 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": "types" diff --git a/doc/files/ContextInformation/Consumption/023_01.json b/doc/files/ContextInformation/Consumption/023_01.json index 9304f516..d0c9559c 100644 --- a/doc/files/ContextInformation/Consumption/023_01.json +++ b/doc/files/ContextInformation/Consumption/023_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Retrieve Details Of Available Entity Types", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type Element with expectation body equal to file: 'types/expectations/entity-type-023-01-01-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type Element with expectation body equal to file: 'types/expectations/entity-type-023-01-01.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types'\n method set to 'GET'\n Retrieve entity types: and\n Query Parameter: context set to '${EMPTY}' and\n Query Parameter: details set to 'true'\n}", "http_verb": "GET", "endpoint": "types" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entities", "teardown": "Delete Initial Entities", "template": "Retrieve Details Of Available Entity Types", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type Element with expectation body equal to file: 'types/expectations/entity-type-023-01-02-expectation.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Types with Response Status Code set to 200 and\n Retrieve Entity Types with Response Body containing an Entity Type Element with expectation body equal to file: 'types/expectations/entity-type-023-01-02.json'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types'\n method set to 'GET'\n Retrieve entity types: 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: details set to 'true'\n}", "http_verb": "GET", "endpoint": "types" diff --git a/doc/files/ContextInformation/Consumption/024_02.json b/doc/files/ContextInformation/Consumption/024_02.json index b3e7e9ef..bf7f7032 100644 --- a/doc/files/ContextInformation/Consumption/024_02.json +++ b/doc/files/ContextInformation/Consumption/024_02.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Type with Response Status Code set to 200 and\n Retrieve Entity Type with Response body containing an Entity Type Info with expectation body set to file 'types/expectations/entity-type-info-024-01-expectation.json' and response body to be checked set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Entity Type with Response Status Code set to 200 and\n Retrieve Entity Type with Response body containing an Entity Type Info with expectation body set to file 'types/expectations/entity-type-info-024-01.json' and response body to be checked set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/types/{type}'\n method set to 'GET'\n Retrieve Entity Type, with type set to 'Building', with Header['Link'] containing '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": "types/{type}" diff --git a/doc/files/ContextInformation/Consumption/025_01.json b/doc/files/ContextInformation/Consumption/025_01.json index d7d1260b..398b1693 100644 --- a/doc/files/ContextInformation/Consumption/025_01.json +++ b/doc/files/ContextInformation/Consumption/025_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Initial Entity", "template": "Retrieve Available Attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response Body containing an Attribute List element\n * with filename set to 'types/expectations/attribute-list-025-01-01-expectation.json'\n * response set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response Body containing an Attribute List element\n * with filename set to 'types/expectations/attribute-list-025-01-01.json'\n * response set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes'\n method set to 'GET'\n Retrieve attributes: and\n Query Parameter: context set to '${EMPTY}'\n}", "http_verb": "GET", "endpoint": "attributes" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Initial Entity", "template": "Retrieve Available Attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response Body containing an Attribute List element\n * with filename set to 'types/expectations/attribute-list-025-01-02-expectation.json'\n * response set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response Body containing an Attribute List element\n * with filename set to 'types/expectations/attribute-list-025-01-02.json'\n * response set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes'\n method set to 'GET'\n Retrieve attributes: 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": "attributes" diff --git a/doc/files/ContextInformation/Consumption/026_01.json b/doc/files/ContextInformation/Consumption/026_01.json index e00b43dc..b035aab2 100644 --- a/doc/files/ContextInformation/Consumption/026_01.json +++ b/doc/files/ContextInformation/Consumption/026_01.json @@ -27,7 +27,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Initial Entity", "template": "Retrieve Details Of Available Attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-026-01-01-expectation.json'\n * and response body set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-026-01-01.json'\n * and response body set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes'\n method set to 'GET'\n Retrieve attributes: and\n Query Parameter: context set to '${EMPTY}' and\n Query Parameter: details set to 'true'\n}", "http_verb": "GET", "endpoint": "attributes" @@ -43,7 +43,7 @@ "setup": "Setup Initial Entity", "teardown": "Delete Initial Entity", "template": "Retrieve Details Of Available Attributes", - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-026-01-02-expectation.json'\n * and response body set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attributes with Response Status Code set to 200 and\n Retrieve Attributes with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-026-01-02.json'\n * and response body set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes'\n method set to 'GET'\n Retrieve attributes: 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: details set to 'true'\n}", "http_verb": "GET", "endpoint": "attributes" diff --git a/doc/files/ContextInformation/Consumption/027_02.json b/doc/files/ContextInformation/Consumption/027_02.json index d3788775..e322d548 100644 --- a/doc/files/ContextInformation/Consumption/027_02.json +++ b/doc/files/ContextInformation/Consumption/027_02.json @@ -26,7 +26,7 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attribute with Response Status Code set to 200 and\n Retrieve Attribute with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-027-01-expectation.json'\n * and response body set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Attribute with Response Status Code set to 200 and\n Retrieve Attribute with Response body containing an array of attributes\n * with the expected payload defined in the file 'types/expectations/attribute-027-01.json'\n * and response body set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/attributes/{attribute_name}'\n method set to 'GET'\n Retrieve Attribute with attributeName set to 'airQualityLevel'\n}", "http_verb": "GET", "endpoint": "attributes/{attribute_name}" diff --git a/doc/files/ContextInformation/Provision/001_01.json b/doc/files/ContextInformation/Provision/001_01.json index a89bba4a..039fb13d 100644 --- a/doc/files/ContextInformation/Provision/001_01.json +++ b/doc/files/ContextInformation/Provision/001_01.json @@ -27,7 +27,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-minimal-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-minimal.json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -43,7 +43,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -59,7 +59,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-relationship-of-property-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-relationship-of-property.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -75,7 +75,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-location-attribute-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-location-attribute.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_02.json b/doc/files/ContextInformation/Provision/001_02.json index 505fa379..584af26e 100644 --- a/doc/files/ContextInformation/Provision/001_02.json +++ b/doc/files/ContextInformation/Provision/001_02.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity From File with Response Status Code set to 400 and\n Create Entity From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Entity From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'invalid-json-sample.jsonld' and Content-Type set to 'application/ld+json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'invalid-json.jsonld' and Content-Type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity From File with Response Status Code set to 400 and\n Create Entity From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Entity From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'empty-sample.jsonld' and Content-Type set to 'application/ld+json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'empty.jsonld' and Content-Type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -58,7 +58,7 @@ "teardown": null, "template": "Create Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity From File with Response Status Code set to 400 and\n Create Entity From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Entity From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'building-minimal-sample.json' and Content-Type set to 'application/ld+json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request creation of an entity from filename 'building-minimal.json' and Content-Type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_03.json b/doc/files/ContextInformation/Provision/001_03.json index 406bd644..1b1c751f 100644 --- a/doc/files/ContextInformation/Provision/001_03.json +++ b/doc/files/ContextInformation/Provision/001_03.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Status Code set to 409 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/AlreadyExists' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-minimal-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-minimal.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_04.json b/doc/files/ContextInformation/Provision/001_04.json index c52a5a09..d0277708 100644 --- a/doc/files/ContextInformation/Provision/001_04.json +++ b/doc/files/ContextInformation/Provision/001_04.json @@ -26,7 +26,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'https://ngsi-ld-test-suite/context#almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_05.json b/doc/files/ContextInformation/Provision/001_05.json index d62f0e51..1ffe7649 100644 --- a/doc/files/ContextInformation/Provision/001_05.json +++ b/doc/files/ContextInformation/Provision/001_05.json @@ -26,7 +26,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'ngsi-ld:default-context/almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_06.json b/doc/files/ContextInformation/Provision/001_06.json index b9b9822c..884eb16c 100644 --- a/doc/files/ContextInformation/Provision/001_06.json +++ b/doc/files/ContextInformation/Provision/001_06.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 400 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_07.json b/doc/files/ContextInformation/Provision/001_07.json index 5d99bef0..af1f6bab 100644 --- a/doc/files/ContextInformation/Provision/001_07.json +++ b/doc/files/ContextInformation/Provision/001_07.json @@ -26,7 +26,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" }, @@ -42,7 +42,7 @@ "teardown": "Delete Initial Entity", "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Entity by Id with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'https://ngsi-ld-test-suite/context#almostFull' and\n Query Parameter: response_body set to 'response1.json()'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_08.json b/doc/files/ContextInformation/Provision/001_08.json index 73b24d2d..a2337688 100644 --- a/doc/files/ContextInformation/Provision/001_08.json +++ b/doc/files/ContextInformation/Provision/001_08.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 400 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.json'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_09.json b/doc/files/ContextInformation/Provision/001_09.json index 4870ec22..32cc6770 100644 --- a/doc/files/ContextInformation/Provision/001_09.json +++ b/doc/files/ContextInformation/Provision/001_09.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 400 and\n Create Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Entity Selecting Content Type with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/001_10.json b/doc/files/ContextInformation/Provision/001_10.json index 03ad7246..559dbac6 100644 --- a/doc/files/ContextInformation/Provision/001_10.json +++ b/doc/files/ContextInformation/Provision/001_10.json @@ -30,7 +30,7 @@ "teardown": "Delete Initial Entity", "template": "Create Entity Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Create Entity Selecting Content Type with Response Header: Location containing $${entity_id} and\n Retrieve Entity by Id with Check Created Resource Set To and\n Query Parameter: 'created_resource' set to 'created_entity' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-language-property-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-language-property.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/002_01.json b/doc/files/ContextInformation/Provision/002_01.json index ea1a0ae8..9a232e15 100644 --- a/doc/files/ContextInformation/Provision/002_01.json +++ b/doc/files/ContextInformation/Provision/002_01.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Entity Selecting Content Type with Response Status Code set to 201 and\n Delete Entity by Id with Response Status Code set to 204 and\n Retrieve Entity by Id with Response Status Code set to ${response2.status_code}\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Provision/003_03.json b/doc/files/ContextInformation/Provision/003_03.json index 8edd0961..1f9bfe5a 100644 --- a/doc/files/ContextInformation/Provision/003_03.json +++ b/doc/files/ContextInformation/Provision/003_03.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Batch Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/create'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'create', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/create'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'create', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/create" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Batch Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/create'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'create', Content-Type set to 'application/ld+json', and body set to 'batch/empty-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/create'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'create', Content-Type set to 'application/ld+json', and body set to 'batch/empty.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/create" } diff --git a/doc/files/ContextInformation/Provision/004_06.json b/doc/files/ContextInformation/Provision/004_06.json index 2e217abc..4cb466e6 100644 --- a/doc/files/ContextInformation/Provision/004_06.json +++ b/doc/files/ContextInformation/Provision/004_06.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Batch Upsert Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/upsert'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'upsert', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/upsert'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'upsert', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/upsert" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Batch Upsert Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/upsert'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'upsert', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-ld-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/upsert'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'upsert', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-ld.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/upsert" } diff --git a/doc/files/ContextInformation/Provision/005_04.json b/doc/files/ContextInformation/Provision/005_04.json index 38527c52..c4d5744e 100644 --- a/doc/files/ContextInformation/Provision/005_04.json +++ b/doc/files/ContextInformation/Provision/005_04.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Batch Update Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/update'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'update', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/update'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'update', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/update" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Batch Update Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/update'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'update', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-ld-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/update'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'update', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-ld.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/update" } diff --git a/doc/files/ContextInformation/Provision/006_03.json b/doc/files/ContextInformation/Provision/006_03.json index d7a8b45d..f0495039 100644 --- a/doc/files/ContextInformation/Provision/006_03.json +++ b/doc/files/ContextInformation/Provision/006_03.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Batch Delete Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/delete'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'delete', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/delete'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'delete', Content-Type set to 'application/ld+json', and body set to 'batch/invalid-json.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/delete" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Batch Delete Entity With Invalid Request Scenarios", "then": "then {\n the SUT sends a valid Response for the operations:\n Batch Request Entities From File with Response Status Code set to 400 and\n Batch Request Entities From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Batch Request Entities From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/delete'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'delete', Content-Type set to 'application/ld+json', and body set to 'batch/empty-sample.jsonld\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entityOperations/delete'\n method set to 'POST'\n Batch Entity Delete Request with operation set to 'delete', Content-Type set to 'application/ld+json', and body set to 'batch/empty.jsonld\n}", "http_verb": "POST", "endpoint": "entityOperations/delete" } diff --git a/doc/files/ContextInformation/Provision/007_01.json b/doc/files/ContextInformation/Provision/007_01.json index 188bc965..19bbee25 100644 --- a/doc/files/ContextInformation/Provision/007_01.json +++ b/doc/files/ContextInformation/Provision/007_01.json @@ -27,7 +27,7 @@ "teardown": "Delete Temporal Entity", "template": "Create Temporal Entity", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201 and\n Retrieve Temporal Representation Of Entity with Check Created Resource Set To and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" }, @@ -43,7 +43,7 @@ "teardown": "Delete Temporal Entity", "template": "Create Temporal Entity", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201 and\n Retrieve Temporal Representation Of Entity with Check Created Resource Set To and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation-without-context-sample.jsonld' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation-without-context.jsonld' and\n Query Parameter: content_type set to 'application/json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Provision/007_02.json b/doc/files/ContextInformation/Provision/007_02.json index 5bba381e..7193f098 100644 --- a/doc/files/ContextInformation/Provision/007_02.json +++ b/doc/files/ContextInformation/Provision/007_02.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Temporal Entity From File", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 400 and\n Create Temporal Representation Of Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Temporal Representation Of Entity Selecting Content Type with Response body containing 'title' element\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 'POST'\n Create Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: filename set to 'vehicle-temporal-representation-invalid-json-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+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 'POST'\n Create Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: filename set to 'vehicle-temporal-representation-invalid-json.jsonld' and\n Query Parameter: content_type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "temporal/entities" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Temporal Entity From File", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 400 and\n Create Temporal Representation Of Entity Selecting Content Type with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Temporal Representation Of Entity Selecting Content Type with Response body containing 'title' element\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 'POST'\n Create Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: filename set to 'vehicle-temporal-representation-empty-json-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+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 'POST'\n Create Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: filename set to 'vehicle-temporal-representation-empty-json.jsonld' and\n Query Parameter: content_type set to 'application/ld+json'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Provision/007_03.json b/doc/files/ContextInformation/Provision/007_03.json index e1e4e21e..2778762e 100644 --- a/doc/files/ContextInformation/Provision/007_03.json +++ b/doc/files/ContextInformation/Provision/007_03.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Temporal Entity", "then": "then {\n the SUT sends a valid Response for the operation:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 400\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${EMPTY}' and\n Query Parameter: filename set to 'vehicle-temporal-representation-without-id-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${EMPTY}' and\n Query Parameter: filename set to 'vehicle-temporal-representation-without-id.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Temporal Entity", "then": "then {\n the SUT sends a valid Response for the operation:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 400\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to 'invalidId' and\n Query Parameter: filename set to 'vehicle-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to 'invalidId' and\n Query Parameter: filename set to 'vehicle-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Provision/008_01.json b/doc/files/ContextInformation/Provision/008_01.json index ad50d4d3..2a9854c1 100644 --- a/doc/files/ContextInformation/Provision/008_01.json +++ b/doc/files/ContextInformation/Provision/008_01.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201 and\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 204 and\n Retrieve Temporal Representation Of Entity with Check Updated Entity and\n Query Parameter: 'updated_resource' set to 'temporal_entity_expectation_payload' and\n Query Parameter: 'response_body' set to 'response2.json()' and\n Query Parameter: 'ignored_keys' set to 'ignored_attributes'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-create-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Provision/016_01.json b/doc/files/ContextInformation/Provision/016_01.json index 891bc2cc..361722ba 100644 --- a/doc/files/ContextInformation/Provision/016_01.json +++ b/doc/files/ContextInformation/Provision/016_01.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Or Update Temporal Representation Of Entity Selecting Content Type with Response Status Code set to 201 and\n Modify Attribute Instance From Temporal Entity with Response Status Code set to 204 and\n Retrieve Temporal Representation Of Entity with Check Updated Entity and\n Query Parameter: 'ignored_keys' set to '${None}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-temporal-representation-sample.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\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 'POST'\n Create or Update Temporal Representation of Entity Selecting Content Type: and\n Query Parameter: temporal_entity_representation_id set to '${temporal_entity_representation_id}' and\n Query Parameter: filename set to 'vehicle-temporal-representation.jsonld' and\n Query Parameter: content_type set to 'application/ld+json' and\n Query Parameter: accept set to '${EMPTY}'\n}", "http_verb": "POST", "endpoint": "temporal/entities" } diff --git a/doc/files/ContextInformation/Subscription/028_01.json b/doc/files/ContextInformation/Subscription/028_01.json index 9d5d377d..233851f6 100644 --- a/doc/files/ContextInformation/Subscription/028_01.json +++ b/doc/files/ContextInformation/Subscription/028_01.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operation:\n Retrieve Subscription with Check Created Resource Set To and\n Query Parameter: 'ignored_keys' set to '${None}' list of keys\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/028_02.json b/doc/files/ContextInformation/Subscription/028_02.json index 73207135..06602dc4 100644 --- a/doc/files/ContextInformation/Subscription/028_02.json +++ b/doc/files/ContextInformation/Subscription/028_02.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Subscription With Invalid Request", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription From File with Response Status Code set to 400 and\n Create Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/InvalidRequest' and\n Create Subscription From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-json-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-json.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Subscription With Invalid Request", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription From File with Response Status Code set to 400 and\n Create Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-empty-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-empty.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/028_03.json b/doc/files/ContextInformation/Subscription/028_03.json index b9c49e57..e43b41d2 100644 --- a/doc/files/ContextInformation/Subscription/028_03.json +++ b/doc/files/ContextInformation/Subscription/028_03.json @@ -27,7 +27,7 @@ "teardown": null, "template": "Create Subscription With Invalid/Empty Id", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription with Response Status Code set to 400 and\n Create Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -43,7 +43,7 @@ "teardown": null, "template": "Create Subscription With Invalid/Empty Id", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription with Response Status Code set to 400 and\n Create Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/028_04.json b/doc/files/ContextInformation/Subscription/028_04.json index 22fcf02a..95933971 100644 --- a/doc/files/ContextInformation/Subscription/028_04.json +++ b/doc/files/ContextInformation/Subscription/028_04.json @@ -26,7 +26,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription with Response Status Code set to 409 and\n Create Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/AlreadyExists' and\n Create Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscriptions/subscription.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/028_05.json b/doc/files/ContextInformation/Subscription/028_05.json index 3931ff5e..2594493b 100644 --- a/doc/files/ContextInformation/Subscription/028_05.json +++ b/doc/files/ContextInformation/Subscription/028_05.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Create Subscription With Invalid Throttling", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription From File with Response Status Code set to 400 and\n Create Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-throttling-timeInterval-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-throttling-timeInterval.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Create Subscription With Invalid Throttling", "then": "then {\n the SUT sends a valid Response for the operations:\n Create Subscription From File with Response Status Code set to 400 and\n Create Subscription From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Create Subscription From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-negative-throttling-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'POST'\n Create Subscription Request with Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'subscription-invalid-negative-throttling.jsonld'\n}", "http_verb": "POST", "endpoint": "subscriptions/" } diff --git a/doc/files/ContextInformation/Subscription/029_01.json b/doc/files/ContextInformation/Subscription/029_01.json index 1365a18e..72525dd6 100644 --- a/doc/files/ContextInformation/Subscription/029_01.json +++ b/doc/files/ContextInformation/Subscription/029_01.json @@ -26,7 +26,7 @@ "teardown": null, "template": "Update Subscription With Non present Or Invalid Id", "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 405 and\n Update Subscription with Response Body containing the type '${EMPTY}' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" }, @@ -42,7 +42,7 @@ "teardown": null, "template": "Update Subscription With Non present Or Invalid Id", "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 400 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_02.json b/doc/files/ContextInformation/Subscription/029_02.json index 7c3cc63f..7f4f6a96 100644 --- a/doc/files/ContextInformation/Subscription/029_02.json +++ b/doc/files/ContextInformation/Subscription/029_02.json @@ -24,7 +24,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 404 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/ResourceNotFound' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_03.json b/doc/files/ContextInformation/Subscription/029_03.json index 00b7127b..8acec2bc 100644 --- a/doc/files/ContextInformation/Subscription/029_03.json +++ b/doc/files/ContextInformation/Subscription/029_03.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 400 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-invalid-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-invalid-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_04.json b/doc/files/ContextInformation/Subscription/029_04.json index 65656cba..6b9d566e 100644 --- a/doc/files/ContextInformation/Subscription/029_04.json +++ b/doc/files/ContextInformation/Subscription/029_04.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 400 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-null-properties-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-null-properties-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_05.json b/doc/files/ContextInformation/Subscription/029_05.json index d78e291b..20070527 100644 --- a/doc/files/ContextInformation/Subscription/029_05.json +++ b/doc/files/ContextInformation/Subscription/029_05.json @@ -26,8 +26,8 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscription-vehicle-sample.jsonld' with subscription id '${subscription_id}'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-vehicle-entities-sample.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscription-vehicle.jsonld' with subscription id '${subscription_id}'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-vehicle-entities.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" }, @@ -42,8 +42,8 @@ "setup": null, "teardown": null, "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld' with subscription id '${subscription_id}'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-vehicle-entities-sample.json'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscription-vehicle-expanded-types.jsonld' with subscription id '${subscription_id}'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-vehicle-entities.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_06.json b/doc/files/ContextInformation/Subscription/029_06.json index 2085014f..fcb7c5fe 100644 --- a/doc/files/ContextInformation/Subscription/029_06.json +++ b/doc/files/ContextInformation/Subscription/029_06.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Check Updated Entity and\n Query Parameter: 'updated_resource' set to 'subscription' and\n Query Parameter: 'response_body' set to 'response1.json()' and\n Query Parameter: 'ignored_keys' set to 'ignored_attributes'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Link'] contain the context 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld' and\nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_07.json b/doc/files/ContextInformation/Subscription/029_07.json index 8d0133d9..61dd6ce3 100644 --- a/doc/files/ContextInformation/Subscription/029_07.json +++ b/doc/files/ContextInformation/Subscription/029_07.json @@ -28,7 +28,7 @@ "teardown": null, "template": "Activate Paused Subscription With isActive Member", "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'status' and\n Query Parameter: response_body set to 'response1.json()' and\n Query Parameter: expected_attribute_value set to 'active'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-true-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-true-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_08.json b/doc/files/ContextInformation/Subscription/029_08.json index 7e10a5ad..b8e7144d 100644 --- a/doc/files/ContextInformation/Subscription/029_08.json +++ b/doc/files/ContextInformation/Subscription/029_08.json @@ -28,7 +28,7 @@ "teardown": null, "template": "Activate Paused Subscription With isActive And ExpiresAt Members", "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'status' and\n Query Parameter: response_body set to 'response1.json()' and\n Query Parameter: expected_attribute_value set to 'active'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-expiresAt-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-expiresAt-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_09.json b/doc/files/ContextInformation/Subscription/029_09.json index a0a1d90b..07e75ab4 100644 --- a/doc/files/ContextInformation/Subscription/029_09.json +++ b/doc/files/ContextInformation/Subscription/029_09.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 204 and\n Retrieve Subscription with Check Response Body containing an Attribute set to and\n Query Parameter: expected_attribute_name set to 'status' and\n Query Parameter: response_body set to 'response1.json()' and\n Query Parameter: expected_attribute_value set to 'paused'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-false-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-isActive-false-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/029_11.json b/doc/files/ContextInformation/Subscription/029_11.json index 0fceb80b..2c06f9d4 100644 --- a/doc/files/ContextInformation/Subscription/029_11.json +++ b/doc/files/ContextInformation/Subscription/029_11.json @@ -27,7 +27,7 @@ "teardown": null, "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Subscription with Response Status Code set to 400 and\n Update Subscription with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Subscription with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-expiresAt-update-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{subscription_id}'\n method set to 'PATCH'\n Request Update Subscription and \nHeader['Content-Type'] set to 'application/json' and\nPayload defined in file 'subscriptions/fragments/subscription-expiresAt-update.json'\n}", "http_verb": "PATCH", "endpoint": "subscriptions/{subscription_id}" } diff --git a/doc/files/ContextInformation/Subscription/030_03.json b/doc/files/ContextInformation/Subscription/030_03.json index fe35856a..9c1e3cf5 100644 --- a/doc/files/ContextInformation/Subscription/030_03.json +++ b/doc/files/ContextInformation/Subscription/030_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 Retrieve Subscription with Response Status Code set to 200 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscriptions-030-03-expectation.json' with subscription id '${subscription_id}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Retrieve Subscription with Response Status Code set to 200 and\n Retrieve Subscription with Response Body containing the same content defined in file 'subscriptions/expectations/subscriptions-030-03.json' with subscription id '${subscription_id}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/{id}'\n method set to 'GET'\n Subscription Retrieve with the following data: and\n Query Parameter: id set to '${subscription_id}' 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": "subscriptions/{id}" diff --git a/doc/files/ContextInformation/Subscription/031_01.json b/doc/files/ContextInformation/Subscription/031_01.json index 1e3423cf..322fddda 100644 --- a/doc/files/ContextInformation/Subscription/031_01.json +++ b/doc/files/ContextInformation/Subscription/031_01.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 Subscriptions with Response Status Code set to 200 and\n Query Subscriptions with Response containing:\n * file set to 'subscriptions/expectations/subscriptions-031-01-expectation.json'\n * id set to '${subscription_ids}'\n * response set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Subscriptions with Response Status Code set to 200 and\n Query Subscriptions with Response containing:\n * file set to 'subscriptions/expectations/subscriptions-031-01.json'\n * id set to '${subscription_ids}'\n * response set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/subscriptions/'\n method set to 'GET'\n Query Subscription Request with data: 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": "subscriptions/" diff --git a/doc/files/ContextInformation/Subscription/046_16_01.json b/doc/files/ContextInformation/Subscription/046_16_01.json index 89d9df44..17d46661 100644 --- a/doc/files/ContextInformation/Subscription/046_16_01.json +++ b/doc/files/ContextInformation/Subscription/046_16_01.json @@ -29,7 +29,7 @@ "teardown": null, "template": null, "then": "then {\n the client at '${endpoint}' receives a valid Notification containing:\n Notification received After waiting '5' seconds and\n Notification received Notification data: '${notification}[subscriptionId]' equal to '${subscription_id}' and\n Notification received Notification data: '${notification}[data][0][id]' equal to '${entity_id}' and\n Notification received The dictionary `${notification}' should contain the key 'data' and\n Notification received The variable `${notification}[data]' should not be '${EMPTY}'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'building-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextInformation/Subscription/046_16_02.json b/doc/files/ContextInformation/Subscription/046_16_02.json index 507da9a5..f25cd3cb 100644 --- a/doc/files/ContextInformation/Subscription/046_16_02.json +++ b/doc/files/ContextInformation/Subscription/046_16_02.json @@ -29,7 +29,7 @@ "teardown": null, "template": null, "then": "then {\n the client at '${endpoint}' receives a valid Notification containing:\n Notification received Waiting for no Notification data and\n Query Parameter: timeout set to '5'\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'vehicle-simple-attributes-sample.jsonld'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/entities/'\n method set to 'POST'\n Request Header['Content-Type'] set to 'application/ld+json' and\n payload defined in file: 'vehicle-simple-attributes.jsonld'\n}", "http_verb": "POST", "endpoint": "entities/" } diff --git a/doc/files/ContextSource/Registration/034_04.json b/doc/files/ContextSource/Registration/034_04.json index 20c777a3..f681b77e 100644 --- a/doc/files/ContextSource/Registration/034_04.json +++ b/doc/files/ContextSource/Registration/034_04.json @@ -27,7 +27,7 @@ "teardown": "Delete Initial Context Source Registration", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Context Source Registration From File with Response Status Code set to 400 and\n Update Context Source Registration From File with Response Body containing the type 'https://uri.etsi.org/ngsi-ld/errors/BadRequestData' and\n Update Context Source Registration From File with Response body containing 'title' element\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceRegistrations/{context_source_registration_id}'\n method set to 'PATCH'\n Update Context Source Registration with CSR Id set to '${registration_id}' and subscription update from file 'context-source-registration-invalid-json-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceRegistrations/{context_source_registration_id}'\n method set to 'PATCH'\n Update Context Source Registration with CSR Id set to '${registration_id}' and subscription update from file 'context-source-registration-invalid-json.json'\n}", "http_verb": "PATCH", "endpoint": "csourceRegistrations/{context_source_registration_id}" } diff --git a/doc/files/ContextSource/RegistrationSubscription/039_05.json b/doc/files/ContextSource/RegistrationSubscription/039_05.json index 07f28243..cc6e5e94 100644 --- a/doc/files/ContextSource/RegistrationSubscription/039_05.json +++ b/doc/files/ContextSource/RegistrationSubscription/039_05.json @@ -27,7 +27,7 @@ "teardown": "Delete Initial Context Source Registration Subscriptions", "template": null, "then": "then {\n the SUT sends a valid Response for the operations:\n Update Context Source Registration Subscription From File with Response Status Code set to 400 and\n Update Context Source Registration Subscription From File with Response Body containing the type 'problem_type=${ERROR_TYPE_BAD_REQUEST_DATA}' and Response Body Title is a string and is not ${EMPTY} and Response Body Detail is a string and is not ${EMPTY} and Response Boty Title is not equal to Response Body Detail\n}", - "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n method set to 'PATCH'\n Update Context Source Registration Subscription from file with subscription id set to '${subscription_id}' and subscription update fragment set to 'csourceSubscriptions/fragments/subscription-update-invalid-json-sample.json'\n}", + "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceSubscriptions/{subscription_id}'\n method set to 'PATCH'\n Update Context Source Registration Subscription from file with subscription id set to '${subscription_id}' and subscription update fragment set to 'csourceSubscriptions/fragments/subscription-update-invalid-json.json'\n}", "http_verb": "PATCH", "endpoint": "csourceSubscriptions/{subscription_id}" } diff --git a/doc/files/ContextSource/RegistrationSubscription/041_01.json b/doc/files/ContextSource/RegistrationSubscription/041_01.json index b6d4be4b..b1c79170 100644 --- a/doc/files/ContextSource/RegistrationSubscription/041_01.json +++ b/doc/files/ContextSource/RegistrationSubscription/041_01.json @@ -26,7 +26,7 @@ "setup": "Setup Initial Context Source Registration Subscriptions", "teardown": "Delete Created Context Source Registration Subscriptions", "template": null, - "then": "then {\n the SUT sends a valid Response for the operations:\n Query Context Source Registration Subscriptions with Response Status Code set to 200 and\n Query Context Source Registration Subscriptions with Response containing:\n * file set to 'csourceSubscriptions/expectations/subscriptions-035-01-expectation.json'\n * id set to '${subscription_ids}'\n * response set to '${response.json()}'\n}", + "then": "then {\n the SUT sends a valid Response for the operations:\n Query Context Source Registration Subscriptions with Response Status Code set to 200 and\n Query Context Source Registration Subscriptions with Response containing:\n * file set to 'csourceSubscriptions/expectations/subscriptions-035-01.json'\n * id set to '${subscription_ids}'\n * response set to '${response.json()}'\n}", "when": "when {\n the SUT receives a Request from the client containing:\n URL set to '/ngsi-ld/v1/csourceSubscriptions'\n method set to 'GET'\n Query Context Source Registration Subscriptions 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": "csourceSubscriptions" -- GitLab From b9dbed27637378ab9eb5e999a06ba7386ebd5300 Mon Sep 17 00:00:00 2001 From: ranim-n Date: Mon, 29 Jul 2024 15:44:22 +0200 Subject: [PATCH 3/3] fixed conflicts with develop branch --- .../021_01.robot | 2 +- .../021_02.robot | 2 +- .../021_03.robot | 2 +- .../021_04.robot | 2 +- .../021_05.robot | 2 +- .../021_06.robot | 4 ++-- .../021_07.robot | 6 +++--- .../021_08.robot | 2 +- .../021_09.robot | 4 ++-- .../021_11.robot | 6 +++--- .../021_12.robot | 2 +- .../021_13.robot | 2 +- .../021_14.robot | 2 +- .../020_01.robot | 2 +- .../020_02.robot | 2 +- .../020_03.robot | 2 +- .../020_04.robot | 4 ++-- .../020_05.robot | 4 ++-- .../020_08.robot | 4 ++-- .../020_09.robot | 4 ++-- .../020_10.robot | 2 +- .../020_11.robot | 2 +- .../020_12.robot | 2 +- .../DeleteBatchOfEntities/006_01.robot | 2 +- .../UpdateBatchOfEntities/005_05.robot | 2 +- .../UpsertBatchOfEntities/004_03.robot | 4 ++-- .../UpsertBatchOfEntities/004_08.robot | 4 ++-- .../UpdateEntityAttributes/011_06.robot | 4 ++-- .../MQTT/058_01.robot | 2 +- .../MQTT/058_02.robot | 2 +- .../MQTT/058_03.robot | 2 +- .../MQTT/058_04.robot | 2 +- ...icle-temporal-representation-020-03.jsonld | 21 ------------------- 33 files changed, 45 insertions(+), 66 deletions(-) delete mode 100644 data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld 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 c142caa9..d3f13ea1 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot @@ -12,7 +12,7 @@ Test Template Query the temporal evolution of entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 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 143635f2..513a15bb 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 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 5e5d87ad..a26fe48e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 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 1ee1a77b..e247d8f6 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 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 28db30da..e5eb3898 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 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 463c7e48..440f6080 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 @@ -47,7 +47,7 @@ Setup Initial Temporal Entities ... ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 b360a032..2a8e13ed 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 @@ -43,12 +43,12 @@ ${expectation_file}= vehicles-temporal-representation-021-07.json *** Keywords *** Setup Initial Temporal Entities ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} - ${create_response1}= Create Temporal Representation Of Entity + ${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 ${vehicule_id_prefix} + ${second_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} ${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 e8b28480..98f866c8 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 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 a162733f..c7e50bb7 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot @@ -12,7 +12,7 @@ Test Template Query the temporal evolution of entities matching the given *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 @@ -52,7 +52,7 @@ Query the temporal evolution of entities matching the given NGSI-LD geo-query Setup Initial Temporal Entities ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} - ${create_response1}= Create Temporal Representation Of Entity + ${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} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot index c3c1cb84..e4a855b0 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot @@ -12,7 +12,7 @@ Test Template Query the temporal evolution of entities with a limit to the *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 @@ -42,7 +42,7 @@ Query the temporal evolution of entities with a limit to the number of entities Setup Initial Temporal Entities ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicle_id_prefix} - ${create_response1}= Create Temporal Representation Of Entity + ${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} @@ -54,7 +54,7 @@ Setup Initial Temporal Entities 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 ${vehicle_id_prefix} - ${create_response3}= Create Temporal Representation Of Entity + ${create_response3}= Create Temporal Representation Of Entity ... ${second_vehicle_payload_file} ... ${third_temporal_entity_representation_id} Check Response Status Code 201 ${create_response3.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot index 69503712..34a21d36 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld 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 89f3fa6a..cb984e80 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot @@ -12,7 +12,7 @@ Test Template Query the temporal evolution of entities using the entityOpe *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 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 fe7e520d..3587218e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_14.robot @@ -12,7 +12,7 @@ Test Template Query the temporal evolution of entities *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${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 diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot index bd0a9593..5df3b954 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicule_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${vehicle_expectation_file}= vehicle-temporal-representation-020-01.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot index 24548275..5dcdd861 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${vehicle_expectation_file}= vehicle-temporal-representation-020-02.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot index bd666384..495b3ae4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot @@ -12,7 +12,7 @@ Test Template Retrieve the temporal evolution of certain attributes of an *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${vehicle_expectation_file}= vehicle-temporal-representation-020-03.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot index c0333dd3..07928f99 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot @@ -12,8 +12,8 @@ Test Template Retrieve the temporal evolution of an entity matching the gi *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** TIMEREL TIMEAT ENDTIMEAT VEHICLE_EXPECTATION_FILE diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot index d7d3a7c0..db970a97 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot @@ -12,8 +12,8 @@ Test Template Retrieve the temporal evolution of the last N instances of e *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-multiple-instances-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-multiple-instances.jsonld *** Test Cases *** LASTN VEHICLE_EXPECTATION_FILE diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot index 91d20cac..2e2d8167 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot @@ -11,8 +11,8 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot index e78207a4..90911bba 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_09.robot @@ -12,8 +12,8 @@ Test Template Retrieve the temporal evolution of an entity with an invalid *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${vehicle_payload_file}= 2020-08-vehicle-temporal-representation-sample.jsonld +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld *** Test Cases *** TIMEREL TIMEAT ENDTIMEAT diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot index b70232cb..08859d96 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot @@ -11,7 +11,7 @@ Suite Teardown Delete Initial Temporal Entity *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld ${vehicle_expectation_file}= vehicle-temporal-representation-020-10.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot index 23e151a5..e0a304e4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_11.robot @@ -12,7 +12,7 @@ Test Template Retrieve the temporal evolution of an entity with the aggreg *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${vehicle_payload_file}= 2020-08-vehicle-temporal-representation.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot index f064d8af..a01ba13b 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_12.robot @@ -12,7 +12,7 @@ Test Template Retrieve Temporal Entity *** Variables *** -${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: +${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${vehicle_payload_file}= vehicle-language-property-temporal-representation.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot index 88b25929..c469c99f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot @@ -34,7 +34,7 @@ Setup Initial Entities ${create_response1}= Create Entity building-simple-attributes.jsonld ${first_entity_id} Check Response Status Code 201 ${create_response1.status_code} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${create_response2}= Create Entity building-simple-attributes-sample.jsonld ${second_entity_id} + ${create_response2}= Create Entity building-simple-attributes.jsonld ${second_entity_id} Check Response Status Code 201 ${create_response2.status_code} @{entities_ids_to_be_deleted}= Create List ${first_entity_id} ${second_entity_id} Set Test Variable ${entities_ids_to_be_deleted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_05.robot index bab8ffbd..f8cbb197 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_05.robot @@ -13,7 +13,7 @@ Test Template Batch Update Entity Scenarios *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: -${entity_payload_filename}= building-minimal-sample.jsonld +${entity_payload_filename}= building-minimal.jsonld *** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot index 7cd2590f..014cf660 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -49,11 +49,11 @@ Batch Upsert Existing Entities Scenarios Setup Initial Entities ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${create_response1}= Create Entity building-minimal.jsonld ${first_existing_entity_id} + ${create_response1}= Create Entity building-minimal.jsonld ${first_existing_entity_id} Check Response Status Code 201 ${create_response1.status_code} Set Test Variable ${first_existing_entity_id} ${second_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - ${create_response2}= Create Entity building-minimal-sample.jsonld ${second_existing_entity_id} + ${create_response2}= Create Entity building-minimal.jsonld ${second_existing_entity_id} Check Response Status Code 201 ${create_response2.status_code} Set Test Variable ${second_existing_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_08.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_08.robot index 655f495a..6e30947d 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_08.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_08.robot @@ -42,8 +42,8 @@ Batch Upsert Existing Entities Scenarios Setup Initial Entities ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-minimal-sample.jsonld ${first_existing_entity_id} - Create Entity building-minimal-sample.jsonld ${second_existing_entity_id} + Create Entity building-minimal.jsonld ${first_existing_entity_id} + Create Entity building-minimal.jsonld ${second_existing_entity_id} Set Test Variable ${first_existing_entity_id} Set Test Variable ${second_existing_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_06.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_06.robot index 6a1b5a26..817c4574 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_06.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_06.robot @@ -13,7 +13,7 @@ Test Template Append Types to an Entity *** Variables *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${entity_filename}= building-minimal-sample.json +${entity_filename}= building-minimal.json *** Test Cases *** FRAGMENT_FILENAME EXPECTATION_FILENAME @@ -22,7 +22,7 @@ ${entity_filename}= building-minimal-sample.json 011_06_02 AppendTwoTypes types-vehicle-car-fragment.json building-minimal-with-three-types.json 011_06_03 AppendExistingType - type-building-fragment.json building-minimal-compacted-expectation.json + type-building-fragment.json building-minimal-compacted.json 011_06_04 AppendOneTypeAndOneExisting type-vehicle-building-fragment.json building-minimal-with-two-types.json diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_01.robot index 8367ae8f..2336b561 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_01.robot @@ -16,7 +16,7 @@ Test Template Receive MQTT Notification ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-default.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${topic} ngsild-test-suite/topic diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_02.robot index 5db442ac..8bc65094 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_02.robot @@ -17,7 +17,7 @@ Test Template Receive MQTT Notification ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-default.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${topic} ngsild-test-suite/topic ${endpoint} mqtt://${mqtt_broker_host}/${topic} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_03.robot index ee91ce8b..794cd76a 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_03.robot @@ -17,7 +17,7 @@ Test Template Receive Mqtt Notification ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-default.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${topic} ngsild-test-suite/topic ${endpoint} mqtt://${mqtt_broker_host}/${topic} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_04.robot index 297f693e..3077e3c9 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/SubscriptionNotificationBehaviour/MQTT/058_04.robot @@ -17,7 +17,7 @@ Test Template Receive Mqtt Notification ${subscription_id_prefix} urn:ngsi-ld:Subscription: ${subscription_payload_file_path} subscriptions/subscription-building-entities-default.jsonld ${building_id_prefix} urn:ngsi-ld:Building: -${entity_building_filepath} building-simple-attributes-sample.jsonld +${entity_building_filepath} building-simple-attributes.jsonld ${fragment_filename} airQualityLevel-fragment.jsonld ${topic} ngsild-test-suite/topic ${endpoint} mqtt://${mqtt_broker_host}/${topic} diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld deleted file mode 100644 index 0c4045ef..00000000 --- a/data/temporalEntities/expectations/vehicle-temporal-representation-020-03.jsonld +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id":"urn:ngsi-ld:Vehicle:randomUUID", - "type":"Vehicle", - "fuelLevel":[ - { - "type":"Property", - "value":67, - "observedAt":"2020-08-01T12:03:00Z" - }, - { - "type":"Property", - "value":53, - "observedAt":"2020-08-01T13:05:00Z" - }, - { - "type":"Property", - "value":40, - "observedAt":"2020-08-01T14:07:00Z" - } - ] -} \ No newline at end of file -- GitLab