From 458b172f01ea9d2ef81983a12fa16a072ebb3cd5 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 10:09:21 +0100 Subject: [PATCH 01/11] feat: add checks on created updated and deleted entities --- .../CreateBatchOfEntities/003_01.robot | 3 +++ .../DeleteBatchOfEntities/006_01.robot | 3 +++ .../UpdateBatchOfEntities/005_01.robot | 25 +++++++++++++------ .../Entities/CreateEntity/001_01.robot | 5 ++++ .../Entities/DeleteEntity/002_01.robot | 3 +++ ...alityLevel-with-relationship-fragment.json | 12 +++++++++ .../fragmentEntities/empty-fragment.json | 3 +++ .../fragmentEntities/locatedAt-fragment.json | 6 +++++ resources/ApiUtils.resource | 2 ++ resources/AssertionUtils.resource | 17 +++++++++++++ resources/JsonUtils.resource | 6 +++++ 11 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 data/entities/fragmentEntities/airQualityLevel-with-relationship-fragment.json create mode 100644 data/entities/fragmentEntities/empty-fragment.json create mode 100644 data/entities/fragmentEntities/locatedAt-fragment.json 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 725fd77b..028c3599 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_01.robot @@ -33,4 +33,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 ${expected_entities_ids} Building context=${ngsild_test_suite_context} + Check Created Entities Set To ${entities_to_be_created} + Batch Delete Entities @{expected_entities_ids} 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 13652a23..4433b560 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_01.robot @@ -20,6 +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} + Check SUT Not Containing Entities + *** Keywords *** Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} 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 4ecd8679..f0215370 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -10,31 +10,42 @@ Suite Teardown Delete Initial Entities *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: +${entity_payload_filename}= building-simple-attributes-sample.jsonld -*** Test Cases *** FILENAME -EntityWithSimpleProperties building-simple-attributes-sample.jsonld -EntityWithSimpleRelationships building-relationship-sample.jsonld -EntityWithRelationshipsProperties building-relationship-of-property-sample.jsonld +*** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME +EntityWithSimpleProperties building-simple-attributes-sample.jsonld fragmentEntities/empty-fragment.json +EntityWithSimpleRelationships building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json +EntityWithRelationshipsProperties building-relationship-of-property-sample.jsonld fragmentEntities/airQualityLevel-with-relationship-fragment.json *** Keywords *** Batch Update Entity Scenarios - [Arguments] ${filename} + [Arguments] ${filename} ${update_fragment_filename} [Documentation] Check that you can update a batch of entities [Tags] mandatory ${first_entity}= Load Entity ${filename} ${first_entity_id} ${second_entity}= Load Entity ${filename} ${second_entity_id} + @{entities_ids_to_be_updated}= Create List ${first_entity_id} ${second_entity_id} @{entities_to_be_updated}= Create List ${first_entity} ${second_entity} Batch Update Entities @{entities_to_be_updated} Check Response Status Code Set To 204 + ${first_created_entity}= Load Test Sample entities/${entity_payload_filename} ${first_entity_id} + ${second_created_entity}= Load Test Sample entities/${entity_payload_filename} ${second_entity_id} + ${update_fragment}= Load Test Sample entities/${update_fragment_filename} + ${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} + Check Updated Entities Set To ${updated_entities} + Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-simple-attributes-sample.jsonld ${first_entity_id} - Create Entity building-simple-attributes-sample.jsonld ${second_entity_id} + Create Entity ${entity_payload_filename} ${first_entity_id} + Create Entity ${entity_payload_filename} ${second_entity_id} Set Suite Variable ${first_entity_id} Set Suite Variable ${second_entity_id} 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 7f4ed1cc..d4e2b10c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot @@ -27,4 +27,9 @@ Create Entity Scenarios Check Response Status Code 201 ${response['status']} Check Response Headers Containing URI set to ${request['path']} ${entity_id} ${response} + ${created_entity}= Load Test Sample entities/${filename} ${entity_id} + Run Keyword If '${content_type}'=='application/json' Query Entity ${entity_id} ${content_type} + Run Keyword If '${content_type}'=='application/ld+json' Query Entity ${entity_id} ${content_type} context=${ngsild_test_suite_context} + Check Created Entities 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 8254de9f..0425b968 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/DeleteEntity/002_01.robot @@ -18,3 +18,6 @@ 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 diff --git a/data/entities/fragmentEntities/airQualityLevel-with-relationship-fragment.json b/data/entities/fragmentEntities/airQualityLevel-with-relationship-fragment.json new file mode 100644 index 00000000..cbf121c3 --- /dev/null +++ b/data/entities/fragmentEntities/airQualityLevel-with-relationship-fragment.json @@ -0,0 +1,12 @@ +{ + "airQualityLevel": { + "type": "Property", + "value": 4, + "unitCode": "C62", + "observedAt": "2020-09-09T16:40:00.000Z", + "hasWeatherObserved": { + "type": "Relationship", + "object": "urn:ngsi-ld:Sensor:43a1af27-4aa7-44fe-bee9-fe76d56978a4" + } + } +} \ No newline at end of file diff --git a/data/entities/fragmentEntities/empty-fragment.json b/data/entities/fragmentEntities/empty-fragment.json new file mode 100644 index 00000000..0db3279e --- /dev/null +++ b/data/entities/fragmentEntities/empty-fragment.json @@ -0,0 +1,3 @@ +{ + +} diff --git a/data/entities/fragmentEntities/locatedAt-fragment.json b/data/entities/fragmentEntities/locatedAt-fragment.json new file mode 100644 index 00000000..c48f459a --- /dev/null +++ b/data/entities/fragmentEntities/locatedAt-fragment.json @@ -0,0 +1,6 @@ +{ + "locatedAt": { + "type": "Relationship", + "object": "urn:ngsi-ld:City:Paris" + } +} \ No newline at end of file diff --git a/resources/ApiUtils.resource b/resources/ApiUtils.resource index 74de3e93..f7a439f2 100755 --- a/resources/ApiUtils.resource +++ b/resources/ApiUtils.resource @@ -60,6 +60,7 @@ Query Entity ${response}= GET ${ENTITIES_ENDPOINT_PATH}${id} headers=${headers} query=${params} Output request Output response + Set Test Variable ${response} [return] ${response} Query Entities @@ -83,6 +84,7 @@ Query Entities ${response}= GET ${ENTITIES_ENDPOINT_PATH} headers=${headers} query=${params} Output request Output response + Set Test Variable ${response} [return] ${response} Query Entities Via POST diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index ba0f8ca2..34401419 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -285,3 +285,20 @@ Check Pagination Prev And Next Headers Run Keyword If '${prev_link}'!='' and '${next_link}'!='' Lists Should Be Equal ${response['headers']['Link']} ${expected_links} ignore_order=True 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 Entities 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 Entities 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 Entities + Should Be Empty ${response['body']} diff --git a/resources/JsonUtils.resource b/resources/JsonUtils.resource index 07767d1d..58db2b71 100644 --- a/resources/JsonUtils.resource +++ b/resources/JsonUtils.resource @@ -64,3 +64,9 @@ Create Batch Operation Result &{batch_operation_result}= Create Dictionary success=${success} errors=${errors} [return] &{batch_operation_result} + +Upsert Element In Entity + [Arguments] ${initial_entity} ${fragment} ${jsonPath} + + ${updated_entity}= Add Object To Json ${initial_entity} ${jsonPath} ${fragment} + [return] ${updated_entity} -- GitLab From dda53c574c8bfb397c7bc133b85a4bc448065c21 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 10:22:06 +0100 Subject: [PATCH 02/11] fix: use seperate keyword for created entity --- .../Provision/Entities/CreateEntity/001_01.robot | 6 +++--- resources/AssertionUtils.resource | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) 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 d4e2b10c..bcee2fcb 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_01.robot @@ -28,8 +28,8 @@ Create Entity Scenarios Check Response Headers Containing URI set to ${request['path']} ${entity_id} ${response} ${created_entity}= Load Test Sample entities/${filename} ${entity_id} - Run Keyword If '${content_type}'=='application/json' Query Entity ${entity_id} ${content_type} - Run Keyword If '${content_type}'=='application/ld+json' Query Entity ${entity_id} ${content_type} context=${ngsild_test_suite_context} - Check Created Entities Set To ${created_entity} + 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} [Teardown] Delete Entity by Id ${entity_id} \ No newline at end of file diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 34401419..91841966 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -286,6 +286,13 @@ 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 + [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 [Arguments] ${created_entities} -- GitLab From ee20b03b0e66b90b32fa4ed4c736af331792585e Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 10:43:16 +0100 Subject: [PATCH 03/11] feat: check persisted entities for batch upsert --- .../Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot | 3 +++ resources/AssertionUtils.resource | 2 ++ 2 files changed, 5 insertions(+) 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 d3f74612..362634a2 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_01.robot @@ -32,4 +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} + Query Entities ${expected_entities_ids} Building context=${ngsild_test_suite_context} + Check Updated Entities Set To ${entities_to_be_upserted} + Batch Delete Entities @{expected_entities_ids} diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 91841966..068f9a86 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -303,6 +303,8 @@ 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 27b04b3a8c344a98bcbfe53fa6fb4d084939673d Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 12:08:49 +0100 Subject: [PATCH 04/11] feat: add checks on modifications made in the CB for Batch Entities --- .../CreateBatchOfEntities/003_02.robot | 4 +++ .../DeleteBatchOfEntities/006_02.robot | 3 +++ .../UpdateBatchOfEntities/005_02.robot | 25 +++++++++++++----- .../UpdateBatchOfEntities/005_03.robot | 15 +++++++++-- .../UpsertBatchOfEntities/004_02.robot | 4 +++ .../UpsertBatchOfEntities/004_03.robot | 4 +++ .../UpsertBatchOfEntities/004_04.robot | 21 ++++++++++----- .../UpsertBatchOfEntities/004_05.robot | 4 +++ .../simple-attributes-fragment.json | 22 ++++++++++++++++ ...tes-relationship-of-property-fragment.json | 26 +++++++++++++++++++ 10 files changed, 113 insertions(+), 15 deletions(-) create mode 100644 data/entities/fragmentEntities/simple-attributes-fragment.json create mode 100644 data/entities/fragmentEntities/simple-attributes-relationship-of-property-fragment.json 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 bc248639..1a7a5973 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/CreateBatchOfEntities/003_02.robot @@ -30,6 +30,10 @@ 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} + @{created_entities}= Create List ${first_entity} ${second_entity} + Check Created Entities 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_02.robot b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot index 49246ae0..0d559ada 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot @@ -25,6 +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} + Check SUT Not Containing Entities + *** Keywords *** 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 45485a7d..fc27ef35 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -10,31 +10,42 @@ Suite Teardown Delete Initial Entities *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: +${entity_payload_filename}= building-simple-attributes-sample.jsonld -*** Test Cases *** FILENAME -EntityWithSimpleProperties building-simple-attributes-sample.jsonld -EntityWithSimpleRelationships building-relationship-sample.jsonld -EntityWithRelationshipsProperties building-relationship-of-property-sample.jsonld +*** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME +EntityWithSimpleProperties building-simple-attributes-sample.jsonld fragmentEntities/empty-fragment.json +EntityWithSimpleRelationships building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json +EntityWithRelationshipsProperties building-relationship-of-property-sample.jsonld fragmentEntities/empty-fragment.json *** Keywords *** Batch Update Entity With NoOverwrite Option Scenarios - [Arguments] ${filename} + [Arguments] ${filename} ${update_fragment_filename} [Documentation] Check that you can update a batch of entities with noOverwrite option [Tags] mandatory ${first_entity}= Load Entity ${filename} ${first_entity_id} ${second_entity}= Load Entity ${filename} ${second_entity_id} @{entities_to_be_updated}= Create List ${first_entity} ${second_entity} + @{entities_ids_to_be_updated}= Create List ${first_entity_id} ${second_entity_id} Batch Update Entities @{entities_to_be_updated} overwrite_option=noOverwrite Check Response Status Code Set To 204 + ${first_created_entity}= Load Test Sample entities/${entity_payload_filename} ${first_entity_id} + ${second_created_entity}= Load Test Sample entities/${entity_payload_filename} ${second_entity_id} + ${update_fragment}= Load Test Sample entities/${update_fragment_filename} + ${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} + Check Updated Entities Set To ${updated_entities} + Setup Initial Entities ${first_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-simple-attributes-sample.jsonld ${first_entity_id} - Create Entity building-simple-attributes-sample.jsonld ${second_entity_id} + Create Entity ${entity_payload_filename} ${first_entity_id} + Create Entity ${entity_payload_filename} ${second_entity_id} Set Suite Variable ${first_entity_id} Set Suite Variable ${second_entity_id} 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 6ea6ff51..9e734330 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -8,6 +8,8 @@ Suite Setup Setup Initial Entities *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: +${entity_payload_filename}= building-simple-attributes-sample.jsonld +${update_fragment_filename}= fragmentEntities/simple-attributes-relationship-of-property-fragment.json *** Test Case *** Update a batch of non existing and existing entities @@ -30,14 +32,23 @@ Update 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} + ${first_created_entity}= Load Test Sample entities/${entity_payload_filename} ${first_existing_entity_id} + ${second_created_entity}= Load Test Sample entities/${entity_payload_filename} ${second_existing_entity_id} + ${update_fragment}= Load Test Sample entities/${update_fragment_filename} + ${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} + Check Updated Entities Set To ${updated_entities} + Batch Delete Entities @{expected_successful_entities_ids} *** Keywords *** Setup Initial Entities ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-simple-attributes-sample.jsonld ${first_existing_entity_id} - Create Entity building-simple-attributes-sample.jsonld ${second_existing_entity_id} + Create Entity ${entity_payload_filename} ${first_existing_entity_id} + Create Entity ${entity_payload_filename} ${second_existing_entity_id} Set Suite Variable ${first_existing_entity_id} Set Suite Variable ${second_existing_entity_id} 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 6ec7f570..5b083c55 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_02.robot @@ -34,6 +34,10 @@ Batch Upsert Non-existing And Existing Entities Scenarios Check Response Status Code Set To 201 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} + Check Updated Entities 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 24fe2194..3974abf6 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_03.robot @@ -30,6 +30,10 @@ 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} + Check Updated Entities Set To ${entities_to_be_upserted} + Setup Initial Entities ${first_existing_entity_id}= Generate Random Entity Id ${building_id_prefix} ${second_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 e9baf486..1092a0b7 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot @@ -10,15 +10,16 @@ Suite Teardown Delete Initial Entities *** Variable *** ${building_id_prefix}= urn:ngsi-ld:Building: +${existing_entity_payload_filename}= building-minimal-sample.jsonld -*** Test Cases *** FILENAME -EntityWithSimpleProperties building-simple-attributes-sample.jsonld -EntityWithSimpleRelationships building-relationship-sample.jsonld -EntityWithRelationshipsProperties building-relationship-of-property-sample.jsonld +*** Test Cases *** FILENAME UPDATE_FRAGMENT_FILENAME +EntityWithSimpleProperties building-simple-attributes-sample.jsonld fragmentEntities/simple-attributes-fragment.json +EntityWithSimpleRelationships building-relationship-sample.jsonld fragmentEntities/locatedAt-fragment.json +EntityWithRelationshipsProperties building-relationship-of-property-sample.jsonld fragmentEntities/simple-attributes-relationship-of-property-fragment.json *** Keywords *** Batch Upsert Entities With Update Option Scenarios - [Arguments] ${filename} + [Arguments] ${filename} ${update_fragment_filename} [Documentation] Check that you can upsert a batch of entities with update option [Tags] mandatory @@ -26,6 +27,7 @@ Batch Upsert Entities With Update Option Scenarios ${new_entity}= Load Entity ${filename} ${new_entity_id} ${existing_entity}= Load Entity ${filename} ${existing_entity_id} @{entities_to_be_upserted}= Create List ${new_entity} ${existing_entity} + @{entities_ids_to_be_upserted}= Create List ${existing_entity_id} ${new_entity_id} Batch Upsert Entities @{entities_to_be_upserted} update_option=update @@ -33,12 +35,19 @@ Batch Upsert Entities With Update Option Scenarios Check Response Status Code Set To 201 Check Response Body Containing Array Of URIs set to @{expected_entities_ids} + ${old_entity}= Load Test Sample entities/${existing_entity_payload_filename} ${existing_entity_id} + ${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} + Check Updated Entities Set To ${updated_entities} + @{entities_ids_to_be_deleted}= Create List ${new_entity_id} Batch Delete Entities @{entities_ids_to_be_deleted} Setup Initial Entities ${existing_entity_id}= Generate Random Entity Id ${building_id_prefix} - Create Entity building-minimal-sample.jsonld ${existing_entity_id} + Create Entity ${existing_entity_payload_filename} ${existing_entity_id} Set Suite Variable ${existing_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 5bb07723..b85cd6cb 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_05.robot @@ -30,4 +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} + 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} + Batch Delete Entities @{expected_successful_entities_ids} diff --git a/data/entities/fragmentEntities/simple-attributes-fragment.json b/data/entities/fragmentEntities/simple-attributes-fragment.json new file mode 100644 index 00000000..d682a537 --- /dev/null +++ b/data/entities/fragmentEntities/simple-attributes-fragment.json @@ -0,0 +1,22 @@ +{ + "name":{ + "type":"Property", + "value":"Eiffel Tower" + }, + "subCategory":{ + "type":"Property", + "value":[ + "tourism" + ] + }, + "airQualityLevel":{ + "type":"Property", + "value":4, + "unitCode":"C62", + "observedAt":"2020-09-09T16:40:00.000Z" + }, + "almostFull":{ + "type":"Property", + "value":false + } +} \ No newline at end of file diff --git a/data/entities/fragmentEntities/simple-attributes-relationship-of-property-fragment.json b/data/entities/fragmentEntities/simple-attributes-relationship-of-property-fragment.json new file mode 100644 index 00000000..52660970 --- /dev/null +++ b/data/entities/fragmentEntities/simple-attributes-relationship-of-property-fragment.json @@ -0,0 +1,26 @@ +{ + "name":{ + "type":"Property", + "value":"Eiffel Tower" + }, + "subCategory":{ + "type":"Property", + "value":[ + "tourism" + ] + }, + "airQualityLevel":{ + "type":"Property", + "value":4, + "unitCode":"C62", + "observedAt":"2020-09-09T16:40:00.000Z", + "hasWeatherObserved":{ + "type":"Relationship", + "object":"urn:ngsi-ld:Sensor:43a1af27-4aa7-44fe-bee9-fe76d56978a4" + } + }, + "almostFull":{ + "type":"Property", + "value":false + } +} \ No newline at end of file -- GitLab From 58efce9f2d139971c7d2a4177ef96f7ee3570b64 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 14:04:07 +0100 Subject: [PATCH 05/11] 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 aa32a96642e0748516444eb24fad74a1fc132485 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 14:04:46 +0100 Subject: [PATCH 06/11] fix: remove unecessary log --- resources/AssertionUtils.resource | 2 -- 1 file changed, 2 deletions(-) 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 07/11] 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 08/11] 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 09/11] 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 From 9a0180d16d6990fb2f84619fe8fc61861e4d6b71 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Fri, 12 Mar 2021 16:56:21 +0100 Subject: [PATCH 10/11] fix: rename entity to resource --- .../DeleteBatchOfEntities/006_02.robot | 1 - resources/AssertionUtils.resource | 24 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) 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 f4856a7a..7bd1b04f 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/DeleteBatchOfEntities/006_02.robot @@ -28,7 +28,6 @@ Delete a batch of non existing and existing entities Query Entities ${expected_successful_entities_ids} Building context=${ngsild_test_suite_context} Check SUT Not Containing Resources - *** Keywords *** Setup Initial Entities ${existing_entity_id}= Generate Random Entity Id ${building_id_prefix} diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 703ddd26..663ba876 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -287,31 +287,31 @@ Check Pagination Prev And Next Headers Run Keyword If '${prev_link}'=='' and '${next_link}'!='' Should Be Equal ${response['headers']['Link']} ${next_link} Check Created Resource Set To - [Arguments] ${created_entity} + [Arguments] ${created_resource} ${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 + ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${created_resource} ${ignored_keys} + Should Be True ${comparison_result} msg=Created Resource Comparison Failed Check Created Resources Set To - [Arguments] ${created_entities} + [Arguments] ${created_resources} ${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 + ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${created_resources} ${ignored_keys} + Should Be True ${comparison_result} msg=Created Resources Comparison Failed Check Updated Resource Set To - [Arguments] ${updated_entity} + [Arguments] ${updated_resource} ${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 + ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_resource} ${ignored_keys} + Should Be True ${comparison_result} msg=Updated Resource Comparison Failed Check Updated Resources Set To - [Arguments] ${updated_entities} + [Arguments] ${updated_resources} ${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 + ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_resources} ${ignored_keys} + Should Be True ${comparison_result} msg=Updated Resources Comparison Failed Check SUT Not Containing Resource ${response_status}= convert to string ${response['status']} -- GitLab From 2b247967a88b61e9c0018df9c83390e11187ae5f Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Tue, 16 Mar 2021 10:18:50 +0100 Subject: [PATCH 11/11] refactor: refactor code --- .../UpdateBatchOfEntities/005_01.robot | 4 +-- .../UpdateBatchOfEntities/005_02.robot | 4 +-- .../UpdateBatchOfEntities/005_03.robot | 4 +-- .../UpsertBatchOfEntities/004_04.robot | 2 +- .../038_01.robot | 8 ++--- .../038_02.robot | 9 ++--- .../039_01.robot | 11 +++---- .../fragments/subscription-active-sample.json | 3 -- resources/AssertionUtils.resource | 33 +++++++++---------- resources/JsonUtils.resource | 2 +- 10 files changed, 34 insertions(+), 46 deletions(-) delete mode 100644 data/csourceSubscriptions/fragments/subscription-active-sample.json 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 b4653040..8f176978 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_01.robot @@ -35,8 +35,8 @@ Batch Update Entity Scenarios ${first_created_entity}= Load Test Sample entities/${entity_payload_filename} ${first_entity_id} ${second_created_entity}= Load Test Sample entities/${entity_payload_filename} ${second_entity_id} ${update_fragment}= Load Test Sample entities/${update_fragment_filename} - ${first_updated_entity}= Upsert Element In Entity ${first_created_entity} ${update_fragment} $ - ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} $ + ${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} Check Updated Resources Set To ${updated_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 c4b15cad..1fc9498c 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_02.robot @@ -35,8 +35,8 @@ Batch Update Entity With NoOverwrite Option Scenarios ${first_created_entity}= Load Test Sample entities/${entity_payload_filename} ${first_entity_id} ${second_created_entity}= Load Test Sample entities/${entity_payload_filename} ${second_entity_id} ${update_fragment}= Load Test Sample entities/${update_fragment_filename} - ${first_updated_entity}= Upsert Element In Entity ${first_created_entity} ${update_fragment} $ - ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} $ + ${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} Check Updated Resources Set To ${updated_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 f6130d64..c274b8be 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpdateBatchOfEntities/005_03.robot @@ -35,8 +35,8 @@ Update a batch of non existing and existing entities ${first_created_entity}= Load Test Sample entities/${entity_payload_filename} ${first_existing_entity_id} ${second_created_entity}= Load Test Sample entities/${entity_payload_filename} ${second_existing_entity_id} ${update_fragment}= Load Test Sample entities/${update_fragment_filename} - ${first_updated_entity}= Upsert Element In Entity ${first_created_entity} ${update_fragment} $ - ${second_updated_entity}= Upsert Element In Entity ${second_created_entity} ${update_fragment} $ + ${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} Check Updated Resources Set To ${updated_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 472296c6..43bcedfb 100644 --- a/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot +++ b/TP/NGSI-LD/ContextInformation/Provision/BatchEntities/UpsertBatchOfEntities/004_04.robot @@ -37,7 +37,7 @@ Batch Upsert Entities With Update Option Scenarios ${old_entity}= Load Test Sample entities/${existing_entity_payload_filename} ${existing_entity_id} ${update_fragment}= Load Test Sample entities/${update_fragment_filename} - ${old_updated_entity}= Upsert Element In Entity ${old_entity} ${update_fragment} $ + ${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 Resources Set To ${updated_entities} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot index c02db3b7..aeb55b3c 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_01.robot @@ -10,7 +10,6 @@ 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 @@ -24,10 +23,9 @@ 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 Resource Set To ${created_subscription_payload} + Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} + ${ignored_attributes}= Create List ${status_regex_expr} + Check Created Resource Set To ${subscription_payload} ${ignored_attributes} *** 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 de6f38e0..d7019a98 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/038_02.robot @@ -9,7 +9,6 @@ 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 @@ -26,11 +25,9 @@ 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 Resource Set To ${created_subscription_payload} + Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} + ${ignored_attributes}= Create List ${id_regex_expr} ${status_regex_expr} + Check Created Resource Set To ${subscription_payload} ${ignored_attributes} *** Keywords *** Delete Created 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 4e74fb9e..bca6b4d5 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/UpdateContextSourceRegistrationSubscription/039_01.robot @@ -11,7 +11,6 @@ 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 @@ -23,12 +22,10 @@ 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 Resource Set To ${updated_susbcription} - + ${subscription}= Upsert Element In Entity ${subscription_payload} ${subscription_update_fragment} + Retrieve Context Source Registration Subscription ${subscription_id} context=${ngsild_test_suite_context} accept=${CONTENT_TYPE_LD_JSON} + ${ignored_attributes}= Create List ${status_regex_expr} + Check Updated Resource Set To ${subscription} *** Keywords *** Setup Initial Context Source Registration Subscriptions diff --git a/data/csourceSubscriptions/fragments/subscription-active-sample.json b/data/csourceSubscriptions/fragments/subscription-active-sample.json deleted file mode 100644 index 649f707b..00000000 --- a/data/csourceSubscriptions/fragments/subscription-active-sample.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "isActive": true -} \ No newline at end of file diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index 663ba876..261fcd30 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -2,7 +2,7 @@ Library ${EXECDIR}/libraries/assertionUtils.py *** Variable *** -${id_regex_expr}= root\\['@context'\\] +${id_regex_expr}= root\\['id'\\] ${instance_id_regex_expr}= root\\[.*\\]\\['instanceId'\\] ${notification_timestamps_regex_expr}= root\\['last.*'\\] ${notification_endpoint_uri_regex_expr}= root\\['endpoint'\\]\\['uri'\\] @@ -286,32 +286,31 @@ 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 Resource Set To + [Arguments] ${resource} ${ignored_keys}=${None} ${error_message}=${EMPTY} + + ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${resource} ${ignored_keys} + Should Be True ${comparison_result} msg=${error_message} + Check Created Resource Set To - [Arguments] ${created_resource} + [Arguments] ${created_resource} ${ignored_keys}=${None} - ${ignored_keys}= Create List - ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${created_resource} ${ignored_keys} - Should Be True ${comparison_result} msg=Created Resource Comparison Failed + Check Resource Set To ${created_resource} ${ignored_keys} Created Resource Comparison Failed Check Created Resources Set To - [Arguments] ${created_resources} + [Arguments] ${created_resources} ${ignored_keys}=${None} - ${ignored_keys}= Create List - ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${created_resources} ${ignored_keys} - Should Be True ${comparison_result} msg=Created Resources Comparison Failed + Check Resource Set To ${created_resources} ${ignored_keys} Created Resources Comparison Failed Check Updated Resource Set To - [Arguments] ${updated_resource} - ${ignored_keys}= Create List - ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_resource} ${ignored_keys} - Should Be True ${comparison_result} msg=Updated Resource Comparison Failed + [Arguments] ${updated_resource} ${ignored_keys}=${None} + + Check Resource Set To ${updated_resource} ${ignored_keys} Updated Resource Comparison Failed Check Updated Resources Set To - [Arguments] ${updated_resources} + [Arguments] ${updated_resources} ${ignored_keys}=${None} - ${ignored_keys}= Create List - ${comparison_result}= Compare Dictionaries Ignoring Keys ${response['body']} ${updated_resources} ${ignored_keys} - Should Be True ${comparison_result} msg=Updated Resources Comparison Failed + Check Resource Set To ${updated_resources} ${ignored_keys} Updated Resources Comparison Failed Check SUT Not Containing Resource ${response_status}= convert to string ${response['status']} diff --git a/resources/JsonUtils.resource b/resources/JsonUtils.resource index 58db2b71..9d633d56 100644 --- a/resources/JsonUtils.resource +++ b/resources/JsonUtils.resource @@ -66,7 +66,7 @@ Create Batch Operation Result [return] &{batch_operation_result} Upsert Element In Entity - [Arguments] ${initial_entity} ${fragment} ${jsonPath} + [Arguments] ${initial_entity} ${fragment} ${jsonPath}=$ ${updated_entity}= Add Object To Json ${initial_entity} ${jsonPath} ${fragment} [return] ${updated_entity} -- GitLab