Tests for new structure of application file paths

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

diff --git a/tests/security-manager-tests/security_manager_tests.cpp b/tests/security-manager-tests/security_manager_tests.cpp
index b7ca82d..9234d03 100644 (file)
--- a/tests/security-manager-tests/security_manager_tests.cpp
+++ b/tests/security-manager-tests/security_manager_tests.cpp
@@ -58,9 +58,10 @@ static const privileges_t SM_NO_PRIVILEGES  = {
 
 static const std::vector<std::string> SM_ALLOWED_GROUPS = {"db_browser", "db_alarm"};
 
-static const char *const SM_RW_PATH = "/usr/apps/test_DIR/app_dir";
-static const char *const SM_RO_PATH = "/usr/apps/test_DIR/app_dir_public_ro";
-static const char *const SM_DENIED_PATH = "/usr/apps/test_DIR/non_app_dir";
+static const char *const SM_RW_PATH = "/usr/apps/app_dir";
+static const char *const SM_RO_PATH = "/usr/apps/app_dir_public_ro";
+static const char *const SM_DENIED_PATH = "/usr/apps/non_app_dir";
+
 static const char *const ANY_USER_REPRESENTATION = "anyuser";/*this may be actually any string*/
 static const std::string EXEC_FILE("exec");
 static const std::string NORMAL_FILE("normal");
@@ -831,6 +832,9 @@ RUNNER_CHILD_TEST(security_manager_07_user_add_app_install)
     test_user.create();
     test_user.getUidString(uid_string);
 
+    removeTestDirs(test_user);
+    createTestDirs(test_user);
+
     install_app(sm_app_id, sm_pkg_id, test_user.getUid());
 
     check_app_after_install(sm_app_id, sm_pkg_id);
@@ -848,7 +852,7 @@ RUNNER_CHILD_TEST(security_manager_08_user_double_add_double_remove)
 
     const char *const sm_app_id = "sm_test_08_app_id_user";
     const char *const sm_pkg_id = "sm_test_08_pkg_id_user";
-    const char *const new_user_name = "sm_test_08_user_name";
+    const std::string new_user_name = "sm_test_08_user_name";
     std::string uid_string;
 
     // gumd user add
@@ -856,6 +860,9 @@ RUNNER_CHILD_TEST(security_manager_08_user_double_add_double_remove)
     test_user.create();
     test_user.getUidString(uid_string);
 
+    removeTestDirs(test_user);
+    createTestDirs(test_user);
+
     addUserRequest.setUid(test_user.getUid());
     addUserRequest.setUserType(SM_USER_TYPE_NORMAL);
 
@@ -882,22 +889,25 @@ RUNNER_CHILD_TEST(security_manager_09_add_user_offline)
 {
     const char *const app_id = "security_manager_09_add_user_offline_app";
     const char *const pkg_id = "security_manager_09_add_user_offline_pkg";
-    const std::string username("sm_test_09_user_name");
+    const std::string new_user_name("sm_test_09_user_name");
     ServiceManager serviceManager("security-manager.service");
     serviceManager.maskService();
     serviceManager.stopService();
 
-    TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, true);
-    user.create();
+    TemporaryTestUser test_user(new_user_name, GUM_USERTYPE_NORMAL, true);
+    test_user.create();
+
+    removeTestDirs(test_user);
+    createTestDirs(test_user);
 
-    install_app(app_id, pkg_id, user.getUid());
+    install_app(app_id, pkg_id, test_user.getUid());
 
     check_app_after_install(app_id, pkg_id);
 
     serviceManager.unmaskService();
     serviceManager.startService();
 
-    user.remove();
+    test_user.remove();
 
     check_app_after_uninstall(app_id, pkg_id, true);
 }