diff --git a/README.md b/README.md index b4925e6f8ffa1fdc35ccb03c8eed46a15abc7607..3458ff56ae8410a17056e42805b2ab2cddc5410a 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,10 @@ For more running instructions please consult [scripts/run_tests.sh](./scripts/ru ```$ python3 -m robot.testdoc TP/NGSI-LD api_docs/TestCases.html``` +## Tidy the Test Cases + +```$ python3 -m robot.tidy --recursive TP/NGSI-LD``` + # Frameworks and libraries used in the project * [Robot Framework](https://github.com/robotframework/robotframework) diff --git a/TP/NGSI-LD/CommonBehaviours/044_02.robot b/TP/NGSI-LD/CommonBehaviours/044_02.robot index f8e87f4bc4b97db6209e9e2bc5fc125064992e5a..8f634d6135ec10e8723672d57e2e431618615ce1 100644 --- a/TP/NGSI-LD/CommonBehaviours/044_02.robot +++ b/TP/NGSI-LD/CommonBehaviours/044_02.robot @@ -32,7 +32,7 @@ ${content_type}= application/json Check Response Status Code 201 ${response.status_code} ${response}= Query Entity ${id} context=${ngsild_test_suite_context} accept=*/* Check Response Status Code 200 ${response.status_code} - Check Response Headers Containing Content-Type set to ${response.headers} ${content_type} + Check Response Headers Containing Content-Type set to ${content_type} ${response.headers} Check Response Headers Link Not Empty ${response.headers} [Teardown] Delete Entity by Id Returning Response ${id} @@ -44,7 +44,7 @@ ${content_type}= application/json Check Response Status Code 201 ${response.status_code} ${response}= Retrieve Subscription ${id} accept=*/* Check Response Status Code 200 ${response.status_code} - Check Response Headers Containing Content-Type set to ${response.headers} ${content_type} + Check Response Headers Containing Content-Type set to ${content_type} ${response.headers} Check Response Headers Link Not Empty ${response.headers} [Teardown] Delete Subscription ${id} @@ -62,7 +62,7 @@ ${content_type}= application/json ... context=${ngsild_test_suite_context} ... accept=*/* Check Response Status Code 200 ${response.status_code} - Check Response Headers Containing Content-Type set to ${response.headers} ${content_type} + Check Response Headers Containing Content-Type set to ${content_type} ${response.headers} Check Response Headers Link Not Empty ${response.headers} [Teardown] Delete Context Source Registration ${registration_id} @@ -83,6 +83,6 @@ ${content_type}= application/json ... accept=*/* Check Response Status Code 200 ${response.status_code} Set Test Variable ${response} - Check Response Headers Containing Content-Type set to ${response.headers} ${content_type} + Check Response Headers Containing Content-Type set to ${content_type} ${response.headers} Check Response Headers Link Not Empty ${response.headers} [Teardown] Delete Temporal Representation Of Entity ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01_01.robot index 889a5c5eeb03f197aa400a4b0c23d5e6e61656d2..fbb7439d95135c17dd87bba488103e450a80ed1b 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01_01.robot @@ -26,7 +26,6 @@ Retrieve Detailed Representation Of Available Attribute Without Context Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Entities ${entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01_02.robot index 1a2f0f77b6f0107a7ebfd94e33c0b66b7381af9e..0853f18186a237bfc77d564188e0ae9b29c3dafd 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributeInformation/027_01_02.robot @@ -21,7 +21,7 @@ Retrieve Detailed Representation Of Available Attribute [Tags] ed-attr 5_7_10 ${response}= Retrieve Attribute attribute_name=airQualityLevel context=${ngsild_test_suite_context} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Attribute element ${expectation_file} + Check Response Body Containing Attribute element ${expectation_file} ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot index c611457b77438619949bfcf6fbdb6514c564b24f..6c60bf128bec899d44c214ae5cbd3b4e9b7fbed6 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableAttributes/025_01.robot @@ -29,7 +29,7 @@ Retrieve Available Attributes [Arguments] ${context} ${expectation_file} ${response}= Retrieve Attributes ${context} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing AttributeList element ${expectation_file} + Check Response Body Containing AttributeList element ${expectation_file} ${response.json()} Setup Initial Entities ${entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01_01.robot index f45a563b066805f7d1aa916a871522fd8503b60c..e782a8c9755fc18523e1a25555582b7a45121f57 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01_01.robot @@ -26,7 +26,6 @@ Retrieve Detailed Representation Of Available Entity Type Without Context Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01_02.robot index 33d7f30e89171591a912b1333787ceabccca2fc0..fbc36deb3d4843fde9a6ea6a4ed7bc7b7929b78a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypeInformation/024_01_02.robot @@ -21,7 +21,7 @@ Retrieve Detailed Representation Of Available Entity Type [Tags] ed-type 5_7_7 ${response}= Retrieve Entity Type type=Building context=${ngsild_test_suite_context} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing EntityTypeInfo element ${expectation_file} + Check Response Body Containing EntityTypeInfo element ${expectation_file} ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot index 0089b75bc2636268414b15eb017043ae1a219a19..3f8cd47c700a8c8e9ac747226250844025d15cf6 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveAvailableEntityTypes/022_01.robot @@ -31,7 +31,7 @@ Retrieve Available Entity Types [Arguments] ${context} ${expectation_file} ${response}= Retrieve Entity Types ${context} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing EntityTypeList element ${expectation_file} + Check Response Body Containing EntityTypeList element ${expectation_file} ${response.json()} Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot index ff3c65112ba3e97fb5d8e4e089fd1b6a3b2caaf0..557cc53d6d70eb301069269ba80de958e63939d1 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableAttributes/026_01.robot @@ -29,7 +29,7 @@ Retrieve Details Of Available Attributes [Arguments] ${context} ${expectation_file} ${response}= Retrieve Attributes context=${context} details=${TRUE} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Attribute element ${expectation_file} + Check Response Body Containing Attribute element ${expectation_file} ${response.json()} Setup Initial Entities ${entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot index b725e55a6856523bdcf05e4b7947149285fbc558..c9b55e302147a06b1b7d5d089b1428ececaae6f4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Discovery/RetrieveDetailsOfAvailableEntityTypes/023_01.robot @@ -31,7 +31,7 @@ Retrieve Details Of Available Entity Types [Arguments] ${context} ${expectation_file} ${response}= Retrieve Entity Types context=${context} details=${TRUE} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing EntityType element ${expectation_file} + Check Response Body Containing EntityType element ${expectation_file} ${response.json()} Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} 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 449cd3a999c03cf24edefa7b7bc6016d5aa168de..fc5f301825d1ae7cb3ac274c2fb4ff43e43ff6d7 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_06.robot @@ -47,7 +47,7 @@ Query entities specifying a maximum number of results ... limit=${limit} Check Response Status Code 200 ${response.status_code} @{entities_ids_to_be_compared}= Create List ${first_entity_id} ${second_entity_id} - Check Response Body Containing Number Of Entities ${entity_type} ${2} + Check Response Body Containing Number Of Entities ${entity_type} ${2} ${response.json()} [Teardown] Delete Entities ${first_entity_id} ${second_entity_id} ${third_entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot index 2501434ad59e20ebb0b66367f8c59b25a168339c..3ed7c3af22bd3b882df4afbe1885c58b118de7ed 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_01.robot @@ -42,6 +42,7 @@ Query the temporal evolution of entities Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} Setup Initial Entities ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot index af1dd0992bfb6665a2f8c7c420ef78deaefa5344..58cc6a91d60854b8cf9c0a560cfc20b83a7da4c1 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_02.robot @@ -35,6 +35,7 @@ Query the temporal evolution of certain attributes of entities Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot index 0fbed90c43a3969082b76491ae57e89629899c56..816299350ea46b5ff35ba2c44da80fb6fb37e954 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_03.robot @@ -34,6 +34,7 @@ Query the temporal evolution of the last N instances of entities attributes Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot index 30a92bf32fb36bdfd4dff3c875c9ca9951d12a78..6bab8c0478ad3e1a554d5733e4aff370c0a29db5 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_04.robot @@ -33,6 +33,7 @@ Query the temporal evolution of entities using a context Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot index 1d6c2d16ca008f856a0ac978e33666e12a09499e..57300cf3dc69f5848d4b83a7310d1052cb89eb68 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_05.robot @@ -32,6 +32,7 @@ Query the temporal evolution of entities matching the given type(s) Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot index 59e25190e7a7ec446111c4798ca9fec8ca1a72b8..5d94d9bfed05203fd5dbe7d771bfa3b76c0afd7c 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_06.robot @@ -33,6 +33,7 @@ Query the temporal evolution of entities matching the given identifier(s) Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot index b4075e657aefd3dd9912fe863b0d8e8b90337c3b..4fca74804556f6b0fee1417d4d4848514942ac39 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_07.robot @@ -34,6 +34,7 @@ Query the temporal evolution of entities matching the given id pattern Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot index 4d1efb4da5504c35d96247341b092399f6a386f6..c49aaa1a434f0d358f12b8f7599d388a8db7755e 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_08.robot @@ -34,6 +34,7 @@ Query the temporal evolution of entities matching the given NGSI-LD query Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot index 5269eb3963f5c6b0c995e1875ec68792ba06c4a3..5a485e319cea3b327de7f0c55b4c0bc69e8d5122 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_09.robot @@ -43,6 +43,7 @@ Query the temporal evolution of entities matching the given NGSI-LD geo-query Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} Setup Initial Entities ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot index 062f404ff1d014082d325dd08b0e6966774ff2cf..13ee25750b7f869a00bc463fb2dba052bb67b071 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_10.robot @@ -31,7 +31,6 @@ Query the temporal evolution of entities matching the given NGSI-LD context sour Check Response Status Code 200 ${response.status_code} - *** Keywords *** Create Initial Context Source Registration Start Context Source Mock Server diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot index 5e0e25debeb907dacd9323c0c22eff93e3ee164a..6880dde957231c594d8912f21876fa2e6d25e579 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_11.robot @@ -37,7 +37,7 @@ Query the temporal evolution of entities with a limit to the number of entities ... timeAt=2020-07-01T12:05:00Z ... context=${ngsild_test_suite_context} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Number Of Entities Vehicle ${limit} + Check Response Body Containing Number Of Entities Vehicle ${limit} ${response.json()} Setup Initial Entities ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot index d52e17b8a12bbabd8a22ee16f5f9dec22fd0149b..459ed3422a853972f1d24de60b32ea65424ded03 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_12.robot @@ -29,7 +29,6 @@ Query the temporal evolution of entities with an invalid request Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Entities ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot index 54963f57f95df50e5fbd86740d16dca3f14cdd6f..0bb09a1f648ec96c96f9e0b029fca2952f919d8c 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_13.robot @@ -37,6 +37,7 @@ Query the temporal evolution of entities using the entityOperations method Check Response Body Containing List Containing EntityTemporal elements ... ${expectation_file} ... ${temporal_entities_representation_ids} + ... ${response.json()} Setup Initial Entities ${first_temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot index 95c4e17b13cd21188d4c493997c0aeb33d40daa4..688ffda75fb988937db79a4a2420476b5e75ff1a 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_01.robot @@ -24,6 +24,7 @@ Retrieve the temporal evolution of an entity Check Response Body Containing EntityTemporal element ... ${vehicle_expectation_file} ... ${temporal_entity_representation_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot index 0d3d4f9bde7bd6d481a8116482e05e7be0ed0382..db67528d9bc0dab60035e1d7a233e452968f4039 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_02.robot @@ -26,6 +26,7 @@ Retrieve the temporal evolution of an entity using a context Check Response Body Containing EntityTemporal element ... ${vehicle_expectation_file} ... ${temporal_entity_representation_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot index b4d586e0f5fb9af4bf75017524fd94c39d8eca66..d6ffa927c5c72639dfbc683a8c3e0f49584ba7d4 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_03.robot @@ -28,6 +28,7 @@ Retrieve the temporal evolution of certain attributes of an entity Check Response Body Containing EntityTemporal element ... ${vehicle_expectation_file} ... ${temporal_entity_representation_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot index d1ecd7b61bad3c5a4d2d79cefd1569b466fbcf9c..5a2082f2635dfe77438ac0e3fc140b2974eec199 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_04.robot @@ -38,6 +38,7 @@ Retrieve the temporal evolution of an entity matching the given NGSI-LD temporal Check Response Body Containing EntityTemporal element ... ${vehicle_expectation_file} ... ${temporal_entity_representation_id} + ... ${response.json()} Setup Initial Entities ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot index 0a07a3acba5d31986400d7a803e631dadbb87255..2b226d09d3cdf058b465a8ab01fe2676418067ab 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_05.robot @@ -36,6 +36,7 @@ Retrieve the temporal evolution of the last N instances of entity attributes Check Response Body Containing EntityTemporal element ... ${vehicle_expectation_file} ... ${temporal_entity_representation_id} + ... ${response.json()} Setup Initial Entities ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot index 35b573da9d1a536951e8c83030219e10355f3d5e..e457cb4c8ac8b6bb407b99b15bc70f24250048af 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_08.robot @@ -30,7 +30,6 @@ Retrieve the temporal evolution of non-existing entity attributes Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Entities ${temporal_entity_representation_id}= Generate Random Entity Id ${vehicule_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot index d982aaa54e76e7b2b696e70aef7335c5d37283c1..69e8d9f67ad49370dec20a48c852dc776d9cbeb0 100644 --- a/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot +++ b/TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_10.robot @@ -28,6 +28,7 @@ Retrieve the temporal evolution of an entity with the simplified temporal repres Check Response Body Containing EntityTemporal element ... ${vehicle_expectation_file} ... ${temporal_entity_representation_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot index 3961c29cc7955ed5e4892388cfbab73c4185ba37..d0ae37d41588c381e53df595270a993b0008cfd4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot @@ -39,11 +39,11 @@ Batch Create Entity Scenarios @{expected_entities_ids}= Create List ${first_entity_id} ${second_entity_id} ${entities_to_be_queried}= Catenate SEPARATOR=, ${first_entity_id} ${second_entity_id} Check Response Status Code 201 ${response.status_code} - Check Response Body Containing Array Of URIs set to @{expected_entities_ids} + Check Response Body Containing Array Of URIs set to ${expected_entities_ids} ${response.json()} ${response}= Query Entities ... ${entities_to_be_queried} ... Building ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Created Resources Set To ${entities_to_be_created} + Check Created Resources Set To ${entities_to_be_created} ${response.json()} ${response}= Batch Delete Entities @{expected_entities_ids} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot index 383d98fde7e500c1b750ad4c32f5879a9d0b19ba..f4461c6628a53884bd682fbd98136c7af7014b51 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot @@ -30,7 +30,7 @@ Create a batch of two valid entities and one invalid entity ... ${expected_successful_entities_ids} ... ${expected_failed_entities_ids} Check Response Status Code 207 ${response.status_code} - Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} + Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} ${response.json()} ${expected_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} ${response}= Query Entities ... ${expected_entities_ids} @@ -38,12 +38,11 @@ Create a batch of two valid entities and one invalid entity ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} @{created_entities}= Create List ${first_entity} ${second_entity} - Check Created Resources Set To ${created_entities} + Check Created Resources Set To ${created_entities} ${response.json()} @{entities_ids_to_be_deleted}= Create List ${first_entity_id} ${second_entity_id} ${existing_entity_id} ${response}= Batch Delete Entities @{entities_ids_to_be_deleted} - *** Keywords *** Setup Initial Entities ${existing_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot index 58d817e6ccb9ad463de136315bc1e9d104897dc0..f49cea34bb6443a5379b49efad5472b2fb456c73 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_04.robot @@ -24,9 +24,11 @@ Create a batch of one entity using a provided Link header with JSON content type Check Response Status Code 201 ${response.status_code} ${response}= Retrieve Entity by Id ${entity_id} context=${ngsild_test_suite_context} # Attribute should be compacted as we used the same context as provided when creating the entity - Check Response Body Containing an Attribute set to almostFull + Check Response Body Containing an Attribute set to almostFull ${response.json()} ${response}= Retrieve Entity by Id ${entity_id} # Attribute should not be compacted as we did not provide a context containing this attribute - Check Response Body Containing an Attribute set to https://ngsi-ld-test-suite/context#almostFull + Check Response Body Containing an Attribute set to + ... https://ngsi-ld-test-suite/context#almostFull + ... ${response.json()} @{entities_ids_to_be_deleted}= Create List ${entity_id} ${response}= Batch Delete Entities @{entities_ids_to_be_deleted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot index a16bb2cadbc546fcc3ca246fbb985c5f71cf4a65..7e314ac10361295d68af243217a084a0ea2fc0ba 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_05.robot @@ -21,9 +21,9 @@ Create a batch of one entity using the default context with JSON content type Check Response Status Code 201 ${response.status_code} ${response}= Retrieve Entity by Id ${entity_id} # Attribute should be compacted as we used the same default context as provided when creating the entity - Check Response Body Containing an Attribute set to almostFull + Check Response Body Containing an Attribute set to almostFull ${response.json()} ${response}= Retrieve Entity by Id ${entity_id} context=${ngsild_test_suite_context} # Attribute should not be compacted as we did not provide a context containing this term - Check Response Body Containing an Attribute set to ngsi-ld:default-context/almostFull + Check Response Body Containing an Attribute set to ngsi-ld:default-context/almostFull ${response.json()} @{entities_ids_to_be_deleted}= Create List ${entity_id} ${response}= Batch Delete Entities @{entities_ids_to_be_deleted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot index 00dc0dbc25c9f0cd6f5f0617f000b82b672f5c48..f63251f18493a069c11b88cc7e610cc7215de4ba 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_07.robot @@ -21,9 +21,11 @@ Create a batch of one entity using a JSON-LD @context obtained from the request Check Response Status Code 201 ${response.status_code} ${response}= Retrieve Entity by Id ${entity_id} context=${ngsild_test_suite_context} # Attribute should be compacted as we used the same context as provided when creating the entity - Check Response Body Containing an Attribute set to almostFull + Check Response Body Containing an Attribute set to almostFull ${response.json()} ${response}= Retrieve Entity by Id ${entity_id} # Attribute should not be compacted as we did not provide a context containing this term - Check Response Body Containing an Attribute set to https://ngsi-ld-test-suite/context#almostFull + Check Response Body Containing an Attribute set to + ... https://ngsi-ld-test-suite/context#almostFull + ... ${response.json()} @{entities_ids_to_be_deleted}= Create List ${entity_id} ${response}= Batch Delete Entities @{entities_ids_to_be_deleted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot index 17b0c55239cd7f9bc1a9da4fa6e9fd849fc36371..7d717d55215766f80e655648580eb73dcbd15696 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot @@ -21,7 +21,7 @@ Delete a batch of entities Check Response Status Code 204 ${response.status_code} ${expected_entities_ids}= Catenate SEPARATOR=, @{entities_ids_to_be_deleted} ${response}= Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} - Check SUT Not Containing Resources + Check SUT Not Containing Resources ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot index c408657c5c0f6f88f8d4d383385d886c587d8858..6250b99596b7703dc7d4bcc38b38f81f1c17f638 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot @@ -25,10 +25,10 @@ Delete a batch of non-existing and existing entities ... ${expected_successful_entities_ids} ... ${expected_failed_entities_ids} Check Response Status Code 207 ${response.status_code} - Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} + Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} ${response.json()} ${expected_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} ${response}= Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} - Check SUT Not Containing Resources + Check SUT Not Containing Resources ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot index a6150c46ba09a0720ab55abc730ae1ea83248766..ab6cf54abd587b40bc07d6b8b0997a2c82be3f3f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -49,7 +49,7 @@ Batch Update Entity Scenarios ... Building ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resources Set To ${updated_entities} + Check Updated Resources Set To ${updated_entities} ${response.json()} Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot index d307e90c758cc77b72ceaf16588c9bc06c993d32..685a3c799ca12a5db71205f9010d832ed4ae42ea 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -49,7 +49,7 @@ Batch Update Entity With NoOverwrite Option Scenarios ... Building ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resources Set To ${updated_entities} + Check Updated Resources Set To ${updated_entities} ${response.json()} Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot index 51137694e07b82d44c2db723d0420d7c096397e3..afe3e325f2e4a3b89a7c9cc1a80df1f25540fdf9 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -34,7 +34,7 @@ Update a batch of non-existing and existing entities ... ${expected_successful_entities_ids} ... ${expected_failed_entities_ids} Check Response Status Code 207 ${response.status_code} - Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} + Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} ${response.json()} ${first_created_entity}= Load Test Sample entities/${entity_payload_filename} ${first_existing_entity_id} ${second_created_entity}= Load Test Sample ... entities/${entity_payload_filename} @@ -49,7 +49,7 @@ Update a batch of non-existing and existing entities ... Building ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resources Set To ${updated_entities} + Check Updated Resources Set To ${updated_entities} ${response.json()} ${response}= Batch Delete Entities @{expected_successful_entities_ids} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot index a8b6abab531a16f7a45adfb4f34d05d41f70411c..a7043f5a468c381c0e346069a3263d123f8daabe 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot @@ -36,12 +36,12 @@ Batch Upsert Entity Scenarios ${response}= Batch Upsert Entities @{entities_to_be_upserted} @{expected_entities_ids}= Create List ${first_entity_id} ${second_entity_id} Check Response Status Code 201 ${response.status_code} - Check Response Body Containing Array Of URIs set to @{expected_entities_ids} + Check Response Body Containing Array Of URIs set to ${expected_entities_ids} ${response.json()} ${expected_updated_entities_ids}= Catenate SEPARATOR=, @{expected_entities_ids} ${response}= Query Entities ... ${expected_updated_entities_ids} ... Building ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resources Set To ${entities_to_be_upserted} + Check Updated Resources Set To ${entities_to_be_upserted} ${response.json()} ${response}= Batch Delete Entities @{expected_entities_ids} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot index afcab51010c850d455e2da3b451cc7b6c88fc004..19822b2c486594424c1020cda11b067ec87f1fd1 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot @@ -41,7 +41,7 @@ Batch Upsert Non-existing And Existing Entities Scenarios ${response}= Batch Upsert Entities @{entities_to_be_upserted} @{expected_entities_ids}= Create List ${new_entity_id} Check Response Status Code 201 ${response.status_code} - Check Response Body Containing Array Of URIs set to @{expected_entities_ids} + Check Response Body Containing Array Of URIs set to ${expected_entities_ids} ${response.json()} @{upserted_entities_ids}= Create List ... ${new_entity_id} ... ${first_existing_entity_id} @@ -52,7 +52,7 @@ Batch Upsert Non-existing And Existing Entities Scenarios ... Building ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resources Set To ${entities_to_be_upserted} + Check Updated Resources Set To ${entities_to_be_upserted} ${response.json()} @{entities_ids_to_be_deleted}= Create List ${new_entity_id} ${response}= Batch Delete Entities @{entities_ids_to_be_deleted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot index de53092edd3ebe0c5bc9baf42c9955bdfb963d60..583cd1d87be6e4ba731d864399eac95d195a71ac 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -42,7 +42,7 @@ Batch Upsert Existing Entities Scenarios ... Building ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resources Set To ${entities_to_be_upserted} + Check Updated Resources Set To ${entities_to_be_upserted} ${response.json()} Setup Initial Entities ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot index 47681f62f5997296107419ebfbc90d2ca08b1035..5015d1fa7abf0f3b39b3ce5af14a425982ceec45 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot @@ -39,7 +39,7 @@ Batch Upsert Entities With Update Option Scenarios ${response}= Batch Upsert Entities @{entities_to_be_upserted} update_option=update @{expected_entities_ids}= Create List ${new_entity_id} Check Response Status Code 201 ${response.status_code} - Check Response Body Containing Array Of URIs set to @{expected_entities_ids} + Check Response Body Containing Array Of URIs set to ${expected_entities_ids} ${response.json()} ${old_entity}= Load Test Sample entities/${existing_entity_payload_filename} ${existing_entity_id} ${update_fragment}= Load Test Sample entities/${update_fragment_filename} ${old_updated_entity}= Upsert Element In Entity ${old_entity} ${update_fragment} @@ -50,7 +50,7 @@ Batch Upsert Entities With Update Option Scenarios ... Building ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resources Set To ${updated_entities} + Check Updated Resources Set To ${updated_entities} ${response.json()} @{entities_ids_to_be_deleted}= Create List ${new_entity_id} ${response}= Batch Delete Entities @{entities_ids_to_be_deleted} diff --git a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot index 678baa02e4468379c2623f6057551ce328af5bc5..59b275c05eb9a9899480ba939a60c5a2cc132fa8 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot @@ -29,7 +29,7 @@ Upsert a batch of two valid entities and one invalid entity ... ${expected_successful_entities_ids} ... ${expected_failed_entities_ids} Check Response Status Code 207 ${response.status_code} - Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} + Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} ${response.json()} ${expected_updated_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} ${response}= Query Entities ... ${expected_updated_entities_ids} @@ -37,5 +37,5 @@ Upsert a batch of two valid entities and one invalid entity ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} @{upserted_entities}= Create List ${first_entity} ${second_entity} - Check Updated Resources Set To ${upserted_entities} + Check Updated Resources Set To ${upserted_entities} ${response.json()} ${response}= Batch Delete Entities @{expected_successful_entities_ids} diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot index 4b83df499f41b121475722e6d99ac91635ba87db..3d17cc43a1047093da159431c27e71e9fcce7620 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot @@ -45,5 +45,5 @@ Create Entity Scenarios ... ${content_type} ... context=${ngsild_test_suite_context} END - Check Created Resource Set To ${created_entity} + Check Created Resource Set To ${created_entity} ${response.json()} [Teardown] Delete Entity by Id ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot index bfbca10a3d28bf1da6ba45da8e80bb6909dd4a8f..a8aa810888911ab8f08e00305dcd025d17119ca6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_04.robot @@ -23,8 +23,10 @@ Create one entity using a provided Link header with JSON content type ... context=${ngsild_test_suite_context} ${response}= Retrieve Entity by Id ${entity_id} context=${ngsild_test_suite_context} # Attribute should be compacted as we used the same context as provided when creating the entity - Check Response Body Containing an Attribute set to almostFull + Check Response Body Containing an Attribute set to almostFull ${response.json()} ${response}= Retrieve Entity by Id ${entity_id} # Attribute should not be compacted as we did not provide a context containing this term - Check Response Body Containing an Attribute set to https://ngsi-ld-test-suite/context#almostFull + Check Response Body Containing an Attribute set to + ... https://ngsi-ld-test-suite/context#almostFull + ... ${response.json()} ${response}= Delete Entity by Id ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot index 4c44f76ba0327488da5c9af19de06b1896c52d90..7a2ffb468ff68ed54c027898fda2749d73def8ac 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_05.robot @@ -19,11 +19,11 @@ Create one entity using the default context with JSON content type ${response}= Create Entity Selecting Content Type ${filename} ${entity_id} ${CONTENT_TYPE_JSON} ${response}= Retrieve Entity by Id ${entity_id} # Attribute should be compacted as we used the same default context as provided when creating the entity - Check Response Body Containing an Attribute set to almostFull + Check Response Body Containing an Attribute set to almostFull ${response.json()} ${response}= Retrieve Entity by Id ... ${entity_id} ... ${CONTENT_TYPE_JSON} ... context=${ngsild_test_suite_context} # Attribute should not be compacted as we did not provide a context containing this term - Check Response Body Containing an Attribute set to ngsi-ld:default-context/almostFull + Check Response Body Containing an Attribute set to ngsi-ld:default-context/almostFull ${response.json()} ${response}= Delete Entity by Id ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot index c2fda435a83af30c4839bf1891cfb32af6f130e2..9f5445cc8724ab92286da2bda7c75eb3bfe1d49f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_07.robot @@ -19,8 +19,10 @@ Create one entity using a JSON-LD @context obtained from the request payload ${response}= Create Entity Selecting Content Type ${filename} ${entity_id} ${CONTENT_TYPE_LD_JSON} ${response}= Retrieve Entity by Id ${entity_id} context=${ngsild_test_suite_context} # Attribute should be compacted as we used the same context as provided when creating the entity - Check Response Body Containing an Attribute set to almostFull + Check Response Body Containing an Attribute set to almostFull ${response.json()} ${response}= Retrieve Entity by Id ${entity_id} # Attribute should not be compacted as we did not provide a context containing this term - Check Response Body Containing an Attribute set to https://ngsi-ld-test-suite/context#almostFull + Check Response Body Containing an Attribute set to + ... https://ngsi-ld-test-suite/context#almostFull + ... ${response.json()} ${response}= Delete Entity by Id ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot index 235d59536da34813c735a3511232621073626da1..38a001804aac87cbc2b914ab12683a199492e9f2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot @@ -23,4 +23,4 @@ Delete an entity ${response}= Delete Entity by Id Returning Response ${entity_id} Check Response Status Code 204 ${response.status_code} ${response}= Retrieve Entity by Id ${entity_id} context=${ngsild_test_suite_context} - Check SUT Not Containing Resource + Check SUT Not Containing Resource ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot index 5f2d95f28a1574d91a2a9243c2afb64846569391..02ed006ce82f47b48866ff9f116f0c5b42a96a97 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_01.robot @@ -57,7 +57,7 @@ Append Attributes Without Params ... ${entity_id} ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resource Set To ${entity_expectation_payload} + Check Updated Resource Set To ${entity_expectation_payload} ${response.json()} [Teardown] Delete Entity by Id Returning Response ${entity_id} Append Attributes With Params @@ -89,5 +89,5 @@ Append Attributes With Params ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List @context - Check Updated Resource Set To ${entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To ${entity_expectation_payload} ${response.json()} ${ignored_attributes} [Teardown] Delete Entity by Id Returning Response ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_03.robot index f363e0a3c3878e81a1cbffca61b4e1b5aa61e594..95e649077cf9332f2fd5f3ce8d8331063f9c1dd9 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/AppendEntityAttributes/010_03.robot @@ -24,6 +24,5 @@ Append entity attributes when the entity id is not known to the system Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** [Teardown] Delete Entity by Id Returning Response ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot index 8e90be9de35274da56dcd7cfef94ea5e0776bd2e..25978e8cdc0c33e791f41b9687600de5adba79ab 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/DeleteEntityAttribute/013_01.robot @@ -48,5 +48,5 @@ Delete Attributes ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List @context - Check Updated Resource Set To ${entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To ${entity_expectation_payload} ${response.json()} ${ignored_attributes} [Teardown] Delete Entity by Id Returning Response ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot index f62936e25aa32fef8970ce5c839b66aaefff9e21..82ed9453952aceaaec2e88a8001626602a8ffe7e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/PartialAttributeUpdate/012_01.robot @@ -44,5 +44,5 @@ Update Attributes ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List @context - Check Updated Resource Set To ${entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To ${entity_expectation_payload} ${response.json()} ${ignored_attributes} [Teardown] Delete Entity by Id Returning Response ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot index 9c1abaf82853be1a9931bbcf3f1e5d1bdb779f83..2801cba5ce9a4bf21849fbb5a48da556ad0d48bd 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_01.robot @@ -48,5 +48,5 @@ Update Attributes ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List @context - Check Updated Resource Set To ${entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To ${entity_expectation_payload} ${response.json()} ${ignored_attributes} [Teardown] Delete Entity by Id Returning Response ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_03.robot b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_03.robot index 2a355c9896293eeffb9c8928832ade31dcb5a2b7..144d50265349241130e341abaf37151aca34b127 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/EntityAttributes/UpdateEntityAttributes/011_03.robot @@ -25,6 +25,5 @@ Update entity attributes when the entity id is not known to the system Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** [Teardown] Delete Entity by Id Returning Response ${entity_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot index d78353d688f83b75583e8f1f5c743cf1e70f62f2..e52305a8c5651ffcdd590203a7c1e5e0338eb00f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/CreateTemporalRepresentationOfEntity/007_01.robot @@ -45,5 +45,8 @@ Create Temporal Entity ${temporal_entity_expectation_payload}= Load Test Sample ... temporalEntities/expectations/${expectation_filename} ... ${temporal_entity_representation_id} - Check Created Resource Set To ${temporal_entity_expectation_payload} ${ignored_attributes} + Check Created Resource Set To + ... ${temporal_entity_expectation_payload} + ... ${response.json()} + ... ${ignored_attributes} [Teardown] Delete Temporal Representation Of Entity ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot index cd263d541ffbf866fe93ad506b9054c6471df25c..02051616712afe4e5ece431bad796522535f72ce 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/DeleteTemporalRepresentationOfEntity/009_01.robot @@ -27,4 +27,4 @@ Delete a temporal representation of an entity with simple temporal properties ${response}= Retrieve Temporal Representation Of Entity ... ${temporal_entity_representation_id} ... context=${ngsild_test_suite_context} - Check SUT Not Containing Resource + Check SUT Not Containing Resource ${response.status_code} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot index 8e2dd36cfd546abcd01f8ade5722620425b1cbee..b04ba70795e9e4a6544ce0535d82ddd473b31475 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntity/UpdateTemporalRepresentationOfEntity/008_01.robot @@ -36,5 +36,8 @@ ${expectation_filename}= vehicle-temporal-representation-update-expectation.j ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List instanceId @context - Check Updated Resource Set To ${temporal_entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To + ... ${temporal_entity_expectation_payload} + ... ${response.json()} + ... ${ignored_attributes} [Teardown] Delete Temporal Representation Of Entity ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AppendAttributes/014_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AppendAttributes/014_01.robot index b510e97a7901b093ce82874379b2bc65b0288d15..4e6ea7f97fce5b4851626b767fec84916bbf67a4 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AppendAttributes/014_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/AppendAttributes/014_01.robot @@ -36,5 +36,8 @@ ${expectation_filename}= vehicle-temporal-representation-added-attribute-expe ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List instanceId @context - Check Updated Resource Set To ${temporal_entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To + ... ${temporal_entity_expectation_payload} + ... ${response.json()} + ... ${ignored_attributes} [Teardown] Delete Temporal Representation Of Entity ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot index 88c24a253d7e2b1aac9c41ac04d4fdb157ad862e..9b2064090d48cca5aae6b6b06b5682f61b6dfb2c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttribute/015_01.robot @@ -51,5 +51,8 @@ Delete Attribute From A Temporal Entity ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List instanceId @context - Check Updated Resource Set To ${temporal_entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To + ... ${temporal_entity_expectation_payload} + ... ${response.json()} + ... ${ignored_attributes} [Teardown] Delete Temporal Representation Of Entity ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot index ccdb46d9294f64fe84aeaeb3fe1099296c85323b..e3ef12a6ef9db7bde755735ae924e5a9fe443a7b 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/DeleteAttributeInstance/017_01.robot @@ -44,5 +44,8 @@ ${expectation_filename}= vehicle-temporal-representation-delete-speed-instanc ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List instanceId @context - Check Updated Resource Set To ${temporal_entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To + ... ${temporal_entity_expectation_payload} + ... ${response.json()} + ... ${ignored_attributes} [Teardown] Delete Temporal Representation Of Entity ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/ModifyAttributeInstance/016_01.robot b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/ModifyAttributeInstance/016_01.robot index fc7f96366a36bdbe5abe0df5bb1a442e87983b42..19ad0a2c17eefeca8c4604162d5195c313197f20 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/ModifyAttributeInstance/016_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/TemporalEntityAttributes/ModifyAttributeInstance/016_01.robot @@ -57,5 +57,8 @@ ${attributeId}= speed ... temporalEntities/expectations/${expectation_filename} ... ${temporal_entity_representation_id} ${ignored_attributes}= Create List instanceId @context modifiedAt - Check Updated Resource Set To ${temporal_entity_expectation_payload} ${ignored_attributes} + Check Updated Resource Set To + ... ${temporal_entity_expectation_payload} + ... ${response.json()} + ... ${ignored_attributes} [Teardown] Delete Temporal Representation Of Entity ${temporal_entity_representation_id} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot index e5e8f6de6c96ce0799f3de2572a425f5673d9916..0df8209603d05fb6df0cbd070a9d0a0832092e08 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/CreateSubscription/028_01.robot @@ -26,5 +26,5 @@ Create Subscription ... ${subscription_id} ... accept=${CONTENT_TYPE_LD_JSON} ... context=${ngsild_test_suite_context} - Check Created Resource Set To ${expected_subscription} + Check Created Resource Set To ${expected_subscription} ${response.json()} [Teardown] Delete Subscription ${subscription_id} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot index 7a12cff99ad89e4492f9556e308d4081241a0695..ad4c89805ccc0484dc7eba760939fe9228b93e31 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/DeleteSubscription/032_03.robot @@ -21,7 +21,7 @@ Delete Subscription ${response}= Delete Subscription ${subscription_id} Check Response Status Code 204 ${response.status_code} ${response}= Retrieve Subscription ${subscription_id} - Check SUT Not Containing Resource + Check SUT Not Containing Resource ${response.status_code} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot index 757768a1cd20e44f0a7dbe02e9a2f00f35f039c0..f5706541757a22b22c7c9530f98628f2506e23fb 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_01.robot @@ -30,6 +30,7 @@ Query Subscriptions Check Response Body Containing List Containing Subscription elements ... ${expectation_file_path} ... ${subscription_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot index c8c763a14d81d6f871d81035ea41058fcdfe7ae9..7cb6507231be6902c11aa60cf93023d94f8cbab4 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/QuerySubscriptions/031_02.robot @@ -39,8 +39,11 @@ Query Subscriptions With Limit And Page Parameters ... offset=${offset} ... accept=${CONTENT_TYPE_LD_JSON} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Number Of Entities Subscription ${expectation_subscription_number} - Check Pagination Prev And Next Headers ${prev_link} ${next_link} + Check Response Body Containing Number Of Entities + ... Subscription + ... ${expectation_subscription_number} + ... ${response.json()} + Check Pagination Prev And Next Headers ${prev_link} ${next_link} ${response.headers} Setup Initial Subscriptions ${first_subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot index 9cfdf7c147cc787b7e6163571143b977e68e006b..5689e01a148e5ad68f53c75cd1e0a7458e31c883 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/RetrieveSubscription/030_03.robot @@ -21,7 +21,10 @@ Retrieve Subscription [Tags] sub-retrieve 5_8_3 ${response}= Retrieve Subscription ${subscription_id} context=${ngsild_test_suite_context} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Subscription element ${expectation_file_path} ${subscription_id} + Check Response Body Containing Subscription element + ... ${expectation_file_path} + ... ${subscription_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot index 7175df757dd37ee16951c6201fb620cf8af08d53..63869f67e78d84cf591d1d2a5b03e38e9504afe3 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_03.robot @@ -30,7 +30,6 @@ Update Subscription With Invalid Fragment Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot index 94a2b5075cfdfb71d77ca4a141415ba069fdc005..da9c634d40847a71b726429150addaa2b6dab429 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_04.robot @@ -30,7 +30,6 @@ Update Subscription With Null Mandatory Properties Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot index 3c571964042ace1c03dae97e61f787a1cfc3a7ac..340d4fcd495aea9b2396fb2ff1b74f4b6c97c6df 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_05.robot @@ -31,10 +31,12 @@ Update Subscription With Term to Uri Expansion Check Response Body Containing Subscription element ... ${expected_subscription_payload_file_path} ... ${subscription_id} + ... ${response.json()} ${response}= Retrieve Subscription ${subscription_id} Check Response Body Containing Subscription element ... ${expected_expanded_subscription_payload_file_path} ... ${subscription_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot index a3fcfb84e18b6bad2687c6361d3b622b74f2ece2..606ecfebf96179769aa91ea16b74c1c621fe1b6a 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_06.robot @@ -32,7 +32,7 @@ Update Subscription ... accept=${CONTENT_TYPE_LD_JSON} ... context=${ngsild_test_suite_context} ${ignored_attributes}= Create List ${status_regex_expr} - Check Updated Resource Set To ${subscription} ${ignored_attributes} + Check Updated Resource Set To ${subscription} ${response.json()} ${ignored_attributes} *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot index 9c8ef145f3d018f1238d909e86b2bf269a57e8c9..6b1a4158e5059a798ff16c160f558c9acfd06dda 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_07.robot @@ -30,7 +30,7 @@ Activate Paused Subscription With isActive Member ... ${CONTENT_TYPE_JSON} Check Response Status Code 204 ${response.status_code} ${response}= Retrieve Subscription ${subscription_id} - Check Response Body Containing an Attribute set to status active + Check Response Body Containing an Attribute set to status ${response.json()} active Setup Initial Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot index 9f07d0e558c8478ec00dd0b8a376b625e57b9418..ad62120ed97ed10b580e20a127a7d4bb7609e1e4 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_08.robot @@ -31,7 +31,7 @@ Activate Paused Subscription With isActive And ExpiresAt Members ... ${CONTENT_TYPE_JSON} Check Response Status Code 204 ${response.status_code} ${response}= Retrieve Subscription ${subscription_id} - Check Response Body Containing an Attribute set to status active + Check Response Body Containing an Attribute set to status ${response.json()} active Setup Initial Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot index 3b2b8fc648f89db938613b77df9b1913d3f28f39..024d6d12a79c97a86f8206a92e5e3423c1eb5178 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_09.robot @@ -25,7 +25,7 @@ Update Subscription Status To Paused ... ${CONTENT_TYPE_JSON} Check Response Status Code 204 ${response.status_code} ${response}= Retrieve Subscription ${subscription_id} - Check Response Body Containing an Attribute set to status paused + Check Response Body Containing an Attribute set to status ${response.json()} paused *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot index a82c2089a32074e944e3976575c387fb35544bc9..aeb29fa0184f01bcb58d5890b37d8cddc6c76f61 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_10.robot @@ -36,7 +36,7 @@ Activate Expired Subscription ... ${CONTENT_TYPE_JSON} Check Response Status Code 204 ${response.status_code} ${response}= Retrieve Subscription ${subscription_id} - Check Response Body Containing an Attribute set to status active + Check Response Body Containing an Attribute set to status ${response.json()} active *** Keywords *** diff --git a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot index 64d5c3d0e544bdc39368188de73d9ac354b29b55..480bc93196d07935054f5911bd3fb89aa0c90d07 100644 --- a/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot +++ b/TP/NGSI-LD/ContextInformation/Subscription/UpdateSubscription/029_11.robot @@ -30,7 +30,6 @@ Update Subscription With ExpiresAt In The Past Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} 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 a87d5cdb227e1e99aabd322689dbd8d770ea746d..51a25ad2c004cd4858982ea5e0fdebaafe03aa35 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_01.robot @@ -25,5 +25,5 @@ Create Context Source Registration With Specific Date Expiration Date ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List ${status_regex_expr} - Check Created Resource Set To ${registration_payload} ${ignored_attributes} + Check Created Resource Set To ${registration_payload} ${response.json()} ${ignored_attributes} [Teardown] Delete Context Source Registration ${registration_id} 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 29a3e5ef61c9898857be8548177df4d714aa4921..87917bd3d620fed2fc7bb4964a109fd9a4bfa6e4 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_02.robot @@ -26,5 +26,5 @@ Create Context Source Registration That Never Expires ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List ${status_regex_expr} - Check Created Resource Set To ${registration_payload} ${ignored_attributes} + Check Created Resource Set To ${registration_payload} ${response.json()} ${ignored_attributes} [Teardown] Delete Context Source Registration ${registration_id} 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 611e8a0903270a5066409825047b900af5a3e569..1ba8d35cd954d86610251fe70f0828977aa7b5aa 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_01_03.robot @@ -25,5 +25,5 @@ Create Context Source Registration Without A Sprecified ID ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List ${status_regex_expr} - Check Created Resource Set To ${registration_payload} ${ignored_attributes} + Check Created Resource Set To ${registration_payload} ${response.json()} ${ignored_attributes} [Teardown] Delete Context Source Registration ${registration_id} diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_04.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_04.robot index d820ecaf8c723c98c1060332ceed274f60577e10..0f0eb20165b4c71d74e084a18aed8457aeed3cb6 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_04.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_04.robot @@ -24,9 +24,10 @@ Create one context source registration using a provided Link header with JSON co ... ${ngsild_test_suite_context} Check Response Status Code 201 ${response.status_code} ${response}= Retrieve Context Source Registration ${registration_id} context=${ngsild_test_suite_context} - Check JSON Value In Response Body ['information']['entities'][0]['type'] Building + Check JSON Value In Response Body ['information']['entities'][0]['type'] Building ${response.json()} ${response}= Retrieve Context Source Registration ${registration_id} Check JSON Value In Response Body ... ['information']['entities'][0]['type'] ... https://ngsi-ld-test-suite/context#Building + ... ${response.json()} [Teardown] Delete Context Source Registration ${registration_id} diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_05.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_05.robot index cbb25fc5e8ed503a62737709d72c6ef1c43b16ec..f486086c27b7aa7bbda6b89504a7ee08da50c69b 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_05.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_05.robot @@ -23,7 +23,10 @@ Create one context source registration using the default context with JSON conte ... ${CONTENT_TYPE_JSON} Check Response Status Code 201 ${response.status_code} ${response}= Retrieve Context Source Registration ${registration_id} context=${ngsild_test_suite_context} - Check JSON Value In Response Body ['information']['entities'][0]['type'] ngsi-ld:default-context/Building + Check JSON Value In Response Body + ... ['information']['entities'][0]['type'] + ... ngsi-ld:default-context/Building + ... ${response.json()} ${response}= Retrieve Context Source Registration ${registration_id} - Check JSON Value In Response Body ['information']['entities'][0]['type'] Building + Check JSON Value In Response Body ['information']['entities'][0]['type'] Building ${response.json()} [Teardown] Delete Context Source Registration ${registration_id} diff --git a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot index 98ce13ab6966b52250f9eb0f42755f379f4a94c6..77b28786822253c1f21291de019b523db4886e3c 100644 --- a/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot +++ b/TP/NGSI-LD/ContextSource/Registration/CreateContextSourceRegistration/033_07.robot @@ -23,9 +23,10 @@ Create one context source registration using a JSON-LD @context obtained from th ... ${CONTENT_TYPE_LD_JSON} Check Response Status Code 201 ${response.status_code} ${response}= Retrieve Context Source Registration ${registration_id} context=${ngsild_test_suite_context} - Check JSON Value In Response Body ['information']['entities'][0]['type'] Building + Check JSON Value In Response Body ['information']['entities'][0]['type'] Building ${response.json()} ${response}= Retrieve Context Source Registration ${registration_id} Check JSON Value In Response Body ... ['information']['entities'][0]['type'] ... https://ngsi-ld-test-suite/context#Building + ... ${response.json()} [Teardown] Delete Context Source Registration ${registration_id} diff --git a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot index 1572d99676bcd06c48ea11430d9041eaa61375ff..bd7979a8788bf8da82bb0dae68e60068f07c0204 100644 --- a/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/DeleteContextSourceRegistration/035_01.robot @@ -23,4 +23,4 @@ Delete a context source registration by id ${response}= Delete Context Source Registration With Return ${registration_id} Check Response Status Code 204 ${response.status_code} ${response}= Retrieve Context Source Registration ${registration_id} context=${ngsild_test_suite_context} - Check SUT Not Containing Resource + Check SUT Not Containing Resource ${response.status_code} diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_01.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_01.robot index 785cab2611f5c172f502646238b1d4230eaf8446..3448461581112e473bcff6cd17cf846f7206c7ae 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_01.robot @@ -40,6 +40,7 @@ Query Context Source Registration Check Response Body Containing List Containing Context Source Registrations elements ... ${expectation_file_path} ... ${expected_context_source_registration_ids} + ... ${response.json()} Setup Initial Context Source Registrations ${first_context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_04.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_04.robot index 25864bcb716107c8afc34166a6ff5274f8559bbd..200574a35a8c52abaec9f0b3343b73f7c0e046d0 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_04.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_04.robot @@ -25,6 +25,7 @@ Query Context Source Registrations Without Context Check Response Body Containing List Containing Context Source Registrations elements ... ${expectation_file_path} ... ${expected_context_source_registration_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_05.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_05.robot index b4e1c5d26ceb8a336c0a9a57385860152eb39ec9..22b7a7cadedb15a2deb941fe85f7efd8df6e591a 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_05.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_05.robot @@ -40,4 +40,5 @@ Query Context Source Registration Matching EntityInfo of RegistrationInfo Check Response Body Containing List Containing Context Source Registrations elements ... ${expectation_file_path} ... ${expected_context_source_registration_ids} + ... ${response.json()} [Teardown] Delete Context Source Registration ${context_source_registration_id} diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_06.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_06.robot index 7c8a00c3f0019a5e5e98d2750ea517026c4dc04d..7f803e348b8756d3d3f2423b4d2e7a1c659a3b45 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_06.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_06.robot @@ -37,6 +37,7 @@ Query Context Source Registration Matching Properties And Relationships Of Regis Check Response Body Containing List Containing Context Source Registrations elements ... ${expectation_file_path} ... ${expected_context_source_registration_ids} + ... ${response.json()} Setup Initial Context Source Registration ${context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_07.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_07.robot index 49492e94ce3dc093acceb636dd1e71700d562e4a..6cb09ceb9b51c271a97b171dd496e12b20b95484 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_07.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_07.robot @@ -39,6 +39,7 @@ Query Context Source Registration Matching Geoquery Check Response Body Containing List Containing Context Source Registrations elements ... ${expectation_file_path} ... ${expected_context_source_registration_ids} + ... ${response.json()} Setup Initial Context Source Registration ${context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_08.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_08.robot index 39a33d5adfb98650044db73aa8c64d0b1545145f..b1fe80c5884706294bc93ee6404283701b106a61 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_08.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_08.robot @@ -25,6 +25,7 @@ Query Context Source Registration Without Temporal Query Check Response Body Containing List Containing Context Source Registrations elements ... ${expectation_file_path} ... ${expected_context_source_registration_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_09.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_09.robot index 1173a309755ee948f3e88a38d6423c085aabed21..f5170635d895d3c1debb89bb3595d250ec743111 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_09.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_09.robot @@ -52,4 +52,5 @@ Query Context Source Registration Matching Temporal Query Check Response Body Containing List Containing Context Source Registrations elements ... ${expectation_file_path} ... ${expected_context_source_registration_ids} + ... ${response.json()} [Teardown] Delete Context Source Registration ${context_source_registration_id} diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_10.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_10.robot index f8e8711cb3a3dc1a11cfad309d4e0a8aa42b1065..0becb0ad5ac007238dfa8e2a50a536dda7958ebf 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_10.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_10.robot @@ -44,6 +44,7 @@ Query Context Source Registration With Query Params Check Response Body Containing List Containing Context Source Registrations elements ... ${expectation_file_path} ... ${expected_context_source_registration_ids} + ... ${response.json()} Setup Initial Context Source Registrations ${first_context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_11.robot b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_11.robot index e85b7ac95e286d80eae0e6c2d54e1e56e5bb675a..4708063fe161c5ff841223adb020abe244ddfe30 100644 --- a/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_11.robot +++ b/TP/NGSI-LD/ContextSource/Registration/QueryContextSourceRegistrations/037_11.robot @@ -39,8 +39,11 @@ Query Context Source Registration With Limit And Page Parameters ... limit=${limit} ... page=${page} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Number Of Entities ContextSourceRegistration ${expected_number} - Check Pagination Prev And Next Headers ${prev_link} ${next_link} + Check Response Body Containing Number Of Entities + ... ContextSourceRegistration + ... ${expected_number} + ... ${response.json()} + Check Pagination Prev And Next Headers ${prev_link} ${next_link} ${response.json()} Setup Initial Context Source Registrations ${first_context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_03.robot b/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_03.robot index 53055cb17ae8d8f438f6bf99a58d90a34cc7fc5b..a950048628c736e4bbcec366f8f34af38594d4ce 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_03.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_03.robot @@ -24,6 +24,7 @@ Retrieve Context Source Registration With Default Core Context Check Response Body Containing Context Source Registration element ... ${expectation_file_path} ... ${context_source_registration_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_04.robot b/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_04.robot index 1a1f6757403836baaf17a6ebd38deb5a4e3ef9b1..3c968a8704ffbb04382250229583266f77cbb61e 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_04.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_04.robot @@ -26,6 +26,7 @@ Retrieve Context Source Registration Check Response Body Containing Context Source Registration element ... ${expectation_file_path} ... ${context_source_registration_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_05.robot b/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_05.robot index 03d9fed5d4d92571e7ae32b48c888c957f992535..37be8a913ccc9cbe1b1d369f599758bbeacd9688 100644 --- a/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_05.robot +++ b/TP/NGSI-LD/ContextSource/Registration/RetrieveContextSourceRegistration/036_05.robot @@ -35,6 +35,7 @@ Check JSON-LD resolution when retrieving a context source registration Check Response Body Containing Context Source Registration element ... ${expected_payload} ... ${context_source_registration_id} + ... ${response.json()} Setup Initial Context Source Registration ${context_source_registration_id}= Generate Random Entity Id ${context_source_registration_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot index 7ddf99771647422fb5e29a9e852bac1fbb10b445..3050f041d94a3bd4c39b61478b4a16a30eeabb20 100644 --- a/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot +++ b/TP/NGSI-LD/ContextSource/Registration/UpdateContextSourceRegistration/034_01.robot @@ -41,5 +41,5 @@ Update Context Source ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List ${status_regex_expr} @context - Check Updated Resource Set To ${registration_payload} ${ignored_attributes} + Check Updated Resource Set To ${registration_payload} ${response.json()} ${ignored_attributes} [Teardown] Delete Context Source Registration ${registration_id} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot index 9dcaaa19f3b516ab4ed3c0e727ac242dc4319b44..d96731cf12efbefa980493daa2565d9af118b157 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot @@ -27,7 +27,7 @@ Create Context Source Registration Subscription ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List ${status_regex_expr} - Check Created Resource Set To ${subscription_payload} ${ignored_attributes} + Check Created Resource Set To ${subscription_payload} ${response.json()} ${ignored_attributes} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot index 7acfe0ef26938ccb8c5f796a92a3de23417658b7..e54d7e869353b2f6711d5c115f291a75e9ee5a6a 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot @@ -28,7 +28,7 @@ Create Context Source Registration Subscription Without An Id ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} ${ignored_attributes}= Create List ${id_regex_expr} ${status_regex_expr} - Check Created Resource Set To ${subscription_payload} ${ignored_attributes} + Check Created Resource Set To ${subscription_payload} ${response.json()} ${ignored_attributes} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot index 131e2dec9c3eea1db6ccb5d0a4d8576ecea1688f..12673b28f3bbd19168b26acf8580da091aeef8ba 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_03.robot @@ -23,7 +23,7 @@ Create Context Source Registration Subscription Without isActive Member Check Response Status Code 201 ${response.status_code} Check Response Headers Containing URI set to ${subscription_id} ${response.headers} ${response}= Retrieve context source registration subscription ${subscription_id} - Check Response Body Containing an Attribute set to status active + Check Response Body Containing an Attribute set to status ${response.json()} active *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot index da1e0f8eb3d1e804b57f8bd3d047a1f6a7b05d70..25ba1341ab55775611241a4b268470abdbc9155d 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_04.robot @@ -23,7 +23,7 @@ Create Inactive Context Source Registration Subscription Check Response Status Code 201 ${response.status_code} Check Response Headers Containing URI set to ${subscription_id} ${response.headers} ${response}= Retrieve context source registration subscription ${subscription_id} - Check Response Body Containing an Attribute set to status paused + Check Response Body Containing an Attribute set to status ${response.json()} paused *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot index 6b5603837e6f0637f875676ce75fde538d584300..52b6a0ebfb335d5a2da90bc9d1dac4450fc65402 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_05.robot @@ -27,7 +27,7 @@ Create Context Source Registration Subscription With expiresAt Member Check Response Headers Containing URI set to ${subscription_id} ${response.headers} Sleep 15s ${response}= Retrieve context source registration subscription ${subscription_id} - Check Response Body Containing an Attribute set to status expired + Check Response Body Containing an Attribute set to status ${response.json()} expired *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot index c719246cb93d3a5bfa0b001e46b7071527a9f91b..3ccfc4de3a95a3e90128d616688e9a20220ce471 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_06.robot @@ -25,7 +25,7 @@ Create Context Source Registration Subscription Without expiresAt Member # Let's say if the subscription stills active after 10s it will be considered as perpetual, but this is not enough Sleep 10s ${response}= Retrieve context source registration subscription ${subscription_id} - Check Response Body Containing an Attribute set to status active + Check Response Body Containing an Attribute set to status ${response.json()} active *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot index e930111c711167b9fd9ec0832e38bc5b37c0ea0a..12eec6676f02e1680689d8cf93435e352fb952a4 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_07.robot @@ -27,7 +27,6 @@ Create Existing Context Source Registration Subscription Check Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Context Source Registration Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot index 6a605539f2b9cfab878873f60b039526142523cf..c9e554213c545273d5e9941fe40cd0b2c79cf58c 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot @@ -22,7 +22,7 @@ Delete Context Source Registration Subscription ${response}= Retrieve Context Source Registration Subscription ... ${subscription_id} ... context=${ngsild_test_suite_context} - Check SUT Not Containing Resource + Check SUT Not Containing Resource ${response.status_code} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/047_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/047_05.robot index 71cc885df14dbfa5a7407c9f4dc878dbf605800b..8b679d27cfa4304815e85a9a9ebdd4a8374a90f2 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/047_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/047_05.robot @@ -31,7 +31,10 @@ If A cSourceNotification Is Successfully Sent The Notification Member Shall Be U Wait for notification ${response}= Retrieve Context Source Registration Subscription ${subscription_id} @{expected_notification_additional_members}= Create List lastNotification lastSuccess - Check NotificationParams ${notification_expectation_file_path} ${expected_notification_additional_members} + Check NotificationParams + ... ${notification_expectation_file_path} + ... ${expected_notification_additional_members} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/047_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/047_06.robot index 7e321bf0b9e89832930dc5a9df885f2f341c3945..a497ee9546600c6e864ba937e78bfaac8b704d10 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/047_06.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/NotificationBehaviour/047_06.robot @@ -31,7 +31,10 @@ If A cSourceNotification Is Not Successfully Sent The Notification Member Shall Wait for no notification ${response}= Retrieve Context Source Registration Subscription ${subscription_id} @{expected_notification_additional_members}= Create List lastNotification lastFailure - Check NotificationParams ${notification_expectation_file_path} ${expected_notification_additional_members} + Check NotificationParams + ... ${notification_expectation_file_path} + ... ${expected_notification_additional_members} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot index d245dd819398865f33ce94fb8efaefbf78594c07..d5ee16d8d6cfeb5e616bf8c85637782d13e3e2d2 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_01.robot @@ -26,6 +26,7 @@ Query Context Source Registration Subscriptions Check Response Body Containing List Containing Subscription elements ... ${expectation_file_path} ... ${subscription_ids} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot index 1d1331d694d532b8c2068018f4dd12d423d4c22d..64c0a02702386ad63206328afeefda9f67e8f94e 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_02.robot @@ -38,7 +38,10 @@ Query Context Source Registration Subscriptions With Limit Parameter ... context=${ngsild_test_suite_context} ... limit=${limit} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Number Of Entities Subscription ${expectation_subscription_number} + Check Response Body Containing Number Of Entities + ... Subscription + ... ${expectation_subscription_number} + ... ${response.json()} Setup Initial Context Source Registration Subscriptions ${first_subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot index 5cbac8894e4a1e241b2fdd1628d08064850dd3f2..f435b3ab65d38d0bf0c9599a5b6dc4a08a00e1bd 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/QueryContextSourceRegistrationSubscriptions/041_03.robot @@ -38,8 +38,11 @@ Query Context Source Registration Subscriptions With Limit And Page Parameters ... limit=${limit} ... page=${page} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Number Of Entities Subscription ${expectation_subscription_number} - Check Pagination Prev And Next Headers ${prev_link} ${next_link} + Check Response Body Containing Number Of Entities + ... Subscription + ... ${expectation_subscription_number} + ... ${response.json()} + Check Pagination Prev And Next Headers ${prev_link} ${next_link} ${response.json()} Setup Initial Context Source Registration Subscriptions ${first_subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot index 4990c31bb2df107bd8356be96a4c9b7863cde2e6..6f96204666bc64b1e10bd2ea9e2c6c3161121bec 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/RetrieveContextSourceRegistrationSubscription/040_01.robot @@ -23,7 +23,10 @@ Retrieve Context Source Registration Subscription ... ${subscription_id} ... context=${ngsild_test_suite_context} Check Response Status Code 200 ${response.status_code} - Check Response Body Containing Subscription element ${expectation_file_path} ${subscription_id} + Check Response Body Containing Subscription element + ... ${expectation_file_path} + ... ${subscription_id} + ... ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot index d3b9d6df76c6490aff22f7b36dcd4d3f105e5d30..7905fd7b9848c6188e67c282d02adf0aa16dab69 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot @@ -29,7 +29,7 @@ Update Context Source Registration Subscription ... ${subscription_id} ... context=${ngsild_test_suite_context} ... accept=${CONTENT_TYPE_LD_JSON} - Check Updated Resource Set To ${subscription} + Check Updated Resource Set To ${subscription} ${response.json()} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot index 1a21265273beebbd84df13dcbe3360a732c0a105..55869fc9e95e3f4ec32d3d388a8238a9a3b9aa95 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_05.robot @@ -29,7 +29,6 @@ Update Context Source Registration Subscription With Invalid JSON Fragment Check RL Response Body Containing ProblemDetails Element Containing Title Element ${response.json()} - *** Keywords *** Setup Initial Context Source Registration Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/libraries/assertionUtils.py b/libraries/assertionUtils.py index b9dde5a7f8cb103bc3292fdd2685a18df8ec1ef9..36fbf0d112a7b6d3460be61d47c988ac61dca750 100644 --- a/libraries/assertionUtils.py +++ b/libraries/assertionUtils.py @@ -1,5 +1,6 @@ from deepdiff import DeepDiff + def compare_dictionaries_ignoring_keys(expected, actual, exclude_regex_paths, group_by=None): """Function exposed as a keyword to compare two dictionaries :param expected: expected dictionary @@ -7,9 +8,10 @@ def compare_dictionaries_ignoring_keys(expected, actual, exclude_regex_paths, gr :param exclude_regex_paths: list of regex paths of keys to be ignored :param group_by: a key to group the results, useful for lists of results """ - res = {} + if group_by is not None: - res = DeepDiff(expected, actual, exclude_regex_paths=exclude_regex_paths, ignore_order=True, verbose_level=1, group_by=group_by) + res = DeepDiff(expected, actual, exclude_regex_paths=exclude_regex_paths, ignore_order=True, verbose_level=1, + group_by=group_by) else: res = DeepDiff(expected, actual, exclude_regex_paths=exclude_regex_paths, ignore_order=True, verbose_level=1) return res diff --git a/libraries/logUtils.py b/libraries/logUtils.py index 1de30abeed1f6908e368f960237ff399b73a68cd..dec7fef53c73ca2fdffd225949c4ef6d7e06d82b 100644 --- a/libraries/logUtils.py +++ b/libraries/logUtils.py @@ -9,7 +9,8 @@ from robot.api.deco import keyword @keyword(name="Output", tags=("I/O",)) def output(response, console=True): """*Request and response are output to terminal and file (in JSON).* - ``console``: If false, the JSON is not written to terminal. Default is true. + :param response: response to a request + :param console: If false, the JSON is not written to terminal. Default is true. """ try: diff --git a/resources/ApiUtils.resource b/resources/ApiUtils.resource index 863b2536572696e5e62e116cc2402558bc8635ae..da6ba285b090fae9d13d9a5c300df487f80b1d87 100755 --- a/resources/ApiUtils.resource +++ b/resources/ApiUtils.resource @@ -87,7 +87,6 @@ Query Entity ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -150,7 +149,6 @@ Query Entities ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -199,7 +197,6 @@ Retrieve Entity by Id ... Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json" END ${response}= GET url=${url}/${ENTITIES_ENDPOINT_PATH}${id} headers=${headers} expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -328,7 +325,6 @@ Retrieve Entity Types ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -348,7 +344,6 @@ Retrieve Entity Type ... url=${url}/${ENTITIES_TYPES_ENDPOINT_PATH}/${type} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -371,7 +366,6 @@ Retrieve Attributes ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -391,7 +385,6 @@ Retrieve Attribute ... url=${url}/${ATTRIBUTES_ENDPOINT_PATH}/${attribute_name} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -475,7 +468,6 @@ Create Temporal Representation Of Entity Selecting Content Type ... data=${file_content} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -633,7 +625,6 @@ Batch Create Entities ... json=@{entities_to_be_created} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -645,7 +636,6 @@ Batch Upsert Entities ... json=@{entities_to_be_upserted} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -657,7 +647,6 @@ Batch Update Entities ... json=@{entities_to_be_updated} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -669,7 +658,6 @@ Batch Delete Entities ... json=@{entities_ids_to_be_deleted} ... headers=${headers} ... expected_status=any - IF not ${teardown} Set Test Variable ${response} Output ${response} RETURN ${response} @@ -682,7 +670,6 @@ Request Entity From File ... data=${file_content} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -696,7 +683,6 @@ Batch Request Entities From File ... data=${file_content} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -757,7 +743,6 @@ Retrieve Temporal Representation Of Entity ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -826,7 +811,6 @@ Query Temporal Representation Of Entities ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -843,7 +827,6 @@ Query Temporal Representation Of Entities Via Post ... json=${query_payload} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -865,7 +848,6 @@ Create Context Source Registration ... json=${context_source_registration_payload} ... headers=${headers} ... expected_status=any - Set Suite Variable ${response} Output ${response} RETURN ${response} @@ -876,7 +858,6 @@ Update Context Source Registration ... url=${url}/${CONTEXT_SOURCE_REGISTRATION_ENDPOINT_PATH}/${context_source_registration_id} ... json=${update_fragment} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -937,7 +918,6 @@ Query Context Source Registrations ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -945,7 +925,6 @@ Delete Context Source Registration [Arguments] ${context_source_registration_id} ${response}= DELETE url=${url}/${CONTEXT_SOURCE_REGISTRATION_ENDPOINT_PATH}/${context_source_registration_id} - Set Suite Variable ${response} Output ${response} RETURN ${response} @@ -963,7 +942,6 @@ Retrieve Context Source Registration ... url=${url}/${CONTEXT_SOURCE_REGISTRATION_ENDPOINT_PATH}/${context_source_registration_id} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -979,7 +957,6 @@ Create Context Source Registration Subscription ... json=${subscription_payload} ... headers=${headers} ... expected_status=any - Set Suite Variable ${response} Output ${response} RETURN ${response} @@ -990,7 +967,6 @@ Update Context Source Registration Subscription ... url=${url}/${CONTEXT_SOURCE_REGISTRATION_SUBSCRIPTION_ENDPOINT_PATH}/${subscription_id} ... json=${subscription_update_fragment} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -1008,7 +984,6 @@ Retrieve Context Source Registration Subscription ... url=${url}/${CONTEXT_SOURCE_REGISTRATION_SUBSCRIPTION_ENDPOINT_PATH}/${subscription_id} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -1031,7 +1006,6 @@ Query Context Source Registration Subscriptions ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -1039,7 +1013,6 @@ Delete Context Source Registration Subscription [Arguments] ${subscription_id} ${response}= DELETE ${url}/${CONTEXT_SOURCE_REGISTRATION_SUBSCRIPTION_ENDPOINT_PATH}/${subscription_id} - Set Suite Variable ${response} Output ${response} RETURN ${response} @@ -1050,7 +1023,6 @@ Update Context Source Registration Subscription From File ... url=${url}/${CONTEXT_SOURCE_REGISTRATION_SUBSCRIPTION_ENDPOINT_PATH}/${subscription_id} ... data=${file_content} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -1112,7 +1084,6 @@ Create Subscription From File ... data=${file_content} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -1138,7 +1109,6 @@ Update Subscription ... json=${subscription_update_fragment} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -1158,14 +1128,12 @@ Update Subscription With Payload ... json=${payload} ... headers=${headers} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} Delete Subscription [Arguments] ${subscription_id} ${response}= DELETE url=${url}/${SUBSCRIPTION_ENDPOINT_PATH}${subscription_id} expected_status=any - Set Suite Variable ${response} Output ${response} RETURN ${response} @@ -1190,7 +1158,6 @@ Query Subscriptions ... headers=${headers} ... params=${params} ... expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} @@ -1208,7 +1175,6 @@ Retrieve Subscription END ${response}= GET url=${url}/${SUBSCRIPTION_ENDPOINT_PATH}${id} headers=${headers} expected_status=any - Set Test Variable ${response} Output ${response} RETURN ${response} diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 8692bdca195d718d7313892bb708c1d9dfa9a769..c6dd0a8978806388d8f5620a2b8742e2c6d0fe13 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -21,18 +21,9 @@ Check Response Status Code ${response_status_code}= convert to string ${response_status_code} Should Be Equal ${expected_status_code} ${response_status_code} -Check Response Status Code Set To - [Arguments] ${expected_status} - ${response_status}= convert to string ${response['status']} - Should Be Equal ${response_status} ${expected_status} - -Check RL Response Status Code Set To - [Arguments] ${expected_status} - Status Should Be ${expected_status} ${response} - Check Response Body Containing Array Of URIs set to - [Arguments] @{expected_entities_ids} - Lists Should Be Equal ${expected_entities_ids} ${response.json()} ignore_order=True + [Arguments] ${expected_entities_ids} ${response_body} + 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} @@ -45,22 +36,22 @@ Check Response Body Content Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Headers Containing Content-Type set to - [Arguments] ${response} ${expected_content_type_content} - Should Be Equal ${response['Content-Type']} ${expected_content_type_content} + [Arguments] ${expected_content_type_content} ${response_headers} + Should Be Equal ${response_headers['Content-Type']} ${expected_content_type_content} Check Response Headers Link Not Empty - [Arguments] ${response} - Should Not Be Empty ${response['Link']} + [Arguments] ${response_headers} + Should Not Be Empty ${response_headers['Link']} # Since Http headers names are case-insensitive (from Http specification) # We check both Location and location headers Check Response Headers Containing URI set to - [Arguments] ${expected_entity_id} ${response} + [Arguments] ${expected_entity_id} ${response_headers} - IF 'Location' in ${response} + IF 'Location' in ${response_headers} Should Contain - ... ${response['Location']} + ... ${response_headers['Location']} ... ${expected_entity_id} ... ignore_order=True END @@ -69,32 +60,32 @@ Check Response Headers Containing URI set to # We check both Location and location headers Check Response Headers ID Not Empty - [Arguments] ${response} + [Arguments] ${response_headers} ${location_header}= Set Variable If - ... 'Location' in ${response} - ... ${response['Location']} + ... 'Location' in ${response_headers} + ... ${response_headers['Location']} ${id}= Fetch From Right ${location_header} / Should Not Be Empty ${id} RETURN ${id} Check Response Body Containing an Attribute set to - [Arguments] ${expected_attribute_name} ${expected_attribute_value}=${EMPTY} - Should Not Be Empty ${response.json()['${expected_attribute_name}']} + [Arguments] ${expected_attribute_name} ${response_body} ${expected_attribute_value}=${EMPTY} + Should Not Be Empty ${response_body['${expected_attribute_name}']} IF '${expected_attribute_value}'!='' - Should Be Equal ${response.json()['${expected_attribute_name}']} ${expected_attribute_value} + Should Be Equal ${response_body['${expected_attribute_name}']} ${expected_attribute_value} END Check Response Body Containing Batch Operation Result - [Arguments] ${expected_batch_operation_result} + [Arguments] ${expected_batch_operation_result} ${response_body} @{expected_successful_entities_ids}= Get From Dictionary ${expected_batch_operation_result} success @{expected_failed_entities_ids}= Get From Dictionary ${expected_batch_operation_result} errors - @{response_errors}= Get From Dictionary ${response.json()} errors + @{response_errors}= Get From Dictionary ${response_body} errors ${expected_failed_entities_ids_length}= Get Length ${expected_failed_entities_ids} ${response_errors_length}= Get Length ${response_errors} - Lists Should Be Equal ${expected_successful_entities_ids} ${response.json()['success']} ignore_order=True + Lists Should Be Equal ${expected_successful_entities_ids} ${response_body['success']} ignore_order=True Should be Equal as Integers ${expected_failed_entities_ids_length} ${response_errors_length} FOR ${response_error} IN @{response_errors} List Should Contain Value ${expected_failed_entities_ids} ${response_error['entityId']} @@ -137,7 +128,7 @@ Check Response Body Containing List Containing Entity Elements With Different Ty Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing EntityTemporal element - [Arguments] ${filename} ${temporal_entity_representation_id} + [Arguments] ${filename} ${temporal_entity_representation_id} ${response_body} ${temporal_entity_representation_payload}= Load JSON From File ... ${EXECDIR}/data/temporalEntities/expectations/${filename} ${temporal_entity_representation}= Update Value To JSON @@ -146,12 +137,12 @@ Check Response Body Containing EntityTemporal element ... ${temporal_entity_representation_id} ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${temporal_entity_representation} - ... ${response.json()} + ... ${response_body} ... ${instance_id_regex_expr} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing List Containing EntityTemporal elements - [Arguments] ${filename} ${temporal_entities_representation_ids} + [Arguments] ${filename} ${temporal_entities_representation_ids} ${response_body} ${temporal_entities_representation_payload}= Load JSON From File ... ${EXECDIR}/data/temporalEntities/expectations/${filename} ${index}= Set Variable 0 @@ -164,24 +155,24 @@ Check Response Body Containing List Containing EntityTemporal elements END ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${temporal_entities_representation_payload} - ... ${response.json()} + ... ${response_body} ... ${instance_id_regex_expr} ... group_by=id Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing Subscription element - [Arguments] ${expectation_filename} ${subscription_id} + [Arguments] ${expectation_filename} ${subscription_id} ${response_body} ${subscription_payload}= Load JSON From File ${EXECDIR}/data/${expectation_filename} ${subscription}= Update Value To JSON ${subscription_payload} $..id ${subscription_id} ${ignored_keys}= Create List ${context_regex_expr} ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${subscription} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing List Containing Subscription elements - [Arguments] ${expectation_file_path} ${subscription_ids} + [Arguments] ${expectation_file_path} ${subscription_ids} ${response_body} ${subscription_payload}= Load JSON From File ${EXECDIR}/data/${expectation_file_path} ${index}= Set Variable 0 FOR ${subscription_id} IN @{subscription_ids} @@ -194,7 +185,7 @@ Check Response Body Containing List Containing Subscription elements ${ignored_keys}= Create List ${context_regex_expr} ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${subscription_payload} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} @@ -202,10 +193,10 @@ Check Response Body Containing List Containing Subscription elements # A check on the response body type is needed Check Response Body Containing Number Of Entities - [Arguments] ${expected_entity_type} ${expected_length} + [Arguments] ${expected_entity_type} ${expected_length} ${response_body} - ${response_body_length}= Get Length ${response.json()} - ${is_list}= Run Keyword Evaluate type(${response.json()})==list + ${response_body_length}= Get Length ${response_body} + ${is_list}= Run Keyword Evaluate type(${response_body})==list IF ${is_list} Should Be Equal ${response_body_length} ${expected_length} @@ -215,15 +206,15 @@ Check Response Body Containing Number Of Entities FOR ${index} IN RANGE ${expected_length} IF ${is_list} - Should Be Equal ${response.json()[${index}]['type']} ${expected_entity_type} + Should Be Equal ${response_body[${index}]['type']} ${expected_entity_type} END END IF ${is_list} is ${FALSE} - Should Be Equal ${response.json()['type']} ${expected_entity_type} + Should Be Equal ${response_body['type']} ${expected_entity_type} END Check Response Body Containing Context Source Registration element - [Arguments] ${expectation_filename} ${context_source_registration_id} + [Arguments] ${expectation_filename} ${context_source_registration_id} ${response_body} ${context_source_registration_payload}= Load JSON From File ${EXECDIR}/data/${expectation_filename} ${context_source_registration}= Update Value To JSON ... ${context_source_registration_payload} @@ -232,62 +223,62 @@ Check Response Body Containing Context Source Registration element ${ignored_keys}= Create List ${context_regex_expr} ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${context_source_registration} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing EntityTypeList element - [Arguments] ${expectation_filename} + [Arguments] ${expectation_filename} ${response_body} ${entity_type_list_payload}= Load JSON From File ${EXECDIR}/data/${expectation_filename} ${ignored_keys}= Create List ${id_regex_expr} ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${entity_type_list_payload} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing EntityType element - [Arguments] ${expectation_filename} + [Arguments] ${expectation_filename} ${response_body} ${entity_type_payload}= Load JSON From File ${EXECDIR}/data/${expectation_filename} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${entity_type_payload} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing EntityTypeInfo element - [Arguments] ${expectation_filename} + [Arguments] ${expectation_filename} ${response_body} ${entity_type_info_payload}= Load JSON From File ${EXECDIR}/data/${expectation_filename} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${entity_type_info_payload} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing AttributeList element - [Arguments] ${expectation_filename} + [Arguments] ${expectation_filename} ${response_body} ${attribute_list_payload}= Load JSON From File ${EXECDIR}/data/${expectation_filename} ${ignored_keys}= Create List ${id_regex_expr} ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${attribute_list_payload} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing Attribute element - [Arguments] ${expectation_filename} + [Arguments] ${expectation_filename} ${response_body} ${attribute_payload}= Load JSON From File ${EXECDIR}/data/${expectation_filename} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${attribute_payload} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Containing List Containing Context Source Registrations elements - [Arguments] ${expectation_file_path} ${expected_context_source_registrations_ids} + [Arguments] ${expectation_file_path} ${expected_context_source_registrations_ids} ${response_body} ${expected_context_source_registrations_payload}= Load JSON From File ... ${EXECDIR}/data/${expectation_file_path} ${index}= Set Variable 0 @@ -300,106 +291,108 @@ Check Response Body Containing List Containing Context Source Registrations elem END ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${expected_context_source_registrations_payload} - ... ${response.json()} + ... ${response_body} ... ${EMPTY} ... group_by=id Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Response Body Type When Using Session Request - [Arguments] ${response} ${type} - Should Be Equal ${response['type']} ${type} + [Arguments] ${response_body} ${type} + Should Be Equal ${response_body['type']} ${type} Check Response Body Containing ProblemDetails Element Containing Type Element set to - [Arguments] ${response} ${type} - Should Be Equal ${response['type']} ${type} + [Arguments] ${response_body} ${type} + Should Be Equal ${response_body['type']} ${type} Check Response Body Title When Using Session Request - [Arguments] ${response} - Should Not Be Empty ${response['title']} + [Arguments] ${response_body} + Should Not Be Empty ${response_body['title']} Check Response Body Containing ProblemDetails Element Containing Title Element - [Arguments] ${response} - Should Not Be Empty ${response['title']} + [Arguments] ${response_body} + Should Not Be Empty ${response_body['title']} Check RL Response Body Containing ProblemDetails Element Containing Type Element set to - [Arguments] ${response} ${type} - ${json_response_body}= Set Variable ${response} + [Arguments] ${response_body} ${type} + ${json_response_body}= Set Variable ${response_body} Should Be Equal ${json_response_body['type']} ${type} Check RL Response Body Containing ProblemDetails Element Containing Title Element - [Arguments] ${response} - ${json_response_body}= Set Variable ${response} + [Arguments] ${response_body} + ${json_response_body}= Set Variable ${response_body} Should Not Be Empty ${json_response_body['title']} Check JSON Value In Response Body - [Arguments] ${json_path_expr} ${value_to_check} - Should Be Equal As Strings ${response.json()${json_path_expr}} ${value_to_check} + [Arguments] ${json_path_expr} ${value_to_check} ${response_body} + Should Be Equal As Strings ${response_body${json_path_expr}} ${value_to_check} Check NotificationParams - [Arguments] ${filename} ${expected_additional_members} + [Arguments] ${filename} ${expected_additional_members} ${response_body} ${expected_notification}= Load JSON From File ${EXECDIR}/data/${filename} ${ignored_keys}= Create List ${notification_timestamps_regex_expr} ${notification_endpoint_uri_regex_expr} ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${expected_notification} - ... ${response.json()['notification']} + ... ${response_body['notification']} ... ${ignored_keys} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} FOR ${expected_additional_member} IN @{expected_additional_members} - Should Not Be Empty ${response.json()['notification']['${expected_additional_member}']} + Should Not Be Empty ${response_body['notification']['${expected_additional_member}']} END Check Pagination Prev And Next Headers - [Arguments] ${prev_link} ${next_link} + [Arguments] ${prev_link} ${next_link} ${response_headers} ${expected_links}= Create List ${prev_link} ${next_link} IF '${prev_link}'!='' and '${next_link}'!='' Lists Should Be Equal - ... ${response.headers['Link'].replace(" ", "").split(',')} + ... ${response_headers['Link'].replace(" ", "").split(',')} ... ${expected_links} ... ignore_order=True END IF '${prev_link}'!='' and '${next_link}'=='' - Should Be Equal ${response.headers['Link']} ${prev_link} + Should Be Equal ${response_headers['Link']} ${prev_link} END IF '${prev_link}'=='' and '${next_link}'!='' - Should Be Equal ${response.headers['Link']} ${next_link} + Should Be Equal ${response_headers['Link']} ${next_link} END Check Resource Set To - [Arguments] ${expected_resource} ${ignored_keys}=${None} ${group_by}=${None} + [Arguments] ${expected_resource} ${response_body} ${ignored_keys}=${None} ${group_by}=${None} ${comparison_result}= Compare Dictionaries Ignoring Keys ... ${expected_resource} - ... ${response.json()} + ... ${response_body} ... ${ignored_keys} ... ${group_by} Should Be Empty ${comparison_result} msg=${comparison_result.pretty()} Check Created Resource Set To - [Arguments] ${created_resource} ${ignored_keys}=${None} + [Arguments] ${created_resource} ${response_body} ${ignored_keys}=${None} - Check Resource Set To ${created_resource} ${ignored_keys} + Check Resource Set To ${created_resource} ${response_body} ${ignored_keys} Check Created Resources Set To - [Arguments] ${expected_resources} ${ignored_keys}=${None} + [Arguments] ${expected_resources} ${response_body} ${ignored_keys}=${None} - Check Resource Set To ${expected_resources} ${ignored_keys} group_by=id + Check Resource Set To ${expected_resources} ${response_body} ${ignored_keys} group_by=id Check Updated Resource Set To - [Arguments] ${updated_resource} ${ignored_keys}=${None} + [Arguments] ${updated_resource} ${response_body} ${ignored_keys}=${None} - Check Resource Set To ${updated_resource} ${ignored_keys} + Check Resource Set To ${updated_resource} ${response_body} ${ignored_keys} Check Updated Resources Set To - [Arguments] ${updated_resources} ${ignored_keys}=${None} + [Arguments] ${updated_resources} ${response_body} ${ignored_keys}=${None} - Check Resource Set To ${updated_resources} ${ignored_keys} group_by=id + Check Resource Set To ${updated_resources} ${response_body} ${ignored_keys} group_by=id Check SUT Not Containing Resource - ${response_status}= convert to string ${response.status_code} - Should Be Equal ${response_status} 404 + [Arguments] ${response_status} + ${response_status_string}= convert to string ${response_status} + Should Be Equal ${response_status_string} 404 Check SUT Not Containing Resources - Should Be Empty ${response.json()} + [Arguments] ${response_body} + Should Be Empty ${response_body} diff --git a/schemas/error_response.schema.json b/schemas/error_response.schema.json deleted file mode 100644 index 56b64635e1ac4479d684b0539d3ae1ecaa696d6e..0000000000000000000000000000000000000000 --- a/schemas/error_response.schema.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "required": [ - "detail", - "type", - "title" - ] -}