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 c5e99b57f593fb28ecc58108e57ff486de397675..ed65fa40328159a66f557e89f1f9d2860f7a2740 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 @@ -53,7 +53,6 @@ Query several entities based on ids ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 c6b3284adfc53db2146db55bbec800a66ae1d5ec..c2f7962cf95c011c5debab510415a78249105c22 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 @@ -56,7 +56,6 @@ Query several entities based on the entities types ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${building_entity_id} 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 f14f2d82ada00b5e7fec5210b347127624bdebf6..72a618ae1b909a26691f87db4d5d1cedb2fd7f48 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 @@ -46,7 +46,6 @@ Query several entities based on the given id pattern ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 e4a4b8ed53ad1008f5544fea0e3afd69161bdee4..272a1ee7b2ab816e183db32ae160882684961343 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 @@ -53,7 +53,6 @@ Query several entities based on attribute names ... ${expectation_filename} ... ${entities_ids_to_be_compared} ... ${response.json()} - [Teardown] Delete Entities ${first_entity_id} ${second_entity_id} *** Keywords *** 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 fe67c7dbe864e1c8f08baed120d0eaa789f7de8b..99cc51c3b969720110eb9d93829a0292723fdd7c 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 @@ -48,7 +48,6 @@ Query several entities based on a list of properties ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 4121d010c5f9832b87bc58f8c6dd190b37bf96d0..cc7199b4be86d5f8d4792590af53c6491657ec0e 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 @@ -58,7 +58,6 @@ Query several entities via POST Interaction based on ids ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 e258d4481c32cc36cc80041f26de90b913ee59a9..8c512bbcb7a2e2ab3b6cd4d632278b95c58e97c2 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 @@ -56,7 +56,6 @@ Query several entities via POST Interaction based on the entities types ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${building_entity_id} 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 3e99510f13e952b61f6c5e063c931258af880eac..a1721f0f5be6910c054a8d4349c838c24d5f70e9 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 @@ -46,7 +46,6 @@ Query several entities via POST Interaction based on the given id pattern ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 12dc6cbc9493b1c78340d4a257a4b7dc3573fec1..24f80776cbf51440faca51f92712fe6663fb19d0 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 @@ -47,7 +47,6 @@ Query several entities via POST Interaction based on attribute names ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 0a9f36bf74f2fabe922a3091fb99d4ac04d351df..341131dfae4052aca8ca892273ae5141ec207c76 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 @@ -46,7 +46,6 @@ Query several entities via POST Interaction based on a list of properties ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 4a67b778c97fff9693d1633e5377d5761d72f491..1dfa4dc1040a1d054e2e31a7677432fe07c45ee2 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 @@ -46,7 +46,6 @@ Query entities based on incorrect ids Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 d6b7d2f4432e166f56933e96010c5588bc6f9a62..dec550f8ae7ebadb24cadabfdfe825d88c905d1b 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 @@ -47,7 +47,6 @@ Query entities based on incorrect entity types Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${building_entity_id} 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 1a204195315814050ce23d457d2d10443c6f4307..f676b05f219a528683607a246b14b69dab4b7ea5 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 @@ -44,7 +44,6 @@ Query several entities based on incorrect id pattern Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 2b54552247cb2cb2b186e4145f262034e268d429..56c089cb686c3bcc1d50f118f8aab72ce9a9b815 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 @@ -43,7 +43,6 @@ Query several entities based on incorrect attribute names Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 190d8a8af079a5d42e88fd851e1a62ae742091d2..4c037f03398b4493f3cb6393de226f68449f0c90 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 @@ -51,7 +51,6 @@ Query entitites when the request has a wrong geometryProperty Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 6d84cd572a561ea5c32397dab40f8b62ffd46ed7..84fc6886ac194cbd46483a87cae4c26d16c34301 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_04.robot @@ -55,7 +55,6 @@ Query entities in a simplified representation ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 f2f0e28051d0e37b236ceec4e777f8ab82e7854f..9b34595bc4d03b25897b3c14faff86a995831fd1 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_05.robot @@ -55,7 +55,6 @@ Get an entity by id that can be returned in a geoJSON format ... ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} 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 f2bd2ebd6397b9a22f2a8fd642d2ee8152636fa0..610ec02e5a41b5a98e88aa89c1d1e0c06aa09c80 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot @@ -55,7 +55,6 @@ Query entities specifying a maximum number of results Check Response Body Containing Number Of Entities ${entity_type} ${2} ${response.json()} - *** Keywords *** Delete Entities Delete Entity by Id Returning Response ${first_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot index 7b2569d2d68de68df903c38e21346c14c71c49cd..d932dbcebb8f1c6b9d4c15f19bae485261ea2bf2 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot @@ -31,5 +31,7 @@ Create Subscription ... context=${ngsild_test_suite_context} Check Created Resource Set To ${expected_subscription} ${response.json()} + +*** Keywords *** Delete Initial Subscriptions Delete Subscription ${subscription_id} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot index 8af0f6e33c0a261a853c0ebbffa539ff0b7f69cc..b37fbad1ef38929bcbc0537dc5da07cfb838125f 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_04.robot @@ -33,5 +33,7 @@ Create a subscription with an id known to the system ... ${ERROR_TYPE_ALREADY_EXISTS} Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} + +*** Keywords *** Delete Initial Subscriptions Delete Subscription ${subscription_id} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot index e54d7e869353b2f6711d5c115f291a75e9ee5a6a..5caf4ed372a18df2e858e79d278374bb7088cd5b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot @@ -19,7 +19,7 @@ Create Context Source Registration Subscription Without An Id [Tags] csrsub-create 5_11_2 ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${response}= Create Context Source Registration Subscription ${subscription_payload} - ${subscription_id}= Fetch Id From Response Location Header + ${subscription_id}= Fetch Id From Response Location Header ${response.headers} Check Response Status Code 201 ${response.status_code} Check Response Headers Containing URI set to ${subscription_id} ${response.headers} Set Suite Variable ${subscription_id} diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 7bb0f037e3eb09c354f04692620cafb1db205f3a..c6dd0a8978806388d8f5620a2b8742e2c6d0fe13 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -26,14 +26,6 @@ Check Response Body Containing Array Of URIs set to Lists Should Be Equal ${expected_entities_ids} ${response_body} ignore_order=True Check Response Body Content - [Arguments] ${expectation_filename} ${response_body} ${additional_ignored_path}=${EMPTY} - ${entity_payload}= Load Json From File ${EXECDIR}/data/entities/expectations/${expectation_filename} - ${all_ignored_paths}= Create List ${instance_id_regex_expr} ${additional_ignored_path} - ${comparison_result}= Compare Dictionaries Ignoring Keys - ... ${entity_payload} - ... ${response_body} - ... ${all_ignored_paths} - Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} [Arguments] ${expectation_filename} ${response_body} ${additional_ignored_path}=${EMPTY} ${entity_payload}= Load JSON From File ${EXECDIR}/data/entities/expectations/${expectation_filename} ${all_ignored_paths}= Create List ${instance_id_regex_expr} ${additional_ignored_path} diff --git a/resources/HttpUtils.resource b/resources/HttpUtils.resource index 1dab3303e4e3bd2221dbf899087e4382d3567131..8c68b6a0f2d1a1f76b22c033730d186068f2eb8f 100755 --- a/resources/HttpUtils.resource +++ b/resources/HttpUtils.resource @@ -5,5 +5,6 @@ Library String *** Keywords *** Fetch Id From Response Location Header - ${id}= Fetch From Right ${response.headers['Location']} / + [Arguments] ${response_headers} + ${id}= Fetch From Right ${response_headers['Location']} / RETURN ${id}