X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Foom-platform-cert-service%2Ftruststoremerger%2Fresources%2Ftrust-merger-keywords.robot;h=416ce610cbf385e82f9421f5a78f3369659edd6f;hb=97c946e21835cbc213f9974ed0df05ef702f4b88;hp=5aba7feabd394041704c2e2d884a398ab3b19985;hpb=1cb65312aebb6734a563cfc6495e59f65eafd750;p=integration%2Fcsit.git

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}