Add validation of recieved message and refactor code
Signed-off-by: Aleksandra Maciaga <aleksandra.maciaga@nokia.com>
Issue-ID: AAF-997
Change-Id: Idea7fba7cf33ff605c9f0980f82066b19559d29b
diff --git a/tests/aaf/certservice/resources/cert-service-keywords.robot b/tests/aaf/certservice/resources/cert-service-keywords.robot
index b40da52..5f25f0b 100644
--- a/tests/aaf/certservice/resources/cert-service-keywords.robot
+++ b/tests/aaf/certservice/resources/cert-service-keywords.robot
@@ -32,11 +32,40 @@
${resp}= Get Request ${http_session} ${path}
Should Be Equal As Strings ${resp.status_code} ${resp_code}
-Send Get Request with Header And Validate Response
- [Documentation] Send request to passed url and validate received response
- [Arguments] ${path} ${csr_file} ${pk_file} ${resp_code}
+Send Get Request with Header
+ [Documentation] Send request to passed url
+ [Arguments] ${path} ${csr_file} ${pk_file}
+ [Return] ${resp}
${headers}= Create Header with CSR and PK ${csr_file} ${pk_file}
${resp}= Get Request ${http_session} ${path} headers=${headers}
+
+Send Get Request with Header And Expect Success
+ [Documentation] Send request to passed url and validate received response
+ [Arguments] ${path} ${csr_file} ${pk_file}
+ ${resp}= Send Get Request with Header ${path} ${csr_file} ${pk_file}
+ Should Be Equal As Strings ${resp.status_code} 200
+ Check Message Recieved On Success ${resp.content}
+
+Check Message Recieved On Success
+ [Documentation] Check if correct messsage has been sent on successful request
+ [Arguments] ${content}
+ ${resp_content}= Parse Json ${content}
+ Dictionary Should Contain Key ${resp_content} certificateChain
+ @{list}= Get From Dictionary ${resp_content} certificateChain
+ List Should Contain Certificates @{list}
+ Dictionary Should Contain Key ${resp_content} trustedCertificates
+
+List Should Contain Certificates
+ [Documentation] Verify if list contains certificates
+ [Arguments] @{list}
+ :FOR ${content} IN @{list}
+ \ Should Contain ${content} BEGIN CERTIFICATE
+ \ Should Contain ${content} END CERTIFICATE
+
+Send Get Request with Header And Expect Error
+ [Documentation] Send request to passed url and validate received response
+ [Arguments] ${path} ${csr_file} ${pk_file} ${resp_code}
+ ${resp}= Send Get Request with Header ${path} ${csr_file} ${pk_file}
Should Be Equal As Strings ${resp.status_code} ${resp_code}
Create Header with CSR and PK
@@ -52,4 +81,3 @@
[Arguments] ${path} ${resp_code}
${resp}= Post Request ${http_session} ${path}
Should Be Equal As Strings ${resp.status_code} ${resp_code}
-
\ No newline at end of file
diff --git a/tests/aaf/certservice/resources/cert-service-properties.robot b/tests/aaf/certservice/resources/cert-service-properties.robot
index 2a382ed..5cf9781 100644
--- a/tests/aaf/certservice/resources/cert-service-properties.robot
+++ b/tests/aaf/certservice/resources/cert-service-properties.robot
@@ -1,9 +1,12 @@
*** Variables ***
${AAFCERT_URL} http://%{AAFCERT_IP}:8080
-${CA_NAME} TEST
+${CLIENT_CA_NAME} Client
+${RA_CA_NAME} RA
${CERT_SERVICE_ENDPOINT} /v1/certificate
-${VALID_CSR_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid.csr
-${VALID_PK_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid.key
+${VALID_CLIENT_CSR_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid_client.csr
+${VALID_CLIENT_PK_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid_client.pk
+${VALID_RA_CSR_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid_ra.csr
+${VALID_RA_PK_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/valid_ra.pk
${INVALID_CSR_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/invalid.csr
${INVALID_PK_FILE} %{WORKSPACE}/tests/aaf/certservice/assets/invalid.key