Replace deprecated cert chain API with new one

[platform/core/test/security-tests.git] / tests / ckm / async-api.cpp

diff --git a/tests/ckm/async-api.cpp b/tests/ckm/async-api.cpp
index 02aef83..9ee9a36 100644 (file)
--- a/tests/ckm/async-api.cpp
+++ b/tests/ckm/async-api.cpp
@@ -47,6 +47,8 @@ using namespace std;
 namespace {
 
 const char* TEST_LABEL = "test_label";
+const CertificateShPtrVector EMPTY_CERT_VECTOR;
+const AliasVector EMPTY_ALIAS_VECTOR;
 
 class MyObserver: public ManagerAsync::Observer
 {
@@ -390,11 +392,15 @@ void test_check_cert_chain(F&& func, size_t expected, Args... args)
 
 typedef void (ManagerAsync::*certChainFn1)(const ManagerAsync::ObserverPtr&,
                                            const CertificateShPtr&,
-                                           const CertificateShPtrVector&);
+                                           const CertificateShPtrVector&,
+                                           const CertificateShPtrVector&,
+                                           bool);
 
 typedef void (ManagerAsync::*certChainFn2)(const ManagerAsync::ObserverPtr&,
                                            const CertificateShPtr&,
-                                           const AliasVector&);
+                                           const AliasVector&,
+                                           const AliasVector&,
+                                           bool);
 } // namespace anonymous
 
 
@@ -886,17 +892,29 @@ RUNNER_CHILD_TEST(TA1410_get_certificate_chain_invalid_param)
 
     CertificateShPtr cert = certs[0];
     CertificateShPtrVector certv = { certs[1] };
-    test_no_observer<certChainFn1>(&ManagerAsync::getCertificateChain, cert, certv);
+    test_no_observer<certChainFn1>(&ManagerAsync::getCertificateChain,
+                                   cert,
+                                   certv,
+                                   EMPTY_CERT_VECTOR,
+                                   true);
     test_invalid_param<certChainFn1>(&ManagerAsync::getCertificateChain,
                                      CertificateShPtr(),
-                                     certv);
+                                     certv,
+                                     EMPTY_CERT_VECTOR,
+                                     true);
 
     Alias alias = "alias";
     AliasVector aliasv = { alias };
-    test_no_observer<certChainFn2>(&ManagerAsync::getCertificateChain, cert, aliasv);
+    test_no_observer<certChainFn2>(&ManagerAsync::getCertificateChain,
+                                   cert,
+                                   aliasv,
+                                   EMPTY_ALIAS_VECTOR,
+                                   true);
     test_invalid_param<certChainFn2>(&ManagerAsync::getCertificateChain,
                                      CertificateShPtr(),
-                                     aliasv);
+                                     aliasv,
+                                     EMPTY_ALIAS_VECTOR,
+                                     true);
 }
 
 RUNNER_CHILD_TEST(TA1420_get_certificate_chain_negative)
@@ -909,21 +927,29 @@ RUNNER_CHILD_TEST(TA1420_get_certificate_chain_negative)
     test_negative<certChainFn1>(&ManagerAsync::getCertificateChain,
                                 CKM_API_ERROR_VERIFICATION_FAILED,
                                 cert,
-                                CertificateShPtrVector());
+                                EMPTY_CERT_VECTOR,
+                                EMPTY_CERT_VECTOR,
+                                true);
     test_negative<certChainFn1>(&ManagerAsync::getCertificateChain,
                                 CKM_API_ERROR_VERIFICATION_FAILED,
                                 cert,
-                                certv);
+                                certv,
+                                EMPTY_CERT_VECTOR,
+                                true);
     AliasVector aliasv = { dbc.alias("alias") };
     test_positive(&ManagerAsync::saveCertificate, aliasv[0], certs[0], Policy());
     test_negative<certChainFn2>(&ManagerAsync::getCertificateChain,
                                 CKM_API_ERROR_VERIFICATION_FAILED,
                                 cert,
-                                AliasVector());
+                                EMPTY_ALIAS_VECTOR,
+                                EMPTY_ALIAS_VECTOR,
+                                true);
     test_negative<certChainFn2>(&ManagerAsync::getCertificateChain,
                                 CKM_API_ERROR_VERIFICATION_FAILED,
                                 cert,
-                                aliasv);
+                                aliasv,
+                                EMPTY_ALIAS_VECTOR,
+                                true);
 }
 
 RUNNER_CHILD_TEST(TA1450_get_certificate_chain_positive)
@@ -933,11 +959,21 @@ RUNNER_CHILD_TEST(TA1450_get_certificate_chain_positive)
     DBCleanup dbc;
     CertificateShPtr cert = certs[0];
     CertificateShPtrVector certv = { certs[1] };
-    test_check_cert_chain<certChainFn1>(&ManagerAsync::getCertificateChain, 3, cert, certv);
+    test_check_cert_chain<certChainFn1>(&ManagerAsync::getCertificateChain,
+                                        3,
+                                        cert,
+                                        certv,
+                                        EMPTY_CERT_VECTOR,
+                                        true);
 
     AliasVector aliasv = { dbc.alias("alias") };
     test_positive(&ManagerAsync::saveCertificate, aliasv[0], certs[1], Policy());
-    test_check_cert_chain<certChainFn2>(&ManagerAsync::getCertificateChain, 3, cert, aliasv);
+    test_check_cert_chain<certChainFn2>(&ManagerAsync::getCertificateChain,
+                                        3,
+                                        cert,
+                                        aliasv,
+                                        EMPTY_ALIAS_VECTOR,
+                                        true);
 }
 
 
@@ -1133,8 +1169,8 @@ RUNNER_CHILD_TEST(TA1660_verify_signature_positive)
 // ocspCheck
 RUNNER_CHILD_TEST(TA1710_ocsp_check_invalid_param)
 {
-    test_no_observer(&ManagerAsync::ocspCheck, CertificateShPtrVector());
-    test_invalid_param(&ManagerAsync::ocspCheck, CertificateShPtrVector());
+    test_no_observer(&ManagerAsync::ocspCheck, EMPTY_CERT_VECTOR);
+    test_invalid_param(&ManagerAsync::ocspCheck, EMPTY_CERT_VECTOR);
 }
 
 RUNNER_CHILD_TEST(TA1720_ocsp_check_negative)
@@ -1157,7 +1193,11 @@ RUNNER_CHILD_TEST(TA1750_ocsp_check_positive)
     DBCleanup dbc;
     CertificateShPtr cert = certs[0];
     CertificateShPtrVector certv = { certs[1] };
-    auto obs = test_positive<certChainFn1>(&ManagerAsync::getCertificateChain, cert, certv);
+    auto obs = test_positive<certChainFn1>(&ManagerAsync::getCertificateChain,
+                                           cert,
+                                           certv,
+                                           EMPTY_CERT_VECTOR,
+                                           true);
 
     auto obs2 = test_positive(&ManagerAsync::ocspCheck, obs->m_certChain);
     RUNNER_ASSERT_MSG(obs2->m_ocspStatus == CKM_API_OCSP_STATUS_GOOD,