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 4de7f40ab6f574ea953bb334a0860f34517dbec8..7da5ac0cf438809295811e6b6af38331961c8601 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot @@ -29,7 +29,8 @@ Batch Create Entity Scenarios Batch Create Entities @{entities_to_be_created} - @{expected_entities_ids}= Create List ${first_entity_id} ${second_entity_id} + ${expected_entities_ids}= Catenate SEPARATOR=, ${first_entity_id} ${second_entity_id} + Check Response Status Code Set To 201 Check Response Body Containing Array Of URIs set to @{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 c7b24622754bf35793af4950801975ca30d4d11d..aa31e1fc2c582d09b36609cae64bdd3946b19ae3 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,9 @@ Create a batch of two valid entities and one invalid entity Check Response Status Code Set To 207 Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} - Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} + ${expected_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} + + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} @{created_entities}= Create List ${first_entity} ${second_entity} Check Created Resources Set To ${created_entities} 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 f2f36c0e9b1f46ecaeb0f6db5a43d70ed35c273f..d5ff23726dcd7e2907092686645494059fcf49c2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot @@ -20,7 +20,9 @@ Delete a batch of entities Check Response Status Code Set To 204 - Query Entities ${entities_ids_to_be_deleted} Building context=${ngsild_test_suite_context} + ${expected_entities_ids}= Catenate SEPARATOR=, @{entities_ids_to_be_deleted} + + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} Check SUT Not Containing Resources *** 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 7bd1b04fedb6bbffb20f873a4bb5433038509b28..c31a415ab3cc3dbe6ac317f8e453a0997083cb34 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot @@ -25,7 +25,9 @@ Delete a batch of non existing and existing entities Check Response Status Code Set To 207 Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} - Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} + ${expected_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} + + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} Check SUT Not Containing Resources *** 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 8f176978bb1cb7b4b9fcaadea16988150157c08f..df1dc42dbf642c114a5b63c2f6281d339576ce47 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -38,7 +38,8 @@ Batch Update Entity Scenarios ${first_updated_entity}= Upsert Element In Entity ${first_created_entity} ${update_fragment} ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} @{updated_entities}= Create List ${first_updated_entity} ${second_updated_entity} - Query Entities ${entities_ids_to_be_updated} Building context=${ngsild_test_suite_context} + ${expected_entities_ids}= Catenate SEPARATOR=, @{entities_ids_to_be_updated} + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} Check Updated Resources Set To ${updated_entities} Setup Initial Entities 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 1fc9498c0ec7d8a700a86d4a74a05d1d94bd5178..e16007bcc77304141329192e551b38fb7cd705fa 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -38,7 +38,8 @@ Batch Update Entity With NoOverwrite Option Scenarios ${first_updated_entity}= Upsert Element In Entity ${first_created_entity} ${update_fragment} ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} @{updated_entities}= Create List ${first_updated_entity} ${second_updated_entity} - Query Entities ${entities_ids_to_be_updated} Building context=${ngsild_test_suite_context} + ${expected_entities_ids}= Catenate SEPARATOR=, @{entities_ids_to_be_updated} + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} Check Updated Resources Set To ${updated_entities} Setup Initial Entities 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 c274b8beab1433de1da141702db3601207cf34b9..d5c1c91eb2badc6f8a23637121ab67a448933bbd 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -38,7 +38,8 @@ Update a batch of non existing and existing entities ${first_updated_entity}= Upsert Element In Entity ${first_created_entity} ${update_fragment} ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} @{updated_entities}= Create List ${first_updated_entity} ${second_updated_entity} - Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} + ${expected_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} Check Updated Resources Set To ${updated_entities} 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 710f4c1386680e6cb7908eff78f049ca358cef5a..c385d7a51b00fed6cb018b20fdaf64847e014471 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot @@ -31,8 +31,8 @@ Batch Upsert Entity Scenarios @{expected_entities_ids}= Create List ${first_entity_id} ${second_entity_id} Check Response Status Code Set To 201 Check Response Body Containing Array Of URIs set to @{expected_entities_ids} - - Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} + ${expected_updated_entities_ids}= Catenate SEPARATOR=, @{expected_entities_ids} + Query Entities ${expected_updated_entities_ids} Building context=${ngsild_test_suite_context} Check Updated Resources Set To ${entities_to_be_upserted} 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 3c643b81c102c9a09c98bd5f2b75c70e143418cb..0272920d5a36a82016361f64bdd1e1820165196c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot @@ -35,7 +35,8 @@ Batch Upsert Non-existing And Existing Entities Scenarios Check Response Body Containing Array Of URIs set to @{expected_entities_ids} @{upserted_entities_ids}= Create List ${new_entity_id} ${first_existing_entity_id} ${second_existing_entity_id} - Query Entities ${upserted_entities_ids} Building context=${ngsild_test_suite_context} + ${expected_updated_entities_ids}= Catenate SEPARATOR=, @{upserted_entities_ids} + Query Entities ${expected_updated_entities_ids} Building context=${ngsild_test_suite_context} Check Updated Resources Set To ${entities_to_be_upserted} @{entities_ids_to_be_deleted}= Create List ${new_entity_id} 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 16a632e2184e2161f2a678b97dfbe9fc899a8b2d..0e16528ce87c70e74d103a07fc088028cb2444fe 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -31,7 +31,8 @@ Batch Upsert Existing Entities Scenarios Check Response Status Code Set To 204 @{upserted_entities_ids}= Create List ${first_existing_entity_id} ${second_existing_entity_id} - Query Entities ${upserted_entities_ids} Building context=${ngsild_test_suite_context} + ${expected_updated_entities_ids}= Catenate SEPARATOR=, @{upserted_entities_ids} + Query Entities ${expected_updated_entities_ids} Building context=${ngsild_test_suite_context} Check Updated Resources Set To ${entities_to_be_upserted} Setup Initial Entities 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 43bcedfb6e5729e3ce78438d401e2fdf367ec74d..ebaa3ce31fb16fe8c58b1487d43632ccd97eb7ae 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,8 @@ Batch Upsert Entities With Update Option Scenarios ${update_fragment}= Load Test Sample entities/${update_fragment_filename} ${old_updated_entity}= Upsert Element In Entity ${old_entity} ${update_fragment} @{updated_entities}= Create List ${new_entity} ${old_updated_entity} - Query Entities ${entities_ids_to_be_upserted} Building context=${ngsild_test_suite_context} + ${expected_updated_entities_ids}= Catenate SEPARATOR=, @{entities_ids_to_be_upserted} + Query Entities ${expected_updated_entities_ids} Building context=${ngsild_test_suite_context} Check Updated Resources Set To ${updated_entities} @{entities_ids_to_be_deleted}= Create List ${new_entity_id} 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 91426f048fa6099f564362677f5067efaeeabe17..dd6b8727749d671397829c54f9eab1f38635c909 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot @@ -29,8 +29,8 @@ Upsert a batch of two valid entities and one invalid entity &{expected_batch_operation_result}= Create Batch Operation Result ${expected_successful_entities_ids} ${expected_failed_entities_ids} Check Response Status Code Set To 207 Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} - - Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} + ${expected_updated_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} + Query Entities ${expected_updated_entities_ids} Building context=${ngsild_test_suite_context} @{upserted_entities}= Create List ${first_entity} ${second_entity} Check Updated Resources Set To ${upserted_entities}