Commit e7c68693 authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

Merge branch 'fix/expected-statuses-on-ignored-updates' into 'testsuitedata'

fix: expect a 204 when updates are ignored in update or append attributes operations

See merge request !115
parents 7abba3fe 9d4336eb
Loading
Loading
Loading
Loading
+5 −5
Original line number Original line Diff line number Diff line
@@ -17,15 +17,15 @@ ${entity_payload_filename}= building-simple-attributes-sample.jsonld




*** Test Cases ***    FILENAME    UPDATE_FRAGMENT_FILENAME    EXPECTED_STATUS
*** Test Cases ***    FILENAME    UPDATE_FRAGMENT_FILENAME    EXPECTED_STATUS
005_02_01 EntityWithSimpleProperties
005_02_01 EntityWithExistingAttributes
    [Tags]    be-update    5_6_9
    [Tags]    be-update    5_6_9
    building-simple-attributes-sample.jsonld    fragmentEntities/empty-fragment.json    207
    building-simple-attributes-sample.jsonld    fragmentEntities/empty-fragment.json    204
005_02_02 EntityWithSimpleRelationships
005_02_02 EntityWithNewAttribute
    [Tags]    be-update    5_6_9
    [Tags]    be-update    5_6_9
    building-relationship-sample.jsonld    fragmentEntities/locatedAt-fragment.json    204
    building-relationship-sample.jsonld    fragmentEntities/locatedAt-fragment.json    204
005_02_03 EntityWithRelationshipsProperties
005_02_03 EntityWithNewAndExistingAttribute
    [Tags]    be-update    5_6_9
    [Tags]    be-update    5_6_9
    building-relationship-of-property-sample.jsonld    fragmentEntities/empty-fragment.json    207
    building-location-attribute-sample.jsonld    fragmentEntities/location-fragment.json    204




*** Keywords ***
*** Keywords ***
+3 −3
Original line number Original line Diff line number Diff line
@@ -17,9 +17,9 @@ ${filename}= vehicle-speed-two-datasetid-sample.jsonld




*** Test Cases ***    STATUS_CODE    FRAGMENT_FILENAME    EXPECTATION_RESPONSE_BODY    EXPECTATION_FILENAME
*** Test Cases ***    STATUS_CODE    FRAGMENT_FILENAME    EXPECTATION_RESPONSE_BODY    EXPECTATION_FILENAME
010_04_01 Append entity attributes
010_04_01 Append entity attributes and ignore existing multi-attribute instance
    207    vehicle-attribute-to-add-fragment.jsonld    add-attribute-expectation.jsonld    vehicle-speed-appended-expectation.jsonld
    204    vehicle-attribute-to-add-fragment.jsonld    ${EMPTY}    vehicle-speed-appended-expectation.jsonld
010_04_02 Append entity attributes
010_04_02 Append entity attributes with a new multi-attribute instance
    204    vehicle-speed-different-datasetid-fragment.jsonld    ${EMPTY}    vehicle-speed-different-datasetid-expectation.jsonld
    204    vehicle-speed-different-datasetid-fragment.jsonld    ${EMPTY}    vehicle-speed-different-datasetid-expectation.jsonld




+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,8 @@ ${filename}= vehicle-two-datasetid-attributes-sample.jsonld
    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-expectation.jsonld
011_01_02 Check that you can update existing attributes with the datasetId
011_01_02 Check that you 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-expectation.jsonld
011_01_03 Check that you can update only some attributes while others failed
011_01_03 Check that you can update only some attributes while unknown are ignored
    207    vehicle-speed-two-datasetid-03-fragment.jsonld    vehicle-speed-datasetid-expectation.jsonld    expectations/vehicle-multi-attributes-expectation.jsonld
    204    vehicle-speed-two-datasetid-03-fragment.jsonld    ${EMPTY}    expectations/vehicle-multi-attributes-expectation.jsonld




*** Keywords ***
*** Keywords ***
+0 −11
Original line number Original line Diff line number Diff line
{
    "updated":[
       "https://uri.etsi.org/ngsi-ld/default-context/attribute_to_be_added"
    ],
    "notUpdated":[ 
      {
         "attributeName": "https://ngsi-ld-test-suite/context#speed",
         "reason": "a reason ignored during the comparison"
      }
    ]
 }
 No newline at end of file
+0 −6
Original line number Original line Diff line number Diff line
{
    "updated":[
        "https://ngsi-ld-test-suite/context#speed"
    ],
    "notUpdated":[ ]
 }
 No newline at end of file
Loading