From b95d725743944998f12cb0c804384bcac4ef7378 Mon Sep 17 00:00:00 2001
From: Houcem Kacem <houcem.kacem@eglobalmark.com>
Date: Mon, 22 Mar 2021 10:45:46 +0100
Subject: [PATCH] fix: fix request parameters for check on batch entities

---
 .../BatchEntities/CreateBatchOfEntities/003_01.robot          | 3 ++-
 .../BatchEntities/CreateBatchOfEntities/003_02.robot          | 4 +++-
 .../BatchEntities/DeleteBatchOfEntities/006_01.robot          | 4 +++-
 .../BatchEntities/DeleteBatchOfEntities/006_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          | 4 ++--
 .../BatchEntities/UpsertBatchOfEntities/004_02.robot          | 3 ++-
 .../BatchEntities/UpsertBatchOfEntities/004_03.robot          | 3 ++-
 .../BatchEntities/UpsertBatchOfEntities/004_04.robot          | 3 ++-
 .../BatchEntities/UpsertBatchOfEntities/004_05.robot          | 4 ++--
 12 files changed, 27 insertions(+), 14 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 4de7f40a..7da5ac0c 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 c7b24622..aa31e1fc 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 f2f36c0e..d5ff2372 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 7bd1b04f..c31a415a 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 8f176978..df1dc42d 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 1fc9498c..e16007bc 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 c274b8be..d5c1c91e 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 710f4c13..c385d7a5 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 3c643b81..0272920d 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 16a632e2..0e16528c 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 43bcedfb..ebaa3ce3 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 91426f04..dd6b8727 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}
 
-- 
GitLab