From f1bf71c23368208d26e81aea1a8315c79edb5f23 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Wed, 20 Jan 2021 14:59:46 +0100 Subject: [PATCH 1/2] feat: complete implementation of tps for create context source registration subscription --- .../032_01.robot | 2 ++ .../032_02.robot | 1 + .../032_03.robot | 5 ++++- .../032_04.robot | 5 ++++- .../032_05.robot | 4 +++- .../032_06.robot | 7 ++++++- .../032_07.robot | 2 ++ resources/ApiUtils.resource | 9 +++++++++ resources/AssertionUtils.resource | 3 ++- 9 files changed, 33 insertions(+), 5 deletions(-) diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_01.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_01.robot index d8865cd9..2e97d9dd 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_01.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_01.robot @@ -17,7 +17,9 @@ Create Context Source Registration Subscription [Tags] mandatory ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + Create Context Source Registration Subscription ${subscription_payload} + Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_02.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_02.robot index 4585d672..e5347ac4 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_02.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_02.robot @@ -22,6 +22,7 @@ Create Context Source Registration Subscription Without An Id ${subscription_id}= Fetch Id From Response Location Header Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} + Set Suite Variable ${subscription_id} *** Keywords *** diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_03.robot index 82b4f4ef..69c0c984 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_03.robot @@ -17,10 +17,13 @@ Create Context Source Registration Subscription Without isActive Member [Tags] mandatory ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + Create Context Source Registration Subscription ${subscription_payload} + Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} - # TODO: Retrieve context source registration subscription and check status set to active + Retrieve context source registration subscription ${subscription_id} + Check Response Body Containing an Attribute set to isActive true *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_04.robot index 4ee7e5d8..e1aaa026 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_04.robot @@ -17,10 +17,13 @@ Create Inactive Context Source Registration Subscription [Tags] mandatory ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + Create Context Source Registration Subscription ${subscription_payload} + Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} - # TODO: Retrieve context source registration subscription and check status set to paused + Retrieve context source registration subscription ${subscription_id} + Check Response Body Containing an Attribute set to isActive false *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_05.robot index 2ac840e9..296baece 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_05.robot @@ -25,7 +25,9 @@ Create Context Source Registration Subscription With expiresAt Member Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} - # TODO: Retrieve context source registration subscription after 10 secs and check status set to expired + Sleep 15s + Retrieve context source registration subscription ${subscription_id} + Check Response Body Containing an Attribute set to isActive false *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_06.robot index 7cca66d0..df5f6db2 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_06.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_06.robot @@ -17,10 +17,15 @@ Create Context Source Registration Subscription Without expiresAt Member [Tags] mandatory ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + Create Context Source Registration Subscription ${subscription_payload} + Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} - # TODO: How to check that the context source registration subscription status will be always set to active ? + # Let's say if the subscription stills active after 10s it will be considered as perpetual, but this is not enough + Sleep 10s + Retrieve context source registration subscription ${subscription_id} + Check Response Body Containing an Attribute set to isActive true *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_07.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_07.robot index 4d1b9db8..11d1ab96 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_07.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_07.robot @@ -17,7 +17,9 @@ Create Existing Context Source Registration Subscription [Tags] mandatory ${subscription_payload}= Load Test Sample ${subscription_payload_file_path} ${subscription_id} + Create Context Source Registration Subscription ${subscription_payload} + Check Response Status Code Set To 409 Check Response Body Containing ProblemDetails Element Containing Type Element set to ${response} ${ERROR_TYPE_ALREADY_EXISTS} Check Response Body Containing ProblemDetails Element Containing Title Element ${response} diff --git a/resources/ApiUtils.resource b/resources/ApiUtils.resource index 0d06d1e8..45258587 100755 --- a/resources/ApiUtils.resource +++ b/resources/ApiUtils.resource @@ -330,6 +330,15 @@ Update Context Source Registration Subscription Set Test Variable ${response} +Retrieve Context Source Registration Subscription + [Arguments] ${subscription_id} + + ${response}= GET ${CONTEXT_SOURCE_REGISTRATION_SUBSCRIPTION_ENDPOINT_PATH}/${subscription_id} + Output request + Output response + + Set Test Variable ${response} + Delete Context Source Registration Subscription [Arguments] ${subscription_id} diff --git a/resources/AssertionUtils.resource b/resources/AssertionUtils.resource index b368ff36..f72d48f0 100755 --- a/resources/AssertionUtils.resource +++ b/resources/AssertionUtils.resource @@ -38,8 +38,9 @@ Check Response Headers Containing URI set to Should Be Equal ${expected_path}${expected_entity_id} ${response['headers']['location']} ignore_order=True Check Response Body Containing an Attribute set to - [Arguments] ${expected_attribute_name} + [Arguments] ${expected_attribute_name} ${expected_attribute_value}=${EMPTY} Should Not Be Empty ${response['body']['${expected_attribute_name}']} + Run Keyword If '${expected_attribute_value}'!='' Should Be Equal ${response['body']['${expected_attribute_name}']} ${expected_attribute_value} Check Response Body Details Containing Information Error [Arguments] ${expected_error_message} -- GitLab From e0b7f17f871aad58d5177795242353bed9a92814 Mon Sep 17 00:00:00 2001 From: Houcem Kacem Date: Wed, 20 Jan 2021 16:12:04 +0100 Subject: [PATCH 2/2] fix: check on subscription status rather than isActive member --- .../CreateContextSourceRegistrationSubscription/032_03.robot | 2 +- .../CreateContextSourceRegistrationSubscription/032_04.robot | 2 +- .../CreateContextSourceRegistrationSubscription/032_05.robot | 2 +- .../CreateContextSourceRegistrationSubscription/032_06.robot | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_03.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_03.robot index 69c0c984..bb635568 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_03.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_03.robot @@ -23,7 +23,7 @@ Create Context Source Registration Subscription Without isActive Member Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} Retrieve context source registration subscription ${subscription_id} - Check Response Body Containing an Attribute set to isActive true + Check Response Body Containing an Attribute set to status active *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_04.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_04.robot index e1aaa026..ee2c08b5 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_04.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_04.robot @@ -23,7 +23,7 @@ Create Inactive Context Source Registration Subscription Check Response Status Code Set To 201 Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} Retrieve context source registration subscription ${subscription_id} - Check Response Body Containing an Attribute set to isActive false + Check Response Body Containing an Attribute set to status paused *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_05.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_05.robot index 296baece..4bb7737a 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_05.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_05.robot @@ -27,7 +27,7 @@ Create Context Source Registration Subscription With expiresAt Member Check Response Headers Containing URI set to ${request['path']}/ ${subscription_id} ${response} Sleep 15s Retrieve context source registration subscription ${subscription_id} - Check Response Body Containing an Attribute set to isActive false + Check Response Body Containing an Attribute set to status expired *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions diff --git a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_06.robot b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_06.robot index df5f6db2..e6c70610 100644 --- a/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_06.robot +++ b/TP/NGSI-LD/ContextSource/RegistrationSubscription/CreateContextSourceRegistrationSubscription/032_06.robot @@ -25,7 +25,7 @@ Create Context Source Registration Subscription Without expiresAt Member # Let's say if the subscription stills active after 10s it will be considered as perpetual, but this is not enough Sleep 10s Retrieve context source registration subscription ${subscription_id} - Check Response Body Containing an Attribute set to isActive true + Check Response Body Containing an Attribute set to status active *** Keywords *** Generate Random Ids For Context Source Registration Subscriptions -- GitLab