Fix tests of systemDB.

Change-Id: Icf05c56c39255525589f8ce79cadc96716c2674e

diff --git a/src/ckm/system-db.cpp b/src/ckm/system-db.cpp
index 768abd4..d31e676 100644 (file)
--- a/src/ckm/system-db.cpp
+++ b/src/ckm/system-db.cpp
@@ -61,6 +61,8 @@ RUNNER_TEST_GROUP_INIT(T50_SYSTEM_DB);
 
 RUNNER_TEST(T5010_CLIENT_APP_LOCKED_PRIVATE_DB)
 {
+    RUNNER_IGNORED_MSG("This test is turn off because fix "
+        "from tizen 2.4 that unlock db with empty password");
     // [prepare]
     // start as system service
     // add resource to the system DB
@@ -70,6 +72,7 @@ RUNNER_TEST(T5010_CLIENT_APP_LOCKED_PRIVATE_DB)
     // try to access system DB item - expect success
 
     // [prepare]
+    remove_user_data(USER_APP);
     GarbageCollector gc;
     gc.save(TEST_SYSTEM_ALIAS, TEST_DATA);
     allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
@@ -94,10 +97,11 @@ RUNNER_TEST(T5020_CLIENT_APP_ADD_TO_PRIVATE_DB)
 
     // [test]
     {
+        remove_user_data(USER_APP);
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
         ScopedSaveData ssd(TEST_ALIAS, TEST_DATA);
         check_read(TEST_ALIAS, TEST_LABEL, TEST_DATA);
@@ -115,16 +119,17 @@ RUNNER_TEST(T5031_CLIENT_APP_ACCESS_WITH_PERMISSION)
     // try to access the system item - expect success
 
     // [prepare]
+    remove_user_data(USER_APP);
     GarbageCollector gc;
     gc.save(TEST_SYSTEM_ALIAS, TEST_DATA);
     allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
 
     // [test]
     {
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
         check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA);
     }
@@ -140,15 +145,16 @@ RUNNER_TEST(T5032_CLIENT_APP_ACCESS_NO_PERMISSION)
     // try to access the system item - expect fail
 
     // [prepare]
+    remove_user_data(USER_APP);
     GarbageCollector gc;
     gc.save(TEST_SYSTEM_ALIAS, TEST_DATA);
 
     // [test]
     {
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
         check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA, CKMC_ERROR_DB_ALIAS_UNKNOWN);
     }
@@ -171,16 +177,17 @@ RUNNER_TEST(T5033_CLIENT_APP_PERMISSION_REMOVAL)
     // try to access the system item - expect fail
 
     // [prepare]
+    remove_user_data(USER_APP);
     GarbageCollector gc;
     gc.save(TEST_SYSTEM_ALIAS, TEST_DATA);
     allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
 
     // [test]
     {
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
         check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA);
     }
@@ -190,10 +197,10 @@ RUNNER_TEST(T5033_CLIENT_APP_PERMISSION_REMOVAL)
 
     // [test2]
     {
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
         check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA, CKMC_ERROR_DB_ALIAS_UNKNOWN);
     }
@@ -208,10 +215,11 @@ RUNNER_TEST(T5034_CLIENT_APP_SET_READ_ACCESS)
 
     // [test]
     {
+        remove_user_data(USER_APP);
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
         ScopedSaveData ssdsystem_user(TEST_ALIAS, TEST_DATA);
         ScopedSaveData ssdsystem_system(TEST_SYSTEM_ALIAS, TEST_DATA, CKMC_ERROR_PERMISSION_DENIED);
@@ -230,6 +238,7 @@ RUNNER_TEST(T5035_CLIENT_APP_TRY_REMOVING_SYSTEM_ITEM)
     // try to remove item from system DB  - expect fail
 
     // [prepare]
+    remove_user_data(USER_APP);
     GarbageCollector gc;
     gc.save(TEST_SYSTEM_ALIAS, TEST_DATA);
     allow_access(TEST_SYSTEM_ALIAS, TEST_LABEL, CKMC_PERMISSION_READ);
@@ -260,6 +269,7 @@ RUNNER_TEST(T5036_CLIENT_LIST_ACCESSIBLE_ITEMS)
     // user lists items - expect system item A and private item
 
     // [prepare]
+    remove_user_data(USER_APP);
     GarbageCollector gc;
     gc.save(TEST_SYSTEM_ALIAS, TEST_DATA);
     gc.save(TEST_SYSTEM_ALIAS_2, TEST_DATA);
@@ -270,10 +280,10 @@ RUNNER_TEST(T5036_CLIENT_LIST_ACCESSIBLE_ITEMS)
 
     // [test2]
     {
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedSaveData user_data(TEST_ALIAS, TEST_DATA);
 
         check_alias_list({TEST_SYSTEM_ALIAS,
@@ -289,10 +299,11 @@ RUNNER_TEST(T5037_CLIENT_APP_TRY_GENERATE_KEY_IN_SYSTEM_DB)
 
     // [test]
     {
+        remove_user_data(USER_APP);
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
         const char *private_key_alias = "/ sys-db-priv";
         const char *public_key_alias = "/ sys-db-pub";
@@ -326,6 +337,7 @@ RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB)
     // try to create signature in system DB  - expect fail
 
     // [prepare]
+    remove_user_data(USER_APP);
     GarbageCollector gc;
     const char *private_key_alias = "/ sys-db-priv";
     const char *public_key_alias = "/ sys-db-pub";
@@ -377,10 +389,10 @@ RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB)
 
     // [test2]
     {
+        ScopedDBUnlock unlock(USER_APP, APP_PASS);
         ScopedAccessProvider ap(TEST_LABEL);
         ap.allowAPI("key-manager::api-storage", "rw");
         ap.applyAndSwithToUser(USER_APP, GROUP_APP);
-        ScopedDBUnlock unlock(USER_APP, APP_PASS);
 
         ckmc_hash_algo_e hash_algo = CKMC_HASH_SHA256;
         ckmc_rsa_padding_algo_e pad_algo = CKMC_PKCS1_PADDING;
@@ -500,6 +512,8 @@ RUNNER_TEST(T5043_SYSTEM_SVC_4999_ACCESS_DB)
 
 RUNNER_TEST(T5044_SYSTEM_SVC_5000_ACCESS_DB)
 {
+    RUNNER_IGNORED_MSG("This test is turn off because fix "
+        "from tizen 2.4 that unlock db with empty password");
     // [prepare]
     // start as system service
     // add resource to the system DB