Merge "Fix exit code for missing envs"

2 files changed, 26 insertions, 26 deletions

diff --git a/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot b/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot
index d356f604..3aa4a18f 100644
--- a/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot
+++ b/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-properties.robot
@@ -15,18 +15,18 @@ ${PEM_TRUSTSTORE_MOUNT_PATH}                          %{WORKSPACE}/tests/oom-pla
 ${JKS_TRUSTSTORE_EXPECTED_PATH}                       %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/jksAndPemAndP12.jks
 ${PEM_TRUSTSTORE_EXPECTED_PATH}                       %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/expected_truststores/pemAndP12.pem
 
-${INVALID_ENV_EMPTY_FILE}                             %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_file.env
-${INVALID_ENV_LIST_SIZE}                              %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_different_lists_size.env
-${INVALID_ENV_EMPTY_PASSWORDS}                        %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_passwords.env
-${INVALID_PASSWORD_PATHS}                             %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_password_path.env
-${INVALID_ENV_TRUSTSTORE_PATHS}                       %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_truststore_paths.env
+${INVALID_ENV_FILE_EMPTY}                             %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_file.env
+${INVALID_ENV_FILE_LIST_SIZE}                         %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_different_lists_size.env
+${INVALID_ENV_FILE_EMPTY_PASSWORDS}                   %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_passwords.env
+${INVALID_ENV_FILE_PASSWORD_PATHS}                    %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_password_path.env
+${INVALID_ENV_FILE_TRUSTSTORE_PATHS}                  %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_truststore_paths.env
 ${INVALID_ENV_FILE_PASSWORD}                          %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_file_password_pair.env
-${INVALID_ENV_EXTENSION}                              %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_extension.env
-${INVALID_ENV_DUPLICATED_ALIASES}                     %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_duplicated_aliases.env
-${INVALID_ENV_EMPTY_CERTS}                            %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_certs.env
-${VALID_ENV_JKS_PEM_P12}                              %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_jks_pem_p12.env
-${VALID_ENV_PEM_P12}                                  %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_pem_p12.env
-${VALID_ENV_SINGLE_TRUSTSTORE}                        %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_single_truststore.env
+${INVALID_ENV_FILE_EXTENSION}                         %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_extension.env
+${INVALID_ENV_FILE_DUPLICATED_ALIASES}                %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_duplicated_aliases.env
+${INVALID_ENV_FILE_EMPTY_CERTS}                       %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/invalid_empty_certs.env
+${VALID_ENV_FILE_JKS_PEM_P12}                         %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_jks_pem_p12.env
+${VALID_ENV_FILE_PEM_P12}                             %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_pem_p12.env
+${VALID_ENV_FILE_SINGLE_TRUSTSTORE}                   %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/valid_single_truststore.env
 
 ${TRUSTSTORE_JKS}                                     %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststore.jks
 ${TRUSTSTORE_JKS_PASS}                                %{WORKSPACE}/tests/oom-platform-cert-service/truststoremerger/assets/truststores/truststoreJks.pass
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}