SM : Normalize TemporaryTestUser getUidString method

Change-Id: I0a2640fa40f34070de92dfaeed5223c89bcd8d49

diff --git a/src/common/temp_test_user.h b/src/common/temp_test_user.h
index 72e7408..c8ead93 100644 (file)
--- a/src/common/temp_test_user.h
+++ b/src/common/temp_test_user.h
@@ -37,7 +37,7 @@ public:
     uid_t getUid() const {return m_uid;}
     uid_t getGid() const {return m_gid;}
     void create(void);
-    void getUidString(std::string& uidstr) const {uidstr =  std::to_string(static_cast<unsigned int>(m_uid));}
+    std::string getUidString() const {return std::to_string(static_cast<unsigned int>(m_uid));}
     const std::string& getUserName() const {return m_userName;}
     GumUserType getUserType() const {return m_userType;}
 

diff --git a/src/security-manager-tests/test_cases.cpp b/src/security-manager-tests/test_cases.cpp
index a985d6c..37e89f0 100644 (file)
--- a/src/security-manager-tests/test_cases.cpp
+++ b/src/security-manager-tests/test_cases.cpp
@@ -282,7 +282,7 @@ static void install_and_check(const char *const sm_app_id,
     Api::install(requestPrivateUser);
 
     check_app_permissions(sm_app_id, sm_pkg_id,
-                          uidToStr(user.getUid()).c_str(),
+                          user.getUidString().c_str(),
                           SM_ALLOWED_PRIVILEGES, SM_DENIED_PRIVILEGES);
 }
 
@@ -314,7 +314,7 @@ RUNNER_CHILD_TEST(security_manager_04a_app_install_uninstall_by_app_user_for_sel
     Api::uninstall(request);
 
     check_app_permissions(sm_app_id, sm_pkg_id,
-                          uidToStr(testUser.getUid()).c_str(),
+                          testUser.getUidString().c_str(),
                           SM_NO_PRIVILEGES, SM_ALLOWED_PRIVILEGES);
 }
 
@@ -345,7 +345,7 @@ RUNNER_CHILD_TEST(security_manager_04b_app_install_by_root_for_app_user)
     Api::uninstall(request);
 
     check_app_permissions(sm_app_id, sm_pkg_id,
-                          uidToStr(testUser.getUid()).c_str(),
+                          testUser.getUidString().c_str(),
                           SM_NO_PRIVILEGES, SM_ALLOWED_PRIVILEGES);
 }
 
@@ -389,10 +389,10 @@ RUNNER_CHILD_TEST(security_manager_07_user_add_app_install)
     const char *const sm_app_id = "sm_test_07_app_id_user";
     const char *const sm_pkg_id = "sm_test_07_pkg_id_user";
     const std::string new_user_name = "sm_test_07_user_name";
-    std::string uid_string;
+
     TemporaryTestUser test_user(new_user_name, GUM_USERTYPE_NORMAL, false);
     test_user.create();
-    test_user.getUidString(uid_string);
+    std::string uid_string = test_user.getUidString();
 
     removeTestDirs(test_user, sm_app_id, sm_pkg_id);
     createTestDirs(test_user, sm_app_id, sm_pkg_id);
@@ -415,12 +415,11 @@ 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 std::string new_user_name = "sm_test_08_user_name";
-    std::string uid_string;
 
     // gumd user add
     TemporaryTestUser test_user(new_user_name, GUM_USERTYPE_NORMAL, false);
     test_user.create();
-    test_user.getUidString(uid_string);
+    std::string uid_string = test_user.getUidString();
 
     removeTestDirs(test_user, sm_app_id, sm_pkg_id);
     createTestDirs(test_user, sm_app_id, sm_pkg_id);
@@ -580,10 +579,10 @@ RUNNER_TEST(security_manager_18_user_cynara_policy)
     const char *const USER_TYPE_NORMAL_BUCKET = "USER_TYPE_NORMAL";
     const std::string username("sm_test_10_user_cynara_policy");
     CynaraTestAdmin::Admin admin;
-    std::string uid_string;
+
     TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, false);
     user.create();
-    user.getUidString(uid_string);
+    std::string uid_string = user.getUidString();
 
     CynaraTestAdmin::CynaraPoliciesContainer nonemptyContainer;
     nonemptyContainer.add(MAIN_BUCKET,CYNARA_ADMIN_WILDCARD, uid_string.c_str(), CYNARA_ADMIN_WILDCARD, CYNARA_ADMIN_BUCKET, USER_TYPE_NORMAL_BUCKET);
@@ -630,7 +629,6 @@ RUNNER_CHILD_TEST(security_manager_21_security_manager_admin_deny_user_priv)
     RUNNER_ASSERT_MSG(pid >= 0, "fork failed");
     if (pid != 0)//parent process
     {
-        std::string childuidstr;
         TemporaryTestUser admin("sm_test_13_ADMIN_USER", GUM_USERTYPE_ADMIN, false);
         TemporaryTestUser child("sm_test_13_NORMAL_USER", GUM_USERTYPE_NORMAL, false);
 
@@ -640,7 +638,7 @@ RUNNER_CHILD_TEST(security_manager_21_security_manager_admin_deny_user_priv)
 
         admin.create();
         child.create();
-        child.getUidString(childuidstr);
+        std::string childuidstr = child.getUidString();
 
         //install privacy manager for admin
         request.setAppId(pirivman_id.c_str());
@@ -711,10 +709,10 @@ RUNNER_TEST(security_manager_19_security_manager_cmd_install)
     const std::string app_id = "security_manager_10_app";
     const std::string pkg_id = "security_manager_10_pkg";
     const std::string username("sm_test_10_user_name");
-    std::string uid_string;
+
     TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, false);
     user.create();
-    user.getUidString(uid_string);
+    std::string uid_string = user.getUidString();
     const std::string path1 = TzPlatformConfig::appDirPath(user, app_id, pkg_id) + "/p1";
     const std::string path2 = TzPlatformConfig::appDirPath(user, app_id, pkg_id) + "/p2";
     const std::string pkgopt = " --pkg=" + pkg_id;
@@ -760,10 +758,9 @@ RUNNER_TEST(security_manager_20_security_manager_cmd_users)
     const int SUCCESS = 0;
     const int FAILURE = 256;
     const std::string username("sm_test_11_user_name");
-    std::string uid_string;
     TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, false);
     user.create();
-    user.getUidString(uid_string);
+    std::string uid_string = user.getUidString();
     const std::string uidopt = " --uid=" + uid_string;
 
     struct operation {
@@ -973,7 +970,7 @@ RUNNER_CHILD_TEST(security_manager_49e_local_user_set_install_type_local)
     Api::install(requestPrivateUser);
 
     check_app_permissions(sm_app_id, sm_pkg_id,
-                          uidToStr(testUser.getUid()).c_str(),
+                          testUser.getUidString().c_str(),
                           SM_ALLOWED_PRIVILEGES, SM_DENIED_PRIVILEGES);
 
     //uninstall app as non-root user
@@ -983,7 +980,7 @@ RUNNER_CHILD_TEST(security_manager_49e_local_user_set_install_type_local)
     Api::uninstall(request);
 
     check_app_permissions(sm_app_id, sm_pkg_id,
-                          uidToStr(testUser.getUid()).c_str(),
+                          testUser.getUidString().c_str(),
                           SM_NO_PRIVILEGES, SM_ALLOWED_PRIVILEGES);
 }