From 18016b657d82851d825297797b7d85a02e520a2c Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Mon, 22 Mar 2021 17:17:15 +0100 Subject: [PATCH] fix: fix batch entities tcs --- .../BatchEntities/CreateBatchOfEntities/003_01.robot | 8 +++++--- .../BatchEntities/CreateBatchOfEntities/003_02.robot | 4 ++-- .../BatchEntities/UpdateBatchOfEntities/005_01.robot | 3 ++- .../BatchEntities/UpdateBatchOfEntities/005_02.robot | 3 ++- .../BatchEntities/UpdateBatchOfEntities/005_03.robot | 3 ++- .../BatchEntities/UpsertBatchOfEntities/004_01.robot | 3 ++- .../BatchEntities/UpsertBatchOfEntities/004_02.robot | 3 ++- .../BatchEntities/UpsertBatchOfEntities/004_03.robot | 3 ++- .../BatchEntities/UpsertBatchOfEntities/004_04.robot | 3 ++- .../BatchEntities/UpsertBatchOfEntities/004_05.robot | 3 ++- 10 files changed, 23 insertions(+), 13 deletions(-) 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 7da5ac0c..314dd96c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot @@ -29,12 +29,14 @@ Batch Create Entity Scenarios Batch Create Entities @{entities_to_be_created} - ${expected_entities_ids}= Catenate SEPARATOR=, ${first_entity_id} ${second_entity_id} + @{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 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} - Check Created Resources Set To ${entities_to_be_created} + Query Entities ${entities_to_be_queried} Building context=${ngsild_test_suite_context} + ${ignored_keys}= Create List ${context_regex_expr} + Check Created Resources Set To ${entities_to_be_created} ${ignored_keys} 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 aa31e1fc..9d44a5ed 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot @@ -34,8 +34,8 @@ Create a batch of two valid entities and one invalid entity 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} - + ${ignored_keys}= Create List ${context_regex_expr} + Check Created Resources Set To ${created_entities} ${ignored_keys} @{entities_ids_to_be_deleted}= Create List ${first_entity_id} ${second_entity_id} ${existing_entity_id} Batch Delete Entities @{entities_ids_to_be_deleted} 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 df1dc42d..8d830ddd 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -40,7 +40,8 @@ Batch Update Entity Scenarios @{updated_entities}= Create List ${first_updated_entity} ${second_updated_entity} ${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} + ${ignored_keys}= Create List ${context_regex_expr} + Check Updated Resources Set To ${updated_entities} ${ignored_keys} 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 e16007bc..e6ca0b0c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -40,7 +40,8 @@ Batch Update Entity With NoOverwrite Option Scenarios @{updated_entities}= Create List ${first_updated_entity} ${second_updated_entity} ${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} + ${ignored_keys}= Create List ${context_regex_expr} + Check Updated Resources Set To ${updated_entities} ${ignored_keys} 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 d5c1c91e..98ae8198 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -40,7 +40,8 @@ Update a batch of non existing and existing entities @{updated_entities}= Create List ${first_updated_entity} ${second_updated_entity} ${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} + ${ignored_keys}= Create List ${context_regex_expr} + Check Updated Resources Set To ${updated_entities} ${ignored_keys} 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 c385d7a5..3f6f4480 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot @@ -33,6 +33,7 @@ Batch Upsert Entity Scenarios Check Response Body Containing Array Of URIs set to @{expected_entities_ids} ${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} + ${ignored_keys}= Create List ${context_regex_expr} + Check Updated Resources Set To ${entities_to_be_upserted} ${ignored_keys} 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 0272920d..bede8155 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot @@ -37,7 +37,8 @@ Batch Upsert Non-existing And Existing Entities Scenarios @{upserted_entities_ids}= Create List ${new_entity_id} ${first_existing_entity_id} ${second_existing_entity_id} ${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} + ${ignored_keys}= Create List ${context_regex_expr} + Check Updated Resources Set To ${entities_to_be_upserted} ${ignored_keys} @{entities_ids_to_be_deleted}= Create List ${new_entity_id} 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 0e16528c..d4ee1825 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -33,7 +33,8 @@ Batch Upsert Existing Entities Scenarios @{upserted_entities_ids}= Create List ${first_existing_entity_id} ${second_existing_entity_id} ${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} + ${ignored_keys}= Create List ${context_regex_expr} + Check Updated Resources Set To ${entities_to_be_upserted} ${ignored_keys} 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 ebaa3ce3..cc014f5a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot @@ -41,7 +41,8 @@ Batch Upsert Entities With Update Option Scenarios @{updated_entities}= Create List ${new_entity} ${old_updated_entity} ${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} + ${ignored_keys}= Create List ${context_regex_expr} + Check Updated Resources Set To ${updated_entities} ${ignored_keys} @{entities_ids_to_be_deleted}= Create List ${new_entity_id} 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 dd6b8727..6875bbae 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot @@ -32,6 +32,7 @@ Upsert a batch of two valid entities and one invalid entity ${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} + ${ignored_keys}= Create List ${context_regex_expr} + Check Updated Resources Set To ${upserted_entities} ${ignored_keys} Batch Delete Entities @{expected_successful_entities_ids} -- GitLab