CKM: no more "empty password for lockscreen" logics.

[platform/core/test/security-tests.git] / tests / ckm / capi-certificate-chains.cpp

diff --git a/tests/ckm/capi-certificate-chains.cpp b/tests/ckm/capi-certificate-chains.cpp
index 2f3dca7..5050165 100644 (file)
--- a/tests/ckm/capi-certificate-chains.cpp
+++ b/tests/ckm/capi-certificate-chains.cpp
@@ -37,6 +37,8 @@
 
 namespace {
 
+const char *CHAINS_PASSWD = "chains-pass";
+
 typedef std::unique_ptr<ckmc_cert_s, void (*)(ckmc_cert_s*)> CertPtr;
 typedef std::unique_ptr<ckmc_cert_list_s, void (*)(ckmc_cert_list_s*)> CertListPtr;
 typedef std::unique_ptr<ckmc_alias_list_s, void (*)(ckmc_alias_list_s*)> AliasListPtr;
@@ -345,20 +347,19 @@ void ChainVerifier<T>::verifyNegative(TestData::certificateID idx, int error)
     RUNNER_ASSERT_MSG(chain == NULL, "Chain is not empty");
     ckmc_cert_free(cert);
 }
-
 } // namespace anonymous
 
 RUNNER_TEST_GROUP_INIT(T307_CKMC_CAPI_CERTIFICATE_CHAINS);
 
 RUNNER_TEST(TCCH_0000_init)
 {
-    assert_positive(ckmc_unlock_user_key, 0, "test-pass");
+    reset_user_data(0, CHAINS_PASSWD);
 }
 
 // old API
 RUNNER_TEST(TCCH_0010_get_chain_old_api)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<ChainApiOld> cv;
     cv.verifyNegative(TestData::GOOGLE_COM);
@@ -371,7 +372,7 @@ RUNNER_TEST(TCCH_0010_get_chain_old_api)
 // old API
 RUNNER_TEST(TCCH_0020_get_chain_old_api_system_only)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<ChainApiOld> cv;
     cv.verifyPositive(TestData::GIAG2, 2); // including system cert
@@ -380,7 +381,7 @@ RUNNER_TEST(TCCH_0020_get_chain_old_api_system_only)
 // check invalid arguments
 RUNNER_TEST(TCCH_0100_get_certificate_chain_invalid_param)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ckmc_cert_s* ca2 = create_cert(TestData::GIAG2);
     ckmc_cert_s* ca1 = create_cert(TestData::GEOTRUST);
@@ -429,7 +430,7 @@ RUNNER_TEST(TCCH_0100_get_certificate_chain_invalid_param)
 // check invalid arguments
 RUNNER_TEST(TCCH_0110_get_certificate_chain_alias_unknown)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ckmc_cert_s* ca2 = create_cert(TestData::GIAG2);
     ckmc_cert_list_s* chain = NULL;
@@ -459,7 +460,7 @@ RUNNER_TEST(TCCH_0110_get_certificate_chain_alias_unknown)
  */
 RUNNER_TEST(TCCH_0120_get_certificate_chain_root_ca_negative)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<> cv;
     cv.enableSystem(false);
@@ -475,7 +476,7 @@ RUNNER_TEST(TCCH_0120_get_certificate_chain_root_ca_negative)
  */
 RUNNER_TEST(TCCH_0140_get_certificate_chain_trusted_only)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<> cv;
     cv.enableSystem(false);
@@ -489,7 +490,7 @@ RUNNER_TEST(TCCH_0140_get_certificate_chain_trusted_only)
  */
 RUNNER_TEST(TCCH_0150_get_certificate_chain_system_only)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<> cv;
     cv.verifyPositive(TestData::GIAG2, 2); // including system cert
@@ -501,7 +502,7 @@ RUNNER_TEST(TCCH_0150_get_certificate_chain_system_only)
  */
 RUNNER_TEST(TCCH_0160_get_certificate_chain_no_untrusted)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<> cv;
     cv.addTrusted(TestData::TEST_ROOT_CA);
@@ -512,7 +513,7 @@ RUNNER_TEST(TCCH_0160_get_certificate_chain_no_untrusted)
 
 RUNNER_TEST(TCCH_0170_get_certificate_chain_no_trusted)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<> cv;
     cv.addUntrusted(TestData::GIAG2);
@@ -525,7 +526,7 @@ RUNNER_TEST(TCCH_0170_get_certificate_chain_no_trusted)
  */
 RUNNER_TEST(TCCH_0180_get_certificate_chain_no_system)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<> cv;
     cv.enableSystem(false);
@@ -540,7 +541,7 @@ RUNNER_TEST(TCCH_0180_get_certificate_chain_no_system)
  */
 RUNNER_TEST(TCCH_0190_get_certificate_chain_im_ca_in_trusted)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<> cv;
     cv.enableSystem(false);
@@ -552,7 +553,7 @@ RUNNER_TEST(TCCH_0190_get_certificate_chain_im_ca_in_trusted)
 
 RUNNER_TEST(TCCH_0200_get_certificate_chain_all)
 {
-    assert_positive(ckmc_remove_user_data,0);
+    reset_user_data(0, CHAINS_PASSWD);
 
     ChainVerifier<> cv;
     cv.enableSystem(true);
@@ -570,6 +571,5 @@ RUNNER_TEST(TCCH_0200_get_certificate_chain_all)
 
 RUNNER_TEST(TCCH_9999_deinit)
 {
-    assert_positive(ckmc_lock_user_key, 0);
-    assert_positive(ckmc_remove_user_data, 0);
+    remove_user_data(0);
 }