Modify some test codes according to key-manager's 2.4 API changes

Change-Id: Ibfd46fd0f3c3a4c4b11488788eabbc2bae105d2d

diff --git a/tests/ckm/capi-certificate-chains.cpp b/tests/ckm/capi-certificate-chains.cpp
index cf25f65..099eb7b 100644 (file)
--- a/tests/ckm/capi-certificate-chains.cpp
+++ b/tests/ckm/capi-certificate-chains.cpp
@@ -341,11 +341,11 @@ public:
                            const bool use_trustedsystemcerts,
                            ckmc_cert_list_s **ppcert_chain_list)
     {
-        return ckmc_get_certificate_chain(cert,
-                                          untrustedcerts,
-                                          trustedcerts,
-                                          use_trustedsystemcerts,
-                                          ppcert_chain_list);
+        return ckmc_get_cert_chain_with_trustedcert(cert,
+                                                    untrustedcerts,
+                                                    trustedcerts,
+                                                    use_trustedsystemcerts,
+                                                    ppcert_chain_list);
     }
 
     static int createChainWithAlias(const ckmc_cert_s *cert,
@@ -354,11 +354,11 @@ public:
                                     const bool use_trustedsystemcerts,
                                     ckmc_cert_list_s **ppcert_chain_list)
     {
-        return ckmc_get_certificate_chain_with_alias(cert,
-                                                     untrustedcerts,
-                                                     trustedcerts,
-                                                     use_trustedsystemcerts,
-                                                     ppcert_chain_list);
+        return ckmc_get_cert_chain_with_trustedcert_alias(cert,
+                                                          untrustedcerts,
+                                                          trustedcerts,
+                                                          use_trustedsystemcerts,
+                                                          ppcert_chain_list);
     }
 };
 
@@ -582,14 +582,14 @@ RUNNER_TEST(TCCH_0100_get_certificate_chain_invalid_param)
     CertListPtr untrusted_c = create_cert_list(ca1, NULL);
     ca1 = NULL;
 
-    assert_invalid_param(ckmc_get_certificate_chain,
+    assert_invalid_param(ckmc_get_cert_chain_with_trustedcert,
                          NULL_CERT,
                          untrusted_c.get(),
                          untrusted_c.get(),
                          true,
                          &chain);
 
-    assert_invalid_param(ckmc_get_certificate_chain,
+    assert_invalid_param(ckmc_get_cert_chain_with_trustedcert,
                          ca2,
                          untrusted_c.get(),
                          untrusted_c.get(),
@@ -601,14 +601,14 @@ RUNNER_TEST(TCCH_0100_get_certificate_chain_invalid_param)
     save_cert(ca1, "CERT_IM_CA1");
     AliasListPtr untrusted_a = create_alias_list("CERT_IM_CA1", NULL);
 
-    assert_invalid_param(ckmc_get_certificate_chain_with_alias,
+    assert_invalid_param(ckmc_get_cert_chain_with_trustedcert_alias,
                          NULL_CERT,
                          untrusted_a.get(),
                          untrusted_a.get(),
                          true,
                          &chain);
 
-    assert_invalid_param(ckmc_get_certificate_chain_with_alias,
+    assert_invalid_param(ckmc_get_cert_chain_with_trustedcert_alias,
                          ca2,
                          untrusted_a.get(),
                          untrusted_a.get(),
@@ -628,7 +628,7 @@ RUNNER_TEST(TCCH_0110_get_certificate_chain_alias_unknown)
 
     AliasListPtr non_existing = create_alias_list("NON_EXISTING_ALIAS", NULL);
     assert_result(CKMC_ERROR_DB_ALIAS_UNKNOWN,
-                  ckmc_get_certificate_chain_with_alias,
+                  ckmc_get_cert_chain_with_trustedcert_alias,
                   ca2,
                   non_existing.get(),
                   NULL_ALIASES,
@@ -636,7 +636,7 @@ RUNNER_TEST(TCCH_0110_get_certificate_chain_alias_unknown)
                   &chain);
 
     assert_result(CKMC_ERROR_DB_ALIAS_UNKNOWN,
-                  ckmc_get_certificate_chain_with_alias,
+                  ckmc_get_cert_chain_with_trustedcert_alias,
                   ca2,
                   NULL_ALIASES,
                   non_existing.get(),

diff --git a/tests/ckm/capi-testcases.cpp b/tests/ckm/capi-testcases.cpp
index 4674a5c..d7af5b0 100644 (file)
--- a/tests/ckm/capi-testcases.cpp
+++ b/tests/ckm/capi-testcases.cpp
@@ -2179,7 +2179,7 @@ RUNNER_TEST(T3097_CAPI_TYPE_load_p12_file2) {
     ckmc_pkcs12_s *ppkcs12 = NULL;
 
     RUNNER_ASSERT_MSG(
-            CKMC_ERROR_NONE == (temp = ckmc_load_from_pkcs12_file2(p12file, password, &ppkcs12)),
+            CKMC_ERROR_NONE == (temp = ckmc_pkcs12_load(p12file, password, &ppkcs12)),
             CKMCReadableError(temp));
     RUNNER_ASSERT_MSG(ppkcs12->priv_key != NULL, "Null private_key");
     RUNNER_ASSERT_MSG(ppkcs12->cert != NULL, "Null cert");
@@ -2268,7 +2268,7 @@ RUNNER_TEST(T3102_CAPI_PKCS12_negative_wrong_password)
     ckmc_pkcs12_s *ppkcs12 = NULL;
     int temp;
     RUNNER_ASSERT_MSG(
-            CKMC_ERROR_INVALID_FORMAT == (temp = ckmc_load_from_pkcs12_file2("/usr/share/ckm-test/test1801.pkcs12", wrong_passwd, &ppkcs12)),
+            CKMC_ERROR_INVALID_FORMAT == (temp = ckmc_pkcs12_load("/usr/share/ckm-test/test1801.pkcs12", wrong_passwd, &ppkcs12)),
             CKMCReadableError(temp));
 }
 
@@ -2277,7 +2277,7 @@ RUNNER_TEST(T3103_CAPI_PKCS12_add_bundle_with_chain_certs)
     ckmc_pkcs12_s *ppkcs12 = NULL;
     int temp;
     RUNNER_ASSERT_MSG(
-            CKMC_ERROR_NONE == (temp = ckmc_load_from_pkcs12_file2("/usr/share/ckm-test/pkcs.p12", NULL, &ppkcs12)),
+            CKMC_ERROR_NONE == (temp = ckmc_pkcs12_load("/usr/share/ckm-test/pkcs.p12", NULL, &ppkcs12)),
             CKMCReadableError(temp));
 
     RUNNER_ASSERT_MSG(NULL != ppkcs12->cert, "no certificate in PKCS12");