CKM: Fix system-db tests T5037, T5038, T5039.

One of the tests does not clean environement.

Change-Id: Ia7a4d2fd234c23566d009ab922a0e33cb96b63a5

diff --git a/src/ckm/system-db.cpp b/src/ckm/system-db.cpp
index 8304d48..6f33363 100644 (file)
--- a/src/ckm/system-db.cpp
+++ b/src/ckm/system-db.cpp
@@ -291,6 +291,7 @@ RUNNER_TEST(T5036_CLIENT_LIST_ACCESSIBLE_ITEMS)
     // user lists items - expect system item A and private item
 
     // [prepare]
+    remove_user_data(0);
     remove_user_data(USER_APP);
     GarbageCollector gc;
     gc.save(TEST_SYSTEM_ALIAS.c_str(), TEST_DATA);
@@ -327,8 +328,8 @@ RUNNER_TEST(T5037_CLIENT_APP_TRY_GENERATE_KEY_IN_SYSTEM_DB)
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
 
-        const char *private_key_alias = "/ sys-db-priv";
-        const char *public_key_alias = "/ sys-db-pub";
+        std::string private_key_alias = aliasWithLabel(SYSTEM_LABEL, "sys-db-priv");
+        std::string public_key_alias = aliasWithLabel(SYSTEM_LABEL, "sys-db-pub");
         ckmc_policy_s policy_private_key;
         ckmc_policy_s policy_public_key;
         policy_private_key.password = NULL;
@@ -339,8 +340,8 @@ RUNNER_TEST(T5037_CLIENT_APP_TRY_GENERATE_KEY_IN_SYSTEM_DB)
         RUNNER_ASSERT_MSG(
                  CKMC_ERROR_PERMISSION_DENIED ==
                         (temp = ckmc_create_key_pair_rsa(1024,
-                                                         private_key_alias,
-                                                         public_key_alias,
+                                                         private_key_alias.c_str(),
+                                                         public_key_alias.c_str(),
                                                          policy_private_key,
                                                          policy_public_key)),
                  CKMCReadableError(temp));
@@ -361,10 +362,10 @@ RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB)
     // [prepare]
     remove_user_data(USER_APP);
     GarbageCollector gc;
-    const char *private_key_alias = "/ sys-db-priv";
-    const char *public_key_alias = "/ sys-db-pub";
-    gc.add(private_key_alias);
-    gc.add(public_key_alias);
+    std::string private_key_alias = aliasWithLabel(SYSTEM_LABEL, "sys-db-priv");
+    std::string public_key_alias = aliasWithLabel(SYSTEM_LABEL, "sys-db-pub");
+    gc.add(private_key_alias.c_str());
+    gc.add(public_key_alias.c_str());
     ckmc_policy_s policy_private_key;
     ckmc_policy_s policy_public_key;
     policy_private_key.password = NULL;
@@ -375,8 +376,8 @@ RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB)
     RUNNER_ASSERT_MSG(
             CKMC_ERROR_NONE ==
                     (temp = ckmc_create_key_pair_rsa(1024,
-                                                     private_key_alias,
-                                                     public_key_alias,
+                                                     private_key_alias.c_str(),
+                                                     public_key_alias.c_str(),
                                                      policy_private_key,
                                                      policy_public_key)),
              CKMCReadableError(temp));
@@ -390,7 +391,7 @@ RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB)
 
         RUNNER_ASSERT_MSG(
                 CKMC_ERROR_NONE == (temp = ckmc_create_signature(
-                        private_key_alias,
+                        private_key_alias.c_str(),
                         NULL,
                         msg_buff,
                         hash_algo,
@@ -400,7 +401,7 @@ RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB)
 
         RUNNER_ASSERT_MSG(
                 CKMC_ERROR_NONE == (temp = ckmc_verify_signature(
-                        public_key_alias,
+                        public_key_alias.c_str(),
                         NULL,
                         msg_buff,
                         *signature,
@@ -423,7 +424,7 @@ RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB)
 
         RUNNER_ASSERT_MSG(
                 CKMC_ERROR_DB_ALIAS_UNKNOWN == (temp = ckmc_create_signature(
-                        private_key_alias,
+                        private_key_alias.c_str(),
                         NULL,
                         msg_buff,
                         hash_algo,