Merge branch 'tizen' into security-manager

[platform/core/test/security-tests.git] / src / security-manager-tests / security_manager_tests.cpp

diff --git a/src/security-manager-tests/security_manager_tests.cpp b/src/security-manager-tests/security_manager_tests.cpp
index 1401650..e182365 100644 (file)
--- a/src/security-manager-tests/security_manager_tests.cpp
+++ b/src/security-manager-tests/security_manager_tests.cpp
@@ -1130,7 +1130,7 @@ RUNNER_CHILD_TEST(security_manager_09_add_user_offline)
     check_app_after_uninstall(app_id, pkg_id, true);
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_10_privacy_manager_fetch_whole_policy_for_self)
+RUNNER_CHILD_TEST(security_manager_10_privacy_manager_fetch_whole_policy_for_self)
 {
     //TEST DATA
     const std::string username("sm_test_10_user_name");
@@ -1225,7 +1225,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_10_privacy_manager_fetch_whole_policy_
     };
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_11_privacy_manager_fetch_whole_policy_for_admin_unprivileged)
+RUNNER_CHILD_TEST(security_manager_11_privacy_manager_fetch_whole_policy_for_admin_unprivileged)
 {
     //TEST DATA
     const std::vector<std::string> usernames = {"sm_test_11_user_name_1", "sm_test_11_user_name_2"};
@@ -1338,7 +1338,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_11_privacy_manager_fetch_whole_policy_
     };
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_12_privacy_manager_fetch_whole_policy_for_admin_privileged)
+RUNNER_CHILD_TEST(security_manager_12_privacy_manager_fetch_whole_policy_for_admin_privileged)
 {
     std::vector<PolicyEntry> oldPolicyVec;
     Api::getPolicy(PolicyEntry(), oldPolicyVec);
@@ -1452,7 +1452,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_12_privacy_manager_fetch_whole_policy_
     };
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_13_privacy_manager_fetch_policy_after_update_unprivileged)
+RUNNER_CHILD_TEST(security_manager_13_privacy_manager_fetch_policy_after_update_unprivileged)
 {
     //TEST DATA
     const std::vector<std::string> usernames = {"sm_test_13_user_name_1", "sm_test_13_user_name_2"};
@@ -1606,7 +1606,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_13_privacy_manager_fetch_policy_after_
     };
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_14_privacy_manager_fetch_and_update_policy_for_admin)
+RUNNER_CHILD_TEST(security_manager_14_privacy_manager_fetch_and_update_policy_for_admin)
 {
     //TEST DATA
     const std::vector<std::string> usernames = {"sm_test_14_user_name_1", "sm_test_14_user_name_2"};
@@ -1746,7 +1746,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_14_privacy_manager_fetch_and_update_po
 
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin)
+RUNNER_CHILD_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin)
 {
     const char *const update_app_id = "security_manager_15_update_app_id";
     const char *const update_privilege = "http://tizen.org/privilege/led";
@@ -1813,7 +1813,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_
     }
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin_wildcard)
+RUNNER_CHILD_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin_wildcard)
 {
     const char *const update_other_app_id = "security_manager_15_update_other_app_id";
     const char *const update_privilege = "http://tizen.org/privilege/led";
@@ -1881,7 +1881,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_
     }
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_self)
+RUNNER_CHILD_TEST(security_manager_15_privacy_manager_send_policy_update_for_self)
 {
     const char *const update_app_id = "security_manager_15_update_app_id";
     const char *const update_privilege = "http://tizen.org/privilege/led";
@@ -1948,7 +1948,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_
     }
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_16_policy_levels_get)
+RUNNER_CHILD_TEST(security_manager_16_policy_levels_get)
 {
     const std::string username("sm_test_16_user_cynara_policy");
     CynaraTestAdmin::Admin admin;
@@ -2022,7 +2022,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_16_policy_levels_get)
     }
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_17_privacy_manager_delete_policy_for_self)
+RUNNER_CHILD_TEST(security_manager_17_privacy_manager_delete_policy_for_self)
 {
     const char *const update_app_id = "security_manager_17_update_app_id";
     const char *const update_privilege = "http://tizen.org/privilege/led";
@@ -2132,7 +2132,7 @@ RUNNER_MULTIPROCESS_TEST(security_manager_17_privacy_manager_delete_policy_for_s
     }
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_17_privacy_manager_fetch_whole_policy_for_self_filtered)
+RUNNER_CHILD_TEST(security_manager_17_privacy_manager_fetch_whole_policy_for_self_filtered)
 {
     const std::string username("sm_test_17_user_name");
 
@@ -2343,7 +2343,7 @@ RUNNER_TEST(security_manager_20_security_manager_cmd_users)
     }
 }
 
-RUNNER_MULTIPROCESS_TEST(security_manager_21_security_manager_admin_deny_user_priv)
+RUNNER_CHILD_TEST(security_manager_21_security_manager_admin_deny_user_priv)
 {
     const int BUFFER_SIZE = 128;
     struct message {