X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Foom-platform-cert-service%2Ftruststoremerger%2Ftrust-merger-test.robot;h=21323d8770a8330faa64fd806e63e30fd31912d7;hb=0e25893516b29c67362eb8c6fb1b079f80558453;hp=966a42432d69c54142be305366c45811a1cd2804;hpb=f7f4b81c1ee47f7c3aa6ba062cd34365168396f8;p=integration%2Fcsit.git

diff --git a/tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot b/tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot
index 966a4243..21323d87 100644
--- a/tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot
+++ b/tests/oom-platform-cert-service/truststoremerger/trust-merger-test.robot
@@ -9,32 +9,32 @@ Resource          ./resources/trust-merger-keywords.robot
 Trust Merger fails when file extension is invalid
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with invalid truststore extension env and expect error code
-    Run Trust Merger And Expect Error  ${INVALID_ENV_EXTENSION}  1
+    Run Trust Merger And Expect Error  ${INVALID_ENV_FILE_EXTENSION}  1
+
+Trust Merger fails when a variable is empty
+    [Tags]      OOM-TRUST-STORE-MERGER
+    [Documentation]  Run with empty truststore password path env and expect error code
+    Run Trust Merger And Expect Error  ${INVALID_ENV_FILE_EMPTY_PASSWORDS}  1
 
 Trust Merger fails when truststore and passwords envs not provided
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with invalid empty envs and expect error code
-    Run Trust Merger And Expect Error  ${INVALID_ENV_EMPTY_FILE}  1
+    Run Trust Merger And Expect Error  ${INVALID_ENV_FILE_EMPTY}  2
 
 Trust Merger fails when list sizes are different
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with different truststore and password envs size and expect error code
-    Run Trust Merger And Expect Error  ${INVALID_ENV_LIST_SIZE}  2
-
-Trust Merger fails when a variable is empty
-    [Tags]      OOM-TRUST-STORE-MERGER
-    [Documentation]  Run with empty truststore password path env and expect error code
-    Run Trust Merger And Expect Error  ${INVALID_ENV_EMPTY_PASSWORDS}  2
+    Run Trust Merger And Expect Error  ${INVALID_ENV_FILE_LIST_SIZE}  2
 
 Trust Merger fails when truststore paths are invalid
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with invalid truststore path and expect error code
-    Run Trust Merger And Expect Error  ${INVALID_ENV_TRUSTSTORE_PATHS}  3
+    Run Trust Merger And Expect Error  ${INVALID_ENV_FILE_TRUSTSTORE_PATHS}  3
 
 Trust Merger fails when password path is invalid
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with invalid password path and expect error code
-    Run Trust Merger And Expect Error  ${INVALID_PASSWORD_PATHS}  4
+    Run Trust Merger And Expect Error  ${INVALID_ENV_FILE_PASSWORD_PATHS}  4
 
 Trust Merger fails when password file pair is invalid
     [Tags]      OOM-TRUST-STORE-MERGER
@@ -44,24 +44,24 @@ Trust Merger fails when password file pair is invalid
 Trust Merger fails when pem does not contain cert
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with empty pem truststore and expect error code
-    Run Trust Merger And Expect Error  ${INVALID_ENV_EMPTY_CERTS}  9
+    Run Trust Merger And Expect Error  ${INVALID_ENV_FILE_EMPTY_CERTS}  9
 
 Trust Merger fails when aliases are duplicated
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with duplicated aliases in truststores and expect error code
-    Run Trust Merger And Expect Error  ${INVALID_ENV_DUPLICATED_ALIASES}  10
+    Run Trust Merger And Expect Error  ${INVALID_ENV_FILE_DUPLICATED_ALIASES}  10
 
 Trust Merger merges successfully jks pem p12
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with valid env file and expect merged certs from jks, pem and p12
-    Run Trust Merger And Merge Truststore Files To Jks  ${VALID_ENV_JKS_PEM_P12}  0  ${JKS_TRUSTSTORE_MOUNT_PATH}  ${TRUSTSTORE_JKS_PASS}  ${JKS_TRUSTSTORE_EXPECTED_PATH}
+    Run Trust Merger And Merge Truststore Files To Jks  ${VALID_ENV_FILE_JKS_PEM_P12}  0  ${JKS_TRUSTSTORE_MOUNT_PATH}  ${TRUSTSTORE_JKS_PASS}  ${JKS_TRUSTSTORE_EXPECTED_PATH}
 
 Trust Merger merges successfully pem p12
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with valid env file and expect merged certs from pem and p12
-    Run Trust Merger And Merge Truststore Files To Pem  ${VALID_ENV_PEM_P12}  0  ${PEM_TRUSTSTORE_MOUNT_PATH}  ${PEM_TRUSTSTORE_EXPECTED_PATH}
+    Run Trust Merger And Merge Truststore Files To Pem  ${VALID_ENV_FILE_PEM_P12}  0  ${PEM_TRUSTSTORE_MOUNT_PATH}  ${PEM_TRUSTSTORE_EXPECTED_PATH}
 
 Trust Merger ends successfully with single truststore
     [Tags]      OOM-TRUST-STORE-MERGER
     [Documentation]  Run with one truststore in env file and expect code 0
-    Run Trust Merger And Merge Truststore Files To Jks  ${VALID_ENV_SINGLE_TRUSTSTORE}  0  ${JKS_TRUSTSTORE_MOUNT_PATH}  ${TRUSTSTORE_JKS_PASS}  ${TRUSTSTORE_JKS}
+    Run Trust Merger And Merge Truststore Files To Jks  ${VALID_ENV_FILE_SINGLE_TRUSTSTORE}  0  ${JKS_TRUSTSTORE_MOUNT_PATH}  ${TRUSTSTORE_JKS_PASS}  ${TRUSTSTORE_JKS}