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 314dd96ce61dcd282b58e50b65d88c5db0512ec8..21d1d9c3008f55fd768d2fb650a75c749c5e2606 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot @@ -35,8 +35,7 @@ Batch Create Entity Scenarios Check Response Status Code Set To 201 Check Response Body Containing Array Of URIs set to @{expected_entities_ids} - 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} + 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} 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 9d44a5edb254279b344b5b1156b913530a4159fb..db1815a6ae23515d6fe3c9610efc39d81497f3ce 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot @@ -32,10 +32,9 @@ Create a batch of two valid entities and one invalid entity ${expected_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} - Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} @{created_entities}= Create List ${first_entity} ${second_entity} - ${ignored_keys}= Create List ${context_regex_expr} - Check Created Resources Set To ${created_entities} ${ignored_keys} + Check Created Resources Set To ${created_entities} @{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 8d830ddda21425c9bda957bf30bfa3e84aad2f60..3ba418cda02ac7be75bb8c69f053fb172fd5fd49 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -39,9 +39,8 @@ Batch Update Entity Scenarios ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} @{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} - ${ignored_keys}= Create List ${context_regex_expr} - Check Updated Resources Set To ${updated_entities} ${ignored_keys} + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} + Check Updated Resources Set To ${updated_entities} 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 e6ca0b0cdf3761a863a5a59673725242d96ca9d9..ae7849d4239b0e9160d45fd22d6a436021cf9ea2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -39,9 +39,8 @@ Batch Update Entity With NoOverwrite Option Scenarios ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} @{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} - ${ignored_keys}= Create List ${context_regex_expr} - Check Updated Resources Set To ${updated_entities} ${ignored_keys} + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} + Check Updated Resources Set To ${updated_entities} 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 98ae819818793f299793d1971114947bae71eb61..713e4a8d0559d30bc36191196cc4cb01ef84da3a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -39,9 +39,8 @@ Update a batch of non existing and existing entities ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} @{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} - ${ignored_keys}= Create List ${context_regex_expr} - Check Updated Resources Set To ${updated_entities} ${ignored_keys} + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} + 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 3f6f448076c1cb37ad19bc39b53a08b97ffa6935..bfee149076dd28120e2ce372d6ceef1d7e2e5830 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot @@ -32,8 +32,7 @@ Batch Upsert Entity Scenarios Check Response Status Code Set To 201 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} - ${ignored_keys}= Create List ${context_regex_expr} - Check Updated Resources Set To ${entities_to_be_upserted} ${ignored_keys} + 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} 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 bede8155398f1b873428f4ef1d191808a9902b58..8a4953f6ca628e6bcf0aaa31aefb055a485c4805 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot @@ -36,9 +36,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} - ${ignored_keys}= Create List ${context_regex_expr} - Check Updated Resources Set To ${entities_to_be_upserted} ${ignored_keys} + 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} @{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 d4ee1825036e080c3eb92197743a84367c467f35..b7ea1c59fbe2b6e4f06712985cdc1ca2a706483e 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -32,9 +32,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} - ${ignored_keys}= Create List ${context_regex_expr} - Check Updated Resources Set To ${entities_to_be_upserted} ${ignored_keys} + 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} 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 cc014f5a0e6518a338e0004053139c9f6012f8c8..c453947238d68d95c62b29f611a27a772e073ffb 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot @@ -40,9 +40,8 @@ Batch Upsert Entities With Update Option Scenarios ${old_updated_entity}= Upsert Element In Entity ${old_entity} ${update_fragment} @{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} - ${ignored_keys}= Create List ${context_regex_expr} - Check Updated Resources Set To ${updated_entities} ${ignored_keys} + Query Entities ${expected_updated_entities_ids} Building context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} + Check Updated Resources Set To ${updated_entities} @{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 6875bbae021fead441914ade0fafccb228be21fa..c5fcf6d46b2658906ca06c8c9e9720c5f2842faf 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot @@ -30,9 +30,8 @@ Upsert 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} ${expected_updated_entities_ids}= Catenate SEPARATOR=, @{expected_successful_entities_ids} - Query Entities ${expected_updated_entities_ids} Building context=${ngsild_test_suite_context} + Query Entities ${expected_updated_entities_ids} Building context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} @{upserted_entities}= Create List ${first_entity} ${second_entity} - ${ignored_keys}= Create List ${context_regex_expr} - Check Updated Resources Set To ${upserted_entities} ${ignored_keys} + Check Updated Resources Set To ${upserted_entities} Batch Delete Entities @{expected_successful_entities_ids}