diff options
Diffstat (limited to 'tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot')
| -rw-r--r-- | tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot b/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot index 5aba7fea..416ce610 100644 --- a/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot +++ b/tests/oom-platform-cert-service/truststoremerger/resources/trust-merger-keywords.robot @@ -3,7 +3,7 @@ Resource ../../../common.robot Resource ./trust-merger-properties.robot Library ../libraries/TrustMergerManager.py ${MOUNT_PATH} ${TRUSTSTORES_PATH} -Library ../libraries/JksTruststoreValidator.py +Library ../libraries/JksValidator.py Library ../libraries/PemTruststoreValidator.py *** Keywords *** @@ -16,7 +16,7 @@ Run Trust Merger And Expect Error Should Be Equal As Strings ${exit_code} ${expected_exit_code} Client return unexpected exit code return: ${exitcode} , but expected: ${expected_exit_code} Run Trust Merger And Merge Truststore Files To Jks - [Documentation] Run Truststore Merger Container And Validate Exit Code And Files + [Documentation] Run Truststore Merger Container And Validate Exit Code And Provided Truststore Files [Arguments] ${env_file} ${expected_exit_code} ${jks_path} ${jks_password} ${expected_jks_path} ${exit_code}= Run Merger Container ${DOCKER_MERGER_IMAGE} ${MERGER_CONTAINER_NAME} ${env_file} ${files_equal}= Assert Jks Truststores Equal ${jks_path} ${jks_password} ${expected_jks_path} @@ -24,6 +24,15 @@ Run Trust Merger And Merge Truststore Files To Jks Should Be Equal As Strings ${exit_code} ${expected_exit_code} Client return unexpected exit code return: ${exitcode} , but expected: ${expected_exit_code} Should Be True ${files_equal} +Run Trust Merger And Check Copied Keystore Files + [Documentation] Run Truststore Merger Container And Validate Exit Code And Provided Keystore Files + [Arguments] ${env_file} ${expected_exit_code} ${jks_path} ${jks_password} ${expected_jks_path} + ${exit_code}= Run Merger Container ${DOCKER_MERGER_IMAGE} ${MERGER_CONTAINER_NAME} ${env_file} + ${files_equal}= Assert Jks Keystores Equal ${jks_path} ${jks_password} ${expected_jks_path} + Remove Merger Container And Save Logs ${MERGER_CONTAINER_NAME} positive_path + Should Be Equal As Strings ${exit_code} ${expected_exit_code} Client return unexpected exit code return: ${exitcode} , but expected: ${expected_exit_code} + Should Be True ${files_equal} + Run Trust Merger And Merge Truststore Files To Pem [Documentation] Run Truststore Merger Container And Validate Exit Code And Files [Arguments] ${env_file} ${expected_exit_code} ${pem_path} ${expected_pem_path} |