diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot index 381f3b604a3b87ba0fe4eb42c9e3e61fb07b602d..24656459860a9b53972353511dcdb66be7014419 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation.jsonld +${expectation_filename}= building-simple-attributes-expectation.jsonld *** Test Cases *** 018_01_01_Get an entity by id diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot index 4fe17c792bcbc9b8240f0dca23bcbd6d6a52f5c5..0c6c80fd8f123d1f8587af1ee8cd02a2da18c4e9 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-query-attributes.jsonld +${expectation_filename}= building-simple-attributes-query-expectation.jsonld ${attribute_airqualitylevel}= https://ngsi-ld-test-suite/context#airQualityLevel ${attribute_subcategory}= https://ngsi-ld-test-suite/context#subCategory diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot index 8ccd23fabfab5d35311209d21754632c116fcf16..d3f20c1571268ab48068aa25b7b23f9e31aedc6f 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_01_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-location-attribute-sample-expectation-query-geoproperty.jsonld +${expectation_filename}= building-geoproperty-query-expectation.jsonld ${geometry_property}= location *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_04.robot index 366e21260cbc1cebdebdc40d28a25d6ff839e352..d8e6cbdd2638d986221a6a0e1a5661d2757e58e3 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_04.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-simplified.jsonld +${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld ${options_parameter}= keyValues *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_05.robot index d7e60109fca6d4d5c58cc1f238e6ced913d5f871..27f28091565520d122dc2246b5a3c0f7a2e73afe 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/018_05.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-simplified.jsonld +${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld ${options_parameter}= keyValues ${accept_header}= application/geo+json diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_01.robot index d3f045146a3e3546fdd810f7421adfcb5f6c0c0c..920357a9442096c9cc3da34a7e7e69c1a5e30303 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_02.robot index 956bbd045b37f89e2e3a7dfdd951ac1afc94942d..8d734a8eebe489402269c6199b27b1662506d29a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_02.robot @@ -11,7 +11,7 @@ ${parking_id_prefix}= urn:ngsi-ld:OffStreetParking: ${building_filename}= building-minimal-sample.jsonld ${vehicle_filename}= vehicle-simple-attributes-sample.jsonld ${parking_filename}= parking-simple-attributes-sample.jsonld -${expectation_filename}= vehicle-parking-sample-expectation.jsonld +${expectation_filename}= two-types-vehicle-offstreetparking-expectation.jsonld ${building_entity_type}= https://ngsi-ld-test-suite/context#Building ${vehicle_entity_type}= https://ngsi-ld-test-suite/context#Vehicle ${parking_entity_type}= https://ngsi-ld-test-suite/context#OffStreetParking diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_03.robot index ac17db40c9070ebd35ffd7336a760da2255d943f..42ab2226568e8ff253ee15292b70a0eeb4ca3c96 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${entity_id_pattern}= urn:ngsi-ld:Building:.* diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot index 1fc43211deef7ed9ff4ccffe685fdcebc411c476..6c03ee7e034df3c3afc1dbfc5292b986fd4a4f33 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_04.robot @@ -8,7 +8,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld ${filename2}= building-minimal-sample.jsonld -${expectation_filename}= building-attributes-query-sample-expectation.jsonld +${expectation_filename}= building-attributes-query-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${attribute_airqualitylevel}= https://ngsi-ld-test-suite/context#airQualityLevel ${attribute_subcategory}= https://ngsi-ld-test-suite/context#subCategory diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_05.robot index c196f7dfbaf957db20e4ea44c3028dd323d38cb3..9b6bfb839e1b96d9af0e9642fa6fc68033b1ae3a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_01_05.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-location-attribute-sample-expectation-query-geoproperty.jsonld +${expectation_filename}= building-geoproperty-query-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${geometry_property}= location diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_01.robot index 597ccab9e94638e42e8024ec702727ab03613308..eb6b125858963e1463ef8eccba053601936961ee 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot index a6d724e90c93681cca5daef37f30ff16f366857f..69e3adab44278b587ad953359a69bc2a61a69776 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_02.robot @@ -11,7 +11,7 @@ ${parking_id_prefix}= urn:ngsi-ld:OffStreetParking: ${building_filename}= building-minimal-sample.jsonld ${vehicle_filename}= vehicle-simple-attributes-sample.jsonld ${parking_filename}= parking-simple-attributes-sample.jsonld -${expectation_filename}= vehicle-parking-sample-expectation.jsonld +${expectation_filename}= two-types-vehicle-offstreetparking-expectation.jsonld ${building_entity_type}= https://ngsi-ld-test-suite/context#Building ${vehicle_entity_type}= https://ngsi-ld-test-suite/context#Vehicle ${parking_entity_type}= https://ngsi-ld-test-suite/context#OffStreetParking diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot index 3b0aeed32b5a3a8fb54ecffbb2fdc98c519005fb..5f8b2de295f4d28563f21a322bcce08cc150e86d 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${entity_id_pattern}= urn:ngsi-ld:Building:.* diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_04.robot index aa46bdacfb4cb58bc5e11ed8dba270921eea8e5e..024e289be6bfc664cfb4ce3401fb4a6cdbc84fa4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_04.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${attribute_airqualitylevel}= https://ngsi-ld-test-suite/context#airQualityLevel ${attribute_subcategory}= https://ngsi-ld-test-suite/context#subCategory diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_05.robot index da47aa14891133ee40401937e37fed2d979b283f..9abc975d5978a38175c8cc15ead2f8bb463e2cca 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_02_05.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${geometry_property}= location diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot index 5622a0728cbb53072f6151c7da1c71c7e5e225fa..1b4d8caf0cf9ba9490b8205bd4020cb892ced0ca 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_04.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-simple-attributes-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-simplified.jsonld +${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld ${options_parameter}= keyValues ${entity_type}= https://ngsi-ld-test-suite/context#Building diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot index 08bef2dc169d5a095ec133797e3c40ffb560071c..be2e37ade03b8e2a1068dbb77a45a601a6bada3c 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_05.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-location-attribute-sample.jsonld -${expectation_filename}= building-simple-attributes-sample-expectation-simplified.jsonld +${expectation_filename}= building-simple-attributes-simplified-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${accept_header}= application/geo+json diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_06.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_06.robot index fa326ffd7482f1a120b434c3c2e8970fa0208ce4..9f6639ef4cb30896004969b4921ac528752aad28 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/019_06.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: ${filename}= building-minimal-sample.jsonld -${expectation_filename}= building-minimal-sample-expectation.jsonld +${expectation_filename}= building-minimal-expectation.jsonld ${entity_type}= https://ngsi-ld-test-suite/context#Building ${limit}= 2 diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_01.robot index 721dc0af8b5702b7e1fad02130c6c6e6ede79831..e0f9e842c76163b2798f541b360f6508ccaa2bd0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_01.robot @@ -8,13 +8,13 @@ Test Template Append Attributes *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-datasetid-attributes-sample.jsonld +${filename}= vehicle-speed-two-datasetid-sample.jsonld *** Test Cases *** STATUS_CODE OVERWRITE FRAGMENT_FILENAME EXPECTATION_FILENAME -010_01_01_Append entity attributes 204 ${EMPTY} vehicle-fragment-same-datasetid-sample.jsonld ${EMPTY} -010_01_02_Append entity attributes 207 noOverwrite vehicle-fragment-same-datasetid-sample.jsonld vehicle-attributes-sample-append-expectation-02.jsonld -010_01_03_Append entity attributes 204 ${EMPTY} vehicle-fragment-different-datasetid-sample.jsonld ${EMPTY} -010_01_04_Append entity attributes 204 noOverwrite vehicle-fragment-different-datasetid-sample.jsonld ${EMPTY} +010_01_01_Append entity attributes 204 ${EMPTY} vehicle-attribute-to-add-fragment.jsonld ${EMPTY} +010_01_02_Append entity attributes 207 noOverwrite vehicle-attribute-to-add-fragment.jsonld add-attribute-expectation.jsonld +010_01_03_Append entity attributes 204 ${EMPTY} vehicle-speed-different-datasetid-fragment.jsonld ${EMPTY} +010_01_04_Append entity attributes 204 noOverwrite vehicle-speed-different-datasetid-fragment.jsonld ${EMPTY} *** Keywords *** Append Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_02.robot index db4e7325fee89423c4192ee36e18487609cf906a..acd9ea6e334b6356342609269d6e745f66ef0145 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_02.robot @@ -6,10 +6,10 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-datasetid-attributes-sample.jsonld -${fragment_filename}= vehicle-fragment-same-datasetid-sample.jsonld +${filename}= vehicle-speed-two-datasetid-sample.jsonld +${fragment_filename}= vehicle-attribute-to-add-fragment.jsonld ${status_code}= 400 -${invalid_fragment_filename}= invalid-vehicle-fragment-datasetid-sample.jsonld +${invalid_fragment_filename}= invalid-fragment.jsonld *** Test Cases *** #010_02_01_Append entity attributes if the entity Id is not present diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_03.robot index e84799b5292bdce9bcacd9d2efcf52c922b05d86..3459d6d09b9d23c097945e63b3f4bd3389add3f1 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/010_03.robot @@ -6,7 +6,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${fragment_filename}= vehicle-fragment-same-datasetid-sample.jsonld +${fragment_filename}= vehicle-attribute-to-add-fragment.jsonld *** Test Cases *** Append entity attributes when the entity id is not known to the system diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_01.robot index e2bad05cc3ec2b625fce5181631ffa77dc4be74d..cc7f73d43251761f83dbc1d5cc5dd4b1d7096086 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_01.robot @@ -11,10 +11,10 @@ ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-two-datasetid-attributes-sample.jsonld *** Test Cases *** STATUS_CODE FRAGMENT_FILENAME EXPECTATION_FILENAME -011_01_01_Check that you can update existing attributes with no datasetId 204 vehicle-two-datasetid-attributes-sample-01.jsonld ${EMPTY} -011_01_02_Check that you can update existing attributes with the datasetId 204 vehicle-two-datasetid-attributes-sample-02.jsonld ${EMPTY} -011_01_03_Check that you can update only some attributes while others failed 207 vehicle-two-datasetid-attributes-sample-03.jsonld vehicle-two-datasetid-attributes-sample-expectation-03.jsonld -011_01_04_Check that you cannot change the type of the attribute 204 vehicle-two-datasetid-attributes-sample-04.jsonld ${EMPTY} +011_01_01_Check that you can update existing attributes with no datasetId 204 vehicle-speed-two-datasetid-01-fragment.jsonld ${EMPTY} +011_01_02_Check that you can update existing attributes with the datasetId 204 vehicle-speed-two-datasetid-02-fragment.jsonld ${EMPTY} +011_01_03_Check that you can update only some attributes while others failed 207 vehicle-speed-two-datasetid-03-fragment.jsonld vehicle-speed-datasetid-expectation.jsonld +011_01_04_Check that you cannot change the type of the attribute 204 vehicle-speed-two-datasetid-04-fragment.jsonld ${EMPTY} *** Keywords *** Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_02.robot index 2bcc4482711509e886b4dbc0867d18f137efe900..bbe3cec011fdcdca39f47f5a94dcec967c8231dd 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_02.robot @@ -9,11 +9,11 @@ ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: *** Test Cases *** 011_02_01_Update an attribute if the Entity Id is not present - Update Attributes ${EMPTY} vehicle-two-datasetid-attributes-sample.jsonld vehicle-two-datasetid-attributes-sample-01.jsonld + Update Attributes ${EMPTY} vehicle-two-datasetid-attributes-sample.jsonld vehicle-speed-two-datasetid-01-fragment.jsonld 011_02_02_Update an attribute if the Entity Id is not a valid URI - Update Attributes thisisaninvaliduri vehicle-two-datasetid-attributes-sample.jsonld vehicle-two-datasetid-attributes-sample-01.jsonld + Update Attributes thisisaninvaliduri vehicle-two-datasetid-attributes-sample.jsonld vehicle-speed-two-datasetid-01-fragment.jsonld 011_02_03_Update entity attributes with invalid entity fragments - Update entity attributes with invalid entity fragments vehicle-datasetid-attributes-sample.jsonld invalid-vehicle-fragment-datasetid-sample.jsonld + Update entity attributes with invalid entity fragments vehicle-speed-two-datasetid-sample.jsonld invalid-fragment.jsonld *** Keywords *** Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_03.robot index e8816488ab661c44026c36ccd3d2037ef1c0e21d..f309554e9b209591e8244dfbcff9e2496d00679b 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/011_03.robot @@ -6,7 +6,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${fragment_filename}= vehicle-two-datasetid-attributes-sample-01.jsonld +${fragment_filename}= vehicle-speed-two-datasetid-01-fragment.jsonld *** Test Cases *** Update entity attributes when the entity id is not known to the system diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_01.robot index 3ca9950148cbb402f6f73d377eb951009d5224c9..76718a5b3ab2ab29416c07844e9b7c01c4145df4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_01.robot @@ -8,12 +8,12 @@ Test Template Update Attributes *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-datasetid-attributes-sample.jsonld +${filename}= vehicle-speed-two-datasetid-sample.jsonld ${status_code}= 204 *** Test Cases *** FRAGMENT_FILENAME ATTRIBUTE_ID -012_01_01_Check that you can partially update an attribute vehicle-fragment-empty-datasetid-sample.jsonld isParked -012_01_02_Check that you can partially update an attribute by specifying the datasetId vehicle-fragment-equal-datasetid-sample.jsonld speed +012_01_01_Check that you can partially update an attribute vehicle-isparked-fragment.jsonld isParked +012_01_02_Check that you can partially update an attribute by specifying the datasetId vehicle-speed-equal-datasetid-fragment.jsonld speed *** Keywords *** Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_02.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_02.robot index 9204ca029999429ee30cddc25954192dc106dac3..8444f5f2b22bad42dbd0664fde4fca027219a5fc 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_02.robot @@ -13,12 +13,12 @@ ${filename}= vehicle-two-datasetid-attributes-sample.jsonld ${status_code}= 400 *** Test Cases *** ENTITY_ID ATTRIBUTE_ID FRAGMENT_FILENAME -012_02_01_Make a partial attribute update if the Entity Id is not present ${EMPTY} speed vehicle-fragment-equal-datasetid-sample.jsonld -012_02_02_Make a partial attribute update if the Entity Id is not a valid URI thisisaninvaliduri speed vehicle-fragment-equal-datasetid-sample.jsonld -012_02_03_Make a partial attribute update if the Attribute Name is not present ${valid_entity_id} speed vehicle-fragment-attribute-name-missing-sample.jsonld -012_02_04_Make a partial attribute update if the Attribute Id is invalid ${valid_entity_id} invalid vehicle-fragment-equal-datasetid-sample.jsonld -012_02_05_Make a partial attribute update if the Attribute type does not match ${valid_entity_id} speed vehicle-fragment-equal-datasetid-different-type-sample.jsonld -012_02_06_Make a partial attribute update if the entity fragment is empty ${valid_entity_id} speed vehicle-fragment-all-empty-sample.jsonld +012_02_01_Make a partial attribute update if the Entity Id is not present ${EMPTY} speed vehicle-speed-equal-datasetid-fragment.jsonld +012_02_02_Make a partial attribute update if the Entity Id is not a valid URI thisisaninvaliduri speed vehicle-speed-equal-datasetid-fragment.jsonld +012_02_03_Make a partial attribute update if the Attribute Name is not present ${valid_entity_id} speed vehicle-speed-wrong-name-fragment.jsonld +012_02_04_Make a partial attribute update if the Attribute Id is invalid ${valid_entity_id} invalid vehicle-speed-equal-datasetid-fragment.jsonld +012_02_05_Make a partial attribute update if the Attribute type does not match ${valid_entity_id} speed vehicle-speed-equal-datasetid-different-type-fragment.jsonld +012_02_06_Make a partial attribute update if the entity fragment is empty ${valid_entity_id} speed empty-fragment.jsonld *** Keywords *** Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_03.robot index f3b4ab17b07558974eac3e682d60d1a485a3659d..b7ec1196f0938cecef0a28018d7bae0a5008dfa8 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/012_03.robot @@ -9,15 +9,15 @@ Test Template Partial Update Attributes *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: -${filename}= vehicle-datasetid-attributes-sample.jsonld +${filename}= vehicle-speed-two-datasetid-sample.jsonld ${status_code}= 404 ${attribute_id}= speed *** Test Cases *** ENTITY_ID FRAGMENT_FILENAME -012_03_01_Partial update when the Entity Id is not known to the system ${not_found_entity_id} vehicle-fragment-same-datasetid-sample.jsonld -012_03_02_Partial update when no default instance and no datasetId specified ${valid_entity_id} vehicle-fragment-invalid-datasetid-sample.jsonld -012_03_03_Partial update when no instance with the datasetId specified ${valid_entity_id} vehicle-fragment-empty-datasetid-sample.jsonld -012_03_04_Partial update when no instance with the attrId specified ${valid_entity_id} vehicle-fragment-attribute-name-missing-sample.jsonld +012_03_01_Partial update when the Entity Id is not known to the system ${not_found_entity_id} vehicle-attribute-to-add-fragment.jsonld +012_03_02_Partial update when no default instance and no datasetId specified ${valid_entity_id} vehicle-speed-invalid-datasetid-fragment.jsonld.jsonld +012_03_03_Partial update when no instance with the datasetId specified ${valid_entity_id} vehicle-isparked-fragment.jsonld +012_03_04_Partial update when no instance with the attrId specified ${valid_entity_id} vehicle-speed-wrong-name-fragment.jsonld *** Keywords *** Partial Update Attributes diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_01.robot index e30995ff62062dd27220c176da2bcd2efc715def..254950a77ad62420649384104cc95cb94536431f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-representation-fragment-sample.jsonld +${fragment_filename}= vehicle-temporal-representation-fragment.jsonld *** Test Cases *** 014_01_02_Add an attribute to a temporal entity with simple temporal properties diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_02.robot index 7eb7acc9038c0d338389ad20e189bab08be7585a..333276586faae5bc906772b3b4807981134a3877 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-representation-fragment-sample.jsonld +${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 400 *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_03.robot index 1ca7648a5502870256a611af8ac1cd65e7dc963a..1b99ecae91b778754ae16af4c8679c17b57e6be0 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/014_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-representation-fragment-sample.jsonld +${fragment_filename}= vehicle-temporal-representation-fragment.jsonld ${status_code}= 404 *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_01.robot index a27641f8f3f1716b7873d8b870ac2e4133275a80..53df2e11c35da76be49fe7b91068bdc029d15bd4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-intanceid-update-sample.jsonld +${fragment_filename}= vehicle-temporal-intanceid-update-fragment.jsonld ${attributeId}= speed *** Test Cases *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_02.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_02.robot index 99d5d0f78dc45353ea0715e69205190b284828b6..d53614c836f964dbfb1a4f5ab82d87f081008f6b 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_02.robot @@ -10,7 +10,7 @@ Test Template Partially Update Temporal Entity *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-intanceid-update-sample.jsonld +${fragment_filename}= vehicle-temporal-intanceid-update-fragment.jsonld ${status_code}= 400 *** Test Cases *** TEMPORAL_ENTITY_ID ATTRIBUTE_ID INSTANCE_ID diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_03.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_03.robot index 60debbb9a711de48cf4c993544d8e9bb960b1b21..8037375f623b4734ba3477f0abd82ad675087384 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/016_03.robot @@ -10,7 +10,7 @@ Test Template Partially Update Temporal Entity *** Variable *** ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-temporal-representation-sample.jsonld -${fragment_filename}= vehicle-temporal-intanceid-update-sample.jsonld +${fragment_filename}= vehicle-temporal-intanceid-update-fragment.jsonld ${status_code}= 404 *** Test Cases *** TEMPORAL_ENTITY_ID ATTRIBUTE_ID INSTANCE_ID diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot index 48beab75521156beeeeb5f34152a60a92daeb481..43ef87edc05eb3b493d4c1ee4e23603f19e67f01 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/registration-with-expiration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-with-expiration-sample.jsonld *** Test Case *** Create Context Source Registration With Specific Date Expiration Date diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot index a45c6ec9cda046ecb7674ffb8981838fe5514973..55dabb2e0bb3975d0a577b42cb2905a66d117eae 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-simple-sample.jsonld *** Test Case *** Create Context Source Registration That Never Expires diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot index 32d8e4f08b5f8de990dc3f06714e7ee14d41f43b..aa59c63b208ca338e2a8b5f5400e8f5a2d479a5e 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/registration-no-id-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-registration-no-id-sample.jsonld *** Test Case *** Create Context Source Registration Without A Sprecified ID diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot index 29742ccaf6bc237b98ada90a38573bc4f6a6b0d0..b906d86b4689fffd8b1cb566449d4c885f0d98f3 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_02.robot @@ -6,15 +6,15 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= registration-invalid-sample.jsonld +${registration_payload_file_path}= context-source-registration-invalid-sample.jsonld *** Test Cases *** 033_02_01_Create a context source registration with invalid JSON file Create a context source registration with invalid JSON file 033_02_02_Create a context source registration with a different data structure than CsourRegistration data type - Create Context Source With Invalid Content csourceRegistrations/registration-invalid-structure-sample.jsonld + Create Context Source With Invalid Content csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld 033_02_03_Create a context source registration with a date in the past - Create Context Source With Invalid Content csourceRegistrations/registration-past-expiration-sample.jsonld + Create Context Source With Invalid Content csourceRegistrations/context-source-registration-past-expiration-sample.jsonld *** Keywords *** Create Context Source With Invalid Content diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_03.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_03.robot index 4274214ee68a035a6688bbb4f3983966b0711cf4..69783222eb6567436b03d182a505e24f5c612ba7 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= csourceRegistrations/registration-sample.jsonld +${filename}= csourceRegistrations/context-source-registration-simple-sample.jsonld *** Test Cases *** Create a context source registration that already exists diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_06.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_06.robot index c79245ee6b3834d20b5c7bd2093e5c8b764f33b2..fcdaa412b830697bda23587ad741d1a1b44485d6 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_06.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_06.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-context-source-registration-simple-sample.jsonld *** Test Case *** Create one context source registration containing a JSON-LD @context with a JSON content type diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot index 17057c049fefec9be310d9b6cb152d21a87fd365..e47a44009c6b1143def4f8a4645e36967b1e5958 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-context-source-registration-simple-sample.jsonld *** Test Case *** Create one context source registration using a JSON-LD @context obtained from the request payload diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_09.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_09.robot index 1c6c00582f7e06c93b018f699098db716ded99b7..a7e8f6b3825c06b7a4874368bae62969e2f4e763 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_09.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_09.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= csourceRegistrations/context-source-registration-sample.jsonld +${registration_payload_file_path}= csourceRegistrations/context-source-context-source-registration-simple-sample.jsonld *** Test Case *** Create one context source registration with a Link header and a JSON-LD content type diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot index 594856379aff637accbbc4882e59a40fb4b1c455..aa79d926fe7c69adc2cfece683fa2da8704883d0 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= registration-sample.jsonld +${registration_payload_file_path}= context-source-registration-simple-sample.jsonld *** Test Case *** Delete a context source registration by id diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot index 479a314a2391677d130b2eafd4390f03fae5333a..f70d18b19d8dba976768efc7ec5f2c46f9a0dcb4 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_02.robot @@ -8,7 +8,7 @@ Test Template Delete Context Source *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= registration-sample.jsonld +${filename}= context-source-registration-simple-sample.jsonld *** Test Case *** INVALID_REGISTRATION_ID 035_02_01_Delete a Context Source Registration if the Id is not present ${EMPTY} diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot index b9406805daf93b70a7e34a0b4469ca4373a96cd3..b40e6f947e0dc907a04bdeb633b93bbdfb63a811 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_03.robot @@ -7,7 +7,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${registration_payload_file_path}= registration-sample.jsonld +${registration_payload_file_path}= context-source-registration-simple-sample.jsonld *** Test Case *** Delete a context source registration by id diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot index 26c54f638c499d6441af5030a2a95f5f5e9fc879..3488c445e1ae394650dc2335e6a661d711622628 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot @@ -10,8 +10,8 @@ Test Template Update Context Source ${registration_id_prefix}= urn:ngsi-ld:Registration: *** Test Case *** FILENAME UPDATE_FILENAME -034_01_01_Update a context source registration by id registration-sample.jsonld registration-with-expiration-sample.jsonld -034_01_02_Update a context source registration to never expire registration-with-expiration-sample.jsonld registration-sample.jsonld +034_01_01_Update a context source registration by id context-source-registration-simple-sample.jsonld context-source-registration-with-expiration-sample.jsonld +034_01_02_Update a context source registration to never expire context-source-registration-with-expiration-sample.jsonld context-source-registration-simple-sample.jsonld *** Keywords *** Update Context Source diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot index 08e3a176ce4dbfd36cb2999fed51d28c4e65eb09..5157844f43bfa4e27b484a00a0582be3783d4ada 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_02.robot @@ -8,18 +8,18 @@ Suite Setup Setup Initial Entities *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= registration-sample.jsonld -${registration_payload_file_path}= registration-invalid-sample.jsonld +${filename}= context-source-registration-simple-sample.jsonld +${registration_payload_file_path}= context-source-registration-invalid-sample.jsonld *** Test Case *** 034_02_01_Update a context source registration by id if the Id is not present - Update Context Source ${EMPTY} registration-with-expiration-sample.jsonld + Update Context Source ${EMPTY} fragments/context-source-registration-different-type-sample.jsonld 034_02_02_Update a context source registration by id if the Id is not a valid URI - Update Context Source invalidURI registration-with-expiration-sample.jsonld + Update Context Source invalidURI fragments/context-source-registration-different-type-sample.jsonld 034_02_03_Update a context source registration if the request body is not of the same data type - Update Context Source ${valid_registration_id} registration-different-type-sample.jsonld + Update Context Source ${valid_registration_id} fragments/context-source-registration-different-type-sample.jsonld 034_02_04_Update a context source registration if you attempt to remove a mandatory property - Update Context Source ${valid_registration_id} registration-invalid-structure-sample.jsonld + Update Context Source ${valid_registration_id} context-source-registration-invalid-structure-sample.jsonld 034_02_05_Update a context source registration if the request body is invalid Update a context source registration if the request body is invalid diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot index 9bdb1b5c331e7e135819d8d651521118568349aa..fffb4366ac094fdf31e0b1193ebfc6e4ecba6371 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_03.robot @@ -6,7 +6,7 @@ Resource ${EXECDIR}/resources/JsonUtils.resource *** Variable *** ${registration_id_prefix}= urn:ngsi-ld:Registration: -${filename}= registration-sample.jsonld +${filename}= context-source-registration-simple-sample.jsonld *** Test Case *** Update a context source registration by id if the id is not known to the system diff --git a/data/csourceRegistrations/registration-invalid-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld similarity index 85% rename from data/csourceRegistrations/registration-invalid-sample.jsonld rename to data/csourceRegistrations/context-source-registration-invalid-sample.jsonld index b0ffbb3e4fc11b8f1961f777e45a413555b89407..1c01a4b4aebe8b035961e90cc5ef56e63df3a98a 100644 --- a/data/csourceRegistrations/registration-invalid-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld new file mode 100644 index 0000000000000000000000000000000000000000..28176c464f3ec3659705b027f9f3351f20bbe023 --- /dev/null +++ b/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld @@ -0,0 +1,7 @@ +{ + "id": "urn:ngsi-ld:ContextSourceRegistration:randomUUID", + "type": "ContextSourceRegistration", + "@context": [ + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" + ] +} \ No newline at end of file diff --git a/data/csourceRegistrations/registration-no-id-sample.jsonld b/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld similarity index 84% rename from data/csourceRegistrations/registration-no-id-sample.jsonld rename to data/csourceRegistrations/context-source-registration-no-id-sample.jsonld index f2abff253935a94c8d68942460c1a7b20570d331..04ed167a308a05a591383067a1fcaebf52ea3b76 100644 --- a/data/csourceRegistrations/registration-no-id-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld @@ -37,6 +37,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-past-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld similarity index 85% rename from data/csourceRegistrations/registration-past-expiration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld index f9f762640537e2e05a7c36b74ea6cba27813693d..4f449784ebe6203de1b78c6e062f35b2843a6e94 100644 --- a/data/csourceRegistrations/registration-past-expiration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld @@ -39,6 +39,6 @@ }, "expiresAt": " 2018-11-29T14:53:15Z", "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-sample.jsonld b/data/csourceRegistrations/context-source-registration-simple-sample.jsonld similarity index 85% rename from data/csourceRegistrations/registration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-simple-sample.jsonld index 956aeda47b248be59b00971bbcb9d060c775467f..096c701b80dbdc0a57312472cc482b75ac87dfbd 100644 --- a/data/csourceRegistrations/registration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-simple-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-with-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld similarity index 85% rename from data/csourceRegistrations/registration-with-expiration-sample.jsonld rename to data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld index bb9ae21083d30ec6d8c45b136a855cb0ce3c53c4..6e0a40b5e46b8487a3a27ec72b55503d1c860f2b 100644 --- a/data/csourceRegistrations/registration-with-expiration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld @@ -39,6 +39,6 @@ }, "expiresAt": " 2025-11-29T14:53:15Z", "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-different-type-sample.jsonld b/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld similarity index 84% rename from data/csourceRegistrations/registration-different-type-sample.jsonld rename to data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld index 80945e1f7ab256cbdbff766a85ec958d1b890698..d15dfb55021b1bd9f74dca0c6f659dad587cea9a 100644 --- a/data/csourceRegistrations/registration-different-type-sample.jsonld +++ b/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/registration-invalid-structure-sample.jsonld b/data/csourceRegistrations/registration-invalid-structure-sample.jsonld deleted file mode 100644 index cc6bf6c3f421229508708018cf29d8224ab0dd31..0000000000000000000000000000000000000000 --- a/data/csourceRegistrations/registration-invalid-structure-sample.jsonld +++ /dev/null @@ -1,7 +0,0 @@ -{ - "id": "urn:ngsi-ld:ContextSourceRegistration:randomUUID", - "type": "ContextSourceRegistration", - "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" - ] -} \ No newline at end of file diff --git a/data/entities/expectations/vehicle-attributes-sample-append-expectation-02.jsonld b/data/entities/expectations/add-attribute-expectation.jsonld similarity index 100% rename from data/entities/expectations/vehicle-attributes-sample-append-expectation-02.jsonld rename to data/entities/expectations/add-attribute-expectation.jsonld diff --git a/data/entities/expectations/building-attributes-query-sample-expectation.jsonld b/data/entities/expectations/building-attributes-query-expectation.jsonld similarity index 89% rename from data/entities/expectations/building-attributes-query-sample-expectation.jsonld rename to data/entities/expectations/building-attributes-query-expectation.jsonld index e3ffe113fc65c337bb20c694050da631e892d296..77216ca084f9e5e83e170ea739569c798aedc760 100644 --- a/data/entities/expectations/building-attributes-query-sample-expectation.jsonld +++ b/data/entities/expectations/building-attributes-query-expectation.jsonld @@ -1,6 +1,6 @@ { - "id": "urn:ngsi-ld:Building:4279250905792670", + "id": "urn:ngsi-ld:Building:randomUUID", "type": "https://ngsi-ld-test-suite/context#Building", "https://ngsi-ld-test-suite/context#airQualityLevel": { "type": "Property", diff --git a/data/entities/expectations/building-location-attribute-sample-expectation-query-geoproperty.jsonld b/data/entities/expectations/building-geoproperty-query-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-location-attribute-sample-expectation-query-geoproperty.jsonld rename to data/entities/expectations/building-geoproperty-query-expectation.jsonld diff --git a/data/entities/expectations/building-location-attribute-sample-expectation.jsonld b/data/entities/expectations/building-location-attribute-sample-expectation.jsonld deleted file mode 100644 index b4f0f8b21b4bf446225bd8cea9af802b4b1ac677..0000000000000000000000000000000000000000 --- a/data/entities/expectations/building-location-attribute-sample-expectation.jsonld +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "urn:ngsi-ld:Building:randomUUID", - "type": "https://ngsi-ld-test-suite/context#Building", - "name": { - "type": "Property", - "value": "Eiffel Tower" - }, - "https://ngsi-ld-test-suite/context#subCategory": { - "type": "Property", - "value": ["tourism"] - }, - "location": { - "type": "GeoProperty", - "value": { - "type": "Point", - "coordinates": [13.3986, 52.5547] - } - }, - "@context": [ - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" - ] -} \ No newline at end of file diff --git a/data/entities/expectations/building-minimal-sample-expectation.jsonld b/data/entities/expectations/building-minimal-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-minimal-sample-expectation.jsonld rename to data/entities/expectations/building-minimal-expectation.jsonld diff --git a/data/entities/expectations/building-simple-attributes-sample-expectation.jsonld b/data/entities/expectations/building-simple-attributes-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-expectation.jsonld rename to data/entities/expectations/building-simple-attributes-expectation.jsonld diff --git a/data/entities/expectations/building-simple-attributes-sample-expectation-query-attributes.jsonld b/data/entities/expectations/building-simple-attributes-query-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-expectation-query-attributes.jsonld rename to data/entities/expectations/building-simple-attributes-query-expectation.jsonld diff --git a/data/entities/expectations/building-simple-attributes-sample-expectation-simplified.jsonld b/data/entities/expectations/building-simple-attributes-simplified-expectation.jsonld similarity index 100% rename from data/entities/expectations/building-simple-attributes-sample-expectation-simplified.jsonld rename to data/entities/expectations/building-simple-attributes-simplified-expectation.jsonld diff --git a/data/entities/expectations/vehicle-parking-sample-expectation.jsonld b/data/entities/expectations/two-types-vehicle-offstreetparking-expectation.jsonld similarity index 100% rename from data/entities/expectations/vehicle-parking-sample-expectation.jsonld rename to data/entities/expectations/two-types-vehicle-offstreetparking-expectation.jsonld diff --git a/data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-03.jsonld b/data/entities/expectations/vehicle-speed-datasetid-expectation.jsonld similarity index 100% rename from data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-03.jsonld rename to data/entities/expectations/vehicle-speed-datasetid-expectation.jsonld diff --git a/data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-04.jsonld b/data/entities/expectations/vehicle-two-datasetid-attributes-sample-expectation-04.jsonld deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/data/entities/fragmentEntities/invalid-vehicle-fragment-datasetid-sample.jsonld b/data/entities/fragmentEntities/invalid-fragment.jsonld similarity index 77% rename from data/entities/fragmentEntities/invalid-vehicle-fragment-datasetid-sample.jsonld rename to data/entities/fragmentEntities/invalid-fragment.jsonld index 00a0cd6b4a07c1e33e6a9f849f12da7c4dfc19a0..7fc26d826b11a0da843f336ff179b3be6f4c0927 100644 --- a/data/entities/fragmentEntities/invalid-vehicle-fragment-datasetid-sample.jsonld +++ b/data/entities/fragmentEntities/invalid-fragment.jsonld @@ -13,7 +13,6 @@ "value": "BMW" }, "@context": [ - "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-fragment-same-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-attribute-to-add-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-same-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-attribute-to-add-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-all-empty-sample.jsonld b/data/entities/fragmentEntities/vehicle-empty-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-all-empty-sample.jsonld rename to data/entities/fragmentEntities/vehicle-empty-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-empty-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-isparked-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-empty-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-isparked-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-different-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-different-datasetid-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-different-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-different-datasetid-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-equal-datasetid-different-type-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-different-type-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-equal-datasetid-different-type-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-equal-datasetid-different-type-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-equal-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-equal-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-equal-datasetid-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-invalid-datasetid-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-invalid-datasetid-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-01.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-01-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-01.jsonld rename to data/entities/fragmentEntities/vehicle-speed-two-datasetid-01-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-02.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-02-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-02.jsonld rename to data/entities/fragmentEntities/vehicle-speed-two-datasetid-02-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-03.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-03-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-03.jsonld rename to data/entities/fragmentEntities/vehicle-speed-two-datasetid-03-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-04.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-04-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-two-datasetid-attributes-sample-04.jsonld rename to data/entities/fragmentEntities/vehicle-speed-two-datasetid-04-fragment.jsonld diff --git a/data/entities/fragmentEntities/vehicle-fragment-attribute-name-missing-sample.jsonld b/data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld similarity index 100% rename from data/entities/fragmentEntities/vehicle-fragment-attribute-name-missing-sample.jsonld rename to data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld diff --git a/data/entities/vehicle-datasetid-attributes-sample.jsonld b/data/entities/vehicle-speed-two-datasetid-sample.jsonld similarity index 100% rename from data/entities/vehicle-datasetid-attributes-sample.jsonld rename to data/entities/vehicle-speed-two-datasetid-sample.jsonld diff --git a/data/temporalEntities/fragments/vehicle-simplified-temporal-representation-fragment-sample.jsonld b/data/temporalEntities/fragments/vehicle-simplified-temporal-representation-fragment-sample.jsonld deleted file mode 100644 index 28242dc796cdb455efb09db60eac8ce1d5eeaa5b..0000000000000000000000000000000000000000 --- a/data/temporalEntities/fragments/vehicle-simplified-temporal-representation-fragment-sample.jsonld +++ /dev/null @@ -1,14 +0,0 @@ -{ - "added_attribute": { - "type": "Property", - "values": [ - [121,"2018-08-01T12:03:00Z"], - [80,"2018-08-01T12:05:00Z"], - [100,"2018-08-01T12:07:00Z"] - ] - }, - "@context":[ - "https://raw.githubusercontent.com/easy-global-market/ngsild-api-data-models/feature/add-json-ld-context-for-ngsi-ld-test-suite/ngsi-ld-test-suite/ngsi-ld-test-suite-context.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld" - ] -} \ No newline at end of file diff --git a/data/temporalEntities/fragments/vehicle-temporal-intanceid-update-sample.jsonld b/data/temporalEntities/fragments/vehicle-temporal-intanceid-update-fragment.jsonld similarity index 100% rename from data/temporalEntities/fragments/vehicle-temporal-intanceid-update-sample.jsonld rename to data/temporalEntities/fragments/vehicle-temporal-intanceid-update-fragment.jsonld diff --git a/data/temporalEntities/fragments/vehicle-temporal-representation-fragment-sample.jsonld b/data/temporalEntities/fragments/vehicle-temporal-representation-fragment.jsonld similarity index 100% rename from data/temporalEntities/fragments/vehicle-temporal-representation-fragment-sample.jsonld rename to data/temporalEntities/fragments/vehicle-temporal-representation-fragment.jsonld diff --git a/data/temporalEntities/fragments/vehicle-temporal-representation-without-context-fragment-sample.jsonld b/data/temporalEntities/fragments/vehicle-temporal-representation-without-context-fragment-sample.jsonld deleted file mode 100644 index 922b0d312162fe04d89350aeb837e3201dbc0f0f..0000000000000000000000000000000000000000 --- a/data/temporalEntities/fragments/vehicle-temporal-representation-without-context-fragment-sample.jsonld +++ /dev/null @@ -1,19 +0,0 @@ -{ - "added_attribute":[ - { - "type":"Property", - "value":120, - "observedAt":"2020-09-01T12:03:00Z" - }, - { - "type":"Property", - "value":80, - "observedAt":"2020-09-01T12:05:00Z" - }, - { - "type":"Property", - "value":100, - "observedAt":"2020-09-01T12:07:00Z" - } - ] -} \ No newline at end of file