diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_13.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_13.robot index 657b6831ec9d04ac955737d420b6ba153325caaf..0437c22dfc297c9a91fa887a611ac8c6a20a62ec 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_13.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_13.robot @@ -14,7 +14,7 @@ Test Template Query Entities With Joins And Representations *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${city_id_prefix}= urn:ngsi-ld:City: -${linking_entity_filename}= building-relationship.jsonld +${linking_entity_filename}= building-relationship-with-objectType.jsonld ${linked_entity_filename}= city-minimal.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_14.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_14.robot index 803a09f1bd086a884b2886d9bf96069c91eee9c1..c08118816b114ac6ecc956ec1b7e9d18c6cb4afa 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_14.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_14.robot @@ -13,7 +13,7 @@ Test Teardown Delete Created Entities And Linked Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${city_id_prefix}= urn:ngsi-ld:City: -${linking_entity_filename}= building-relationship.jsonld +${linking_entity_filename}= building-relationship-with-objectType.jsonld ${linked_entity_filename}= city-minimal.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_15.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_15.robot index f36e4172bf802edbc59e482e93add48123da32e9..d271e36d82691801d7708434a1f18f60cf516ba2 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_15.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_15.robot @@ -13,7 +13,7 @@ Test Teardown Delete Created Entities And Linked Entities *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${city_id_prefix}= urn:ngsi-ld:City: -${linking_entity_filename}= building-relationship.jsonld +${linking_entity_filename}= building-relationship-with-objectType.jsonld ${linked_entity_filename}= city-minimal.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_16.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_16.robot index 70c622d8a62041cd09b761053620dc1a0bcc29a6..3721e0016aa8b6a9a34bf2fb82e9a96b8f0380d5 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_16.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_16.robot @@ -15,8 +15,8 @@ Test Template Query Entities With Joins And Representations ${building_id_prefix}= urn:ngsi-ld:Building: ${city_id_prefix}= urn:ngsi-ld:City: ${country_id_prefix}= urn:ngsi-ld:Country: -${linking_entity_filename}= building-relationship.jsonld -${level_1_linked_entity_filename}= city-relationship.jsonld +${linking_entity_filename}= building-relationship-with-objectType.jsonld +${level_1_linked_entity_filename}= city-relationship-with-objectType.jsonld ${level_2_linked_entity_filename}= country-minimal.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_10.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_10.robot index e4cb052261281ebe317d2a6cf122b8cacfa18413..2534decf3cb2f74098140bc7dd4b24b9e4207fef 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_10.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_10.robot @@ -14,7 +14,7 @@ Test Template Retrieve Entity With Linked Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${city_id_prefix}= urn:ngsi-ld:City: -${linking_entity_filename}= building-relationship.jsonld +${linking_entity_filename}= building-relationship-with-objectType.jsonld ${linked_entity_filename}= city-minimal.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_11.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_11.robot index aba0207caebe015c8d448ea35b06020d0484b679..32d48b98303537b0d73cc6540229b34ddbf00ea8 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_11.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_11.robot @@ -13,7 +13,7 @@ Test Teardown Delete Created Entity And Linked Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${city_id_prefix}= urn:ngsi-ld:City: -${linking_entity_filename}= building-relationship.jsonld +${linking_entity_filename}= building-relationship-with-objectType.jsonld ${linked_entity_filename}= city-minimal.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_12.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_12.robot index 36716b85aa0ada3ccbf07d6ec1d4cb5c8650d3a8..c2cb0bb711a7a3668621ca745ea020900b9da639 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_12.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_12.robot @@ -13,7 +13,7 @@ Test Teardown Delete Created Entity And Linked Entity *** Variables *** ${building_id_prefix}= urn:ngsi-ld:Building: ${city_id_prefix}= urn:ngsi-ld:City: -${linking_entity_filename}= building-relationship.jsonld +${linking_entity_filename}= building-relationship-with-objectType.jsonld ${linked_entity_filename}= city-minimal.jsonld diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_13.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_13.robot index f6530d56439f2b49350d96cb8ce63b785b2dda59..c76f1eab1234d4151011fcd0b42cd0b35afd701a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_13.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_13.robot @@ -15,8 +15,8 @@ Test Template Retrieve Entity With Linked Entity ${building_id_prefix}= urn:ngsi-ld:Building: ${city_id_prefix}= urn:ngsi-ld:City: ${country_id_prefix}= urn:ngsi-ld:Country: -${linking_entity_filename}= building-relationship.jsonld -${level_1_linked_entity_filename}= city-relationship.jsonld +${linking_entity_filename}= building-relationship-with-objectType.jsonld +${level_1_linked_entity_filename}= city-relationship-with-objectType.jsonld ${level_2_linked_entity_filename}= country-minimal.jsonld diff --git a/data/entities/building-relationship-with-objectType.jsonld b/data/entities/building-relationship-with-objectType.jsonld new file mode 100644 index 0000000000000000000000000000000000000000..597db4b32d2ec041876b120453a7f90457f7d541 --- /dev/null +++ b/data/entities/building-relationship-with-objectType.jsonld @@ -0,0 +1,13 @@ +{ + "id": "urn:ngsi-ld:Building:randomUUID", + "type": "Building", + "locatedAt": { + "type": "Relationship", + "object": "urn:ngsi-ld:City:Paris", + "objectType": "City" + + }, + "@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/city-relationship-with-objectType.jsonld b/data/entities/city-relationship-with-objectType.jsonld new file mode 100644 index 0000000000000000000000000000000000000000..5319a587f8746df236df306aef1c8085661cb3d2 --- /dev/null +++ b/data/entities/city-relationship-with-objectType.jsonld @@ -0,0 +1,12 @@ +{ + "id": "urn:ngsi-ld:City:randomUUID", + "type": "City", + "locatedAt": { + "type": "Relationship", + "object": "urn:ngsi-ld:Country:France", + "objectType": "Country" + }, + "@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