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 6b5a4ec740ae5bef391f0a21ea3199af69ca9b8e..2614655404863d36f956d9005c9c775db552fb41 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_03.robot @@ -14,25 +14,25 @@ Test Template Partial Update Attributes ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: ${filename}= vehicle-speed-two-datasetid-sample.jsonld ${status_code}= 404 -${attribute_id}= speed +${default_attr_id}= speed -*** Test Cases *** ENTITY_ID FRAGMENT_FILENAME +*** Test Cases *** ENTITY_ID ATTR_ID FRAGMENT_FILENAME 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 + ${not_found_entity_id} ${default_attr_id} vehicle-isparked-fragment.jsonld 012_03_02 Partial update when no default instance and no datasetId specified - ${valid_entity_id} vehicle-speed-invalid-datasetid-fragment.jsonld + ${valid_entity_id} ${default_attr_id} vehicle-speed-no-datasetid-fragment.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 + ${valid_entity_id} ${default_attr_id} vehicle-speed-unknown-datasetid-fragment.jsonld +012_03_04 Partial update when the Attribute Name does not exist in the entity + ${valid_entity_id} speed2 vehicle-speed-no-datasetid-fragment.jsonld *** Keywords *** Partial Update Attributes [Documentation] Check that you cannot perform a partial update on an entity attribute if the entity id or attribute is not known to the system [Tags] ea-partial-update 5_6_4 - [Arguments] ${entity_id} ${fragment_filename} + [Arguments] ${entity_id} ${attr_id} ${fragment_filename} ${response}= Create Entity Selecting Content Type ... ${filename} ... ${valid_entity_id} @@ -40,7 +40,7 @@ Partial Update Attributes Check Response Status Code 201 ${response.status_code} ${response}= Partial Update Entity Attributes ... ${entity_id} - ... ${attribute_id} + ... ${attr_id} ... ${fragment_filename} ... ${CONTENT_TYPE_LD_JSON} Check Response Status Code ${status_code} ${response.status_code} diff --git a/data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-no-datasetid-fragment.jsonld similarity index 55% rename from data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld rename to data/entities/fragmentEntities/vehicle-speed-no-datasetid-fragment.jsonld index 5a7640a2fb0aeb6da92cbeae4e31f1390f1ba0ef..38de190916875d96266499cd68130d80b304ad20 100644 --- a/data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-no-datasetid-fragment.jsonld @@ -1,12 +1,9 @@ { - "speed": { + "type": "Property", + "value": 56, + "source": { "type": "Property", - "value": 56, - "source": { - "type": "Property", - "value": "Speedometer" - }, - "datasetId": "" + "value": "Speedometer" }, "@context": [ "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" diff --git a/data/entities/fragmentEntities/vehicle-speed-unknown-datasetid-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-unknown-datasetid-fragment.jsonld new file mode 100644 index 0000000000000000000000000000000000000000..2367d134b1c466c595e4dfb2816ce992d4a36dbe --- /dev/null +++ b/data/entities/fragmentEntities/vehicle-speed-unknown-datasetid-fragment.jsonld @@ -0,0 +1,12 @@ +{ + "type": "Property", + "value": 56, + "source": { + "type": "Property", + "value": "Speedometer" + }, + "datasetId": "urn:ngsi-ld:Property:unknownDatasetId", + "@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/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld deleted file mode 100644 index d84b42e45ba3ef4fe50ed1f5e21425fc58ce03ae..0000000000000000000000000000000000000000 --- a/data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld +++ /dev/null @@ -1,18 +0,0 @@ -{ - "speed2": { - "type": "Property", - "value": 56, - "source": { - "type": "Property", - "value": "Speedometer" - }, - "datasetId": "urn:ngsi-ld:Property:speedometerA4567-speed" - }, - "brandName": { - "type": "Property", - "value": "BMW" - }, - "@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