From 58efce9f2d139971c7d2a4177ef96f7ee3570b64 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 14:04:07 +0100 Subject: [PATCH 1/4] wip --- .../DeleteContextSourceRegistrationSubscription/042_01.robot | 3 +++ resources/AssertionUtils.resource | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot index e422665c..4d3af56b 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot @@ -19,6 +19,9 @@ Delete Context Source Registration Subscription Check Response Status Code Set To 204 + Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} + Check SUT Not Containing Entity + *** Keywords *** Setup Initial Context Source Registration Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 068f9a86..91841966 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -303,8 +303,6 @@ Check Created Entities Set To Check Updated Entities Set To [Arguments] ${updated_entities} - log ${updated_entities} - log ${response['body']} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_entities} ${ignored_keys} Should Be True ${comparison_result} msg=Updated Entities Comparison Failed -- GitLab From 6c21bf0a3009db8e78f7be3776c138c4bc00109e Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 14:52:33 +0100 Subject: [PATCH 2/4] feat: add checks on modifications made in the CB for CSRS --- .../Provision/Entities/DeleteEntity/002_01.robot | 4 ++-- .../038_01.robot | 6 ++++++ .../038_02.robot | 7 +++++++ .../039_01.robot | 9 +++++++++ .../fragments/subscription-active-sample.json | 3 +++ resources/ApiUtils.resource | 3 ++- resources/AssertionUtils.resource | 11 +++++++++++ 7 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 data/csourceSubscriptions/fragments/subscription-active-sample.json 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 0425b968..1a08aae2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot @@ -19,5 +19,5 @@ Delete an entity ${response}= Delete Entity by Id Returning Response ${entity_id} Check Response Status Code 204 ${response['status']} - Query Entities ${entity_id} Building context=${ngsild_test_suite_context} - Check SUT Not Containing Entities + Retrieve Entity by Id ${entity_id} context=${ngsild_test_suite_context} + Check SUT Not Containing Entity diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot index 2e97d9dd..0a9b1e58 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot @@ -10,6 +10,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variable *** ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${active_status_fragment_file_path}= csourceSubscriptions/fragments/subscription-active-sample.json *** Test Case *** Create Context Source Registration Subscription @@ -23,6 +24,11 @@ Create Context Source Registration Subscription Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} + ${active_status_fragment}= Load Test Sample ${active_status_fragment_file_path} + ${created_subscription_payload}= Upsert Element In Entity ${subscription_payload} ${active_status_fragment} $ + Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=application/ld+json + Check Created Entity Set To ${created_subscription_payload} + *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions # TODO: Refactor Generate Random Entity Id to Generate Random Test Sample Id diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot index e5347ac4..336d8f59 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot @@ -9,6 +9,7 @@ Suite Teardown Delete Created Context Source Registration Subscriptions *** Variable *** ${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld +${active_status_fragment_file_path}= csourceSubscriptions/fragments/subscription-active-sample.json *** Test Case *** Create Context Source Registration Subscription Without An Id @@ -25,6 +26,12 @@ Create Context Source Registration Subscription Without An Id Set Suite Variable ${subscription_id} + ${active_status_fragment}= Load Test Sample ${active_status_fragment_file_path} + ${subscription_payload_with_id}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + ${created_subscription_payload}= Upsert Element In Entity ${subscription_payload_with_id} ${active_status_fragment} $ + Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=application/ld+json + Check Created Entity Set To ${created_subscription_payload} + *** Keywords *** Delete Created Context Source Registration Subscriptions Delete Context Source Registration Subscription ${subscription_id} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot index c72a111c..4cf13c9e 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot @@ -11,6 +11,7 @@ Suite Teardown Delete Initial Context Source Registration Subscriptions ${subscription_id_prefix}= urn:ngsi-ld:Subscription: ${subscription_payload_file_path}= csourceSubscriptions/subscription-sample.jsonld ${subscription_update_fragment_file_path}= csourceSubscriptions/fragments/subscription-update-sample.json +${active_status_fragment_file_path}= csourceSubscriptions/fragments/subscription-active-sample.json *** Test Case *** Update Context Source Registration Subscription @@ -22,6 +23,13 @@ Update Context Source Registration Subscription Check Response Status Code Set To 204 + ${subscription}= Upsert Element In Entity ${subscription_payload} ${subscription_update_fragment} $ + ${active_status_fragment}= Load Test Sample ${active_status_fragment_file_path} + ${updated_susbcription}= Upsert Element In Entity ${subscription} ${active_status_fragment} $ + Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=application/ld+json + Check Updated Entity Set To ${updated_susbcription} + + *** Keywords *** Setup Initial Context Source Registration Subscriptions ${subscription_id}= Generate Random Entity Id ${subscription_id_prefix} @@ -30,6 +38,7 @@ Setup Initial Context Source Registration Subscriptions Create Context Source Registration Subscription ${subscription_payload} Set Suite Variable ${subscription_id} + Set Suite Variable ${subscription_payload} Delete Initial Context Source Registration Subscriptions Delete Context Source Registration Subscription ${subscription_id} diff --git a/data/csourceSubscriptions/fragments/subscription-active-sample.json b/data/csourceSubscriptions/fragments/subscription-active-sample.json new file mode 100644 index 00000000..649f707b --- /dev/null +++ b/data/csourceSubscriptions/fragments/subscription-active-sample.json @@ -0,0 +1,3 @@ +{ + "isActive": true +} \ No newline at end of file diff --git a/resources/ApiUtils.resource b/resources/ApiUtils.resource index f7a439f2..90a9349f 100755 --- a/resources/ApiUtils.resource +++ b/resources/ApiUtils.resource @@ -571,9 +571,10 @@ Update Context Source Registration Subscription Set Test Variable ${response} Retrieve Context Source Registration Subscription - [Arguments] ${subscription_id} ${context}=${EMPTY} + [Arguments] ${subscription_id} ${context}=${EMPTY} ${accept}=${CONTENT_TYPE_JSON} &{headers}= Create Dictionary + Set To Dictionary ${headers} Accept ${accept} Run Keyword If '${context}'!='' Set To Dictionary ${headers} Link=<${context}>; rel="http://www.w3.org/ns/json-ld#context";type="application/ld+json" ${response}= GET ${CONTEXT_SOURCE_REGISTRATION_SUBSCRIPTION_ENDPOINT_PATH}/${subscription_id} headers=${headers} Output request diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 91841966..9e96d3b4 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -300,6 +300,13 @@ Check Created Entities Set To ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${created_entities} ${ignored_keys} Should Be True ${comparison_result} msg=Created Entities Comparison Failed +Check Updated Entity Set To + [Arguments] ${updated_entity} + log ${updated_entity} + ${ignored_keys}= Create List + ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_entity} ${ignored_keys} + Should Be True ${comparison_result} msg=Updated Entity Comparison Failed + Check Updated Entities Set To [Arguments] ${updated_entities} @@ -307,5 +314,9 @@ Check Updated Entities Set To ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_entities} ${ignored_keys} Should Be True ${comparison_result} msg=Updated Entities Comparison Failed +Check SUT Not Containing Entity + ${response_status}= convert to string ${response['status']} + Should Be Equal ${response_status} 404 + Check SUT Not Containing Entities Should Be Empty ${response['body']} -- GitLab From 97f88bb97e07532f0ec938e4a5846577f4a24f28 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 14:54:29 +0100 Subject: [PATCH 3/4] fix: remove unecessary log --- resources/AssertionUtils.resource | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 9e96d3b4..023bd2b4 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -302,7 +302,6 @@ Check Created Entities Set To Check Updated Entity Set To [Arguments] ${updated_entity} - log ${updated_entity} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_entity} ${ignored_keys} Should Be True ${comparison_result} msg=Updated Entity Comparison Failed -- GitLab From e83ef0f6b197921347e4383e6ccdebeaa40d46bb Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 15:40:09 +0100 Subject: [PATCH 4/4] refactor: rename keywords --- .../BatchEntities/CreateBatchOfEntities/003_01.robot | 2 +- .../BatchEntities/CreateBatchOfEntities/003_02.robot | 2 +- .../BatchEntities/DeleteBatchOfEntities/006_01.robot | 2 +- .../BatchEntities/DeleteBatchOfEntities/006_02.robot | 2 +- .../BatchEntities/UpdateBatchOfEntities/005_01.robot | 2 +- .../BatchEntities/UpdateBatchOfEntities/005_02.robot | 2 +- .../BatchEntities/UpdateBatchOfEntities/005_03.robot | 2 +- .../BatchEntities/UpsertBatchOfEntities/004_01.robot | 2 +- .../BatchEntities/UpsertBatchOfEntities/004_02.robot | 2 +- .../BatchEntities/UpsertBatchOfEntities/004_03.robot | 2 +- .../BatchEntities/UpsertBatchOfEntities/004_04.robot | 2 +- .../BatchEntities/UpsertBatchOfEntities/004_05.robot | 2 +- .../Provision/Entities/CreateEntity/001_01.robot | 2 +- .../Provision/Entities/DeleteEntity/002_01.robot | 2 +- .../038_01.robot | 2 +- .../038_02.robot | 2 +- .../042_01.robot | 2 +- .../039_01.robot | 2 +- resources/AssertionUtils.resource | 12 ++++++------ 19 files changed, 24 insertions(+), 24 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 028c3599..4de7f40a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot @@ -34,6 +34,6 @@ Batch Create Entity Scenarios 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 Entities Set To ${entities_to_be_created} + 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 1a7a5973..c7b24622 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot @@ -32,7 +32,7 @@ Create a batch of two valid entities and one invalid entity Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} @{created_entities}= Create List ${first_entity} ${second_entity} - Check Created Entities Set To ${created_entities} + 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/DeleteBatchOfEntities/006_01.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot index 4433b560..f2f36c0e 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 Set To 204 Query Entities ${entities_ids_to_be_deleted} Building context=${ngsild_test_suite_context} - Check SUT Not Containing Entities + Check SUT Not Containing Resources *** Keywords *** Setup Initial Entities 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 0d559ada..f4856a7a 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot @@ -26,7 +26,7 @@ Delete a batch of non existing and existing entities Check Response Body Containing Batch Operation Result ${expected_batch_operation_result} Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} - Check SUT Not Containing Entities + 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 f0215370..b4653040 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -39,7 +39,7 @@ 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} Query Entities ${entities_ids_to_be_updated} Building context=${ngsild_test_suite_context} - Check Updated Entities Set To ${updated_entities} + 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 fc27ef35..c4b15cad 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -39,7 +39,7 @@ 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} Query Entities ${entities_ids_to_be_updated} Building context=${ngsild_test_suite_context} - Check Updated Entities Set To ${updated_entities} + 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 9e734330..f6130d64 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -39,7 +39,7 @@ 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} Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} - Check Updated Entities Set To ${updated_entities} + 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 362634a2..710f4c13 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,6 @@ Batch Upsert Entity Scenarios Check Response Body Containing Array Of URIs set to @{expected_entities_ids} Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} - Check Updated Entities Set To ${entities_to_be_upserted} + 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 5b083c55..3c643b81 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot @@ -36,7 +36,7 @@ Batch Upsert Non-existing And Existing Entities Scenarios @{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} - Check Updated Entities Set To ${entities_to_be_upserted} + 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 3974abf6..16a632e2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -32,7 +32,7 @@ Batch Upsert Existing Entities Scenarios @{upserted_entities_ids}= Create List ${first_existing_entity_id} ${second_existing_entity_id} Query Entities ${upserted_entities_ids} Building context=${ngsild_test_suite_context} - Check Updated Entities Set To ${entities_to_be_upserted} + 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 1092a0b7..472296c6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot @@ -40,7 +40,7 @@ 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} Query Entities ${entities_ids_to_be_upserted} Building context=${ngsild_test_suite_context} - Check Updated Entities Set To ${updated_entities} + 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 b85cd6cb..91426f04 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,6 @@ Upsert a batch of two valid entities and one invalid entity Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} @{upserted_entities}= Create List ${first_entity} ${second_entity} - Check Updated Entities Set To ${upserted_entities} + Check Updated Resources Set To ${upserted_entities} 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 bcee2fcb..b35b351b 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot @@ -30,6 +30,6 @@ Create Entity Scenarios ${created_entity}= Load Test Sample entities/${filename} ${entity_id} Run Keyword If '${content_type}'=='application/json' Retrieve Entity by Id ${entity_id} ${content_type} Run Keyword If '${content_type}'=='application/ld+json' Retrieve Entity by Id ${entity_id} ${content_type} context=${ngsild_test_suite_context} - Check Created Entity Set To ${created_entity} + Check Created Resource Set To ${created_entity} [Teardown] Delete Entity by Id ${entity_id} \ No newline at end of file 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 1a08aae2..c7529b70 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot @@ -20,4 +20,4 @@ Delete an entity Check Response Status Code 204 ${response['status']} Retrieve Entity by Id ${entity_id} context=${ngsild_test_suite_context} - Check SUT Not Containing Entity + Check SUT Not Containing Resource diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot index 0a9b1e58..c02db3b7 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 ${active_status_fragment}= Load Test Sample ${active_status_fragment_file_path} ${created_subscription_payload}= Upsert Element In Entity ${subscription_payload} ${active_status_fragment} $ Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=application/ld+json - Check Created Entity Set To ${created_subscription_payload} + Check Created Resource Set To ${created_subscription_payload} *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot index 336d8f59..de6f38e0 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot @@ -30,7 +30,7 @@ Create Context Source Registration Subscription Without An Id ${subscription_payload_with_id}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} ${created_subscription_payload}= Upsert Element In Entity ${subscription_payload_with_id} ${active_status_fragment} $ Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=application/ld+json - Check Created Entity Set To ${created_subscription_payload} + Check Created Resource Set To ${created_subscription_payload} *** Keywords *** Delete Created Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot index 4d3af56b..53629a0f 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/DeleteContextSourceRegistrationSubscription/042_01.robot @@ -20,7 +20,7 @@ Delete Context Source Registration Subscription Check Response Status Code Set To 204 Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} - Check SUT Not Containing Entity + Check SUT Not Containing Resource *** Keywords *** Setup Initial Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot index 4cf13c9e..4e74fb9e 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot @@ -27,7 +27,7 @@ Update Context Source Registration Subscription ${active_status_fragment}= Load Test Sample ${active_status_fragment_file_path} ${updated_susbcription}= Upsert Element In Entity ${subscription} ${active_status_fragment} $ Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=application/ld+json - Check Updated Entity Set To ${updated_susbcription} + Check Updated Resource Set To ${updated_susbcription} *** Keywords *** diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 023bd2b4..703ddd26 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -286,36 +286,36 @@ Check Pagination Prev And Next Headers Run Keyword If '${prev_link}'!='' and '${next_link}'=='' Should Be Equal ${response['headers']['Link']} ${prev_link} Run Keyword If '${prev_link}'=='' and '${next_link}'!='' Should Be Equal ${response['headers']['Link']} ${next_link} -Check Created Entity Set To +Check Created Resource Set To [Arguments] ${created_entity} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${created_entity} ${ignored_keys} Should Be True ${comparison_result} msg=Created Entity Comparison Failed -Check Created Entities Set To +Check Created Resources Set To [Arguments] ${created_entities} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${created_entities} ${ignored_keys} Should Be True ${comparison_result} msg=Created Entities Comparison Failed -Check Updated Entity Set To +Check Updated Resource Set To [Arguments] ${updated_entity} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_entity} ${ignored_keys} Should Be True ${comparison_result} msg=Updated Entity Comparison Failed -Check Updated Entities Set To +Check Updated Resources Set To [Arguments] ${updated_entities} ${ignored_keys}= Create List ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_entities} ${ignored_keys} Should Be True ${comparison_result} msg=Updated Entities Comparison Failed -Check SUT Not Containing Entity +Check SUT Not Containing Resource ${response_status}= convert to string ${response['status']} Should Be Equal ${response_status} 404 -Check SUT Not Containing Entities +Check SUT Not Containing Resources Should Be Empty ${response['body']} -- GitLab