X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fcommon%2Ftests_common.h;h=52c05008b6e92b8d0e0d7ae984c209c0d8c8ae10;hb=df6cc321de4cc5ba00735642910b41beed5f6626;hp=edd66409a1973614039e316ee87e21dc982fa2c9;hpb=bd59bbeb132ce494a1682cd9970c21798a51dc07;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

diff --git a/tests/common/tests_common.h b/tests/common/tests_common.h
index edd6640..52c0500 100644
--- a/tests/common/tests_common.h
+++ b/tests/common/tests_common.h
@@ -30,18 +30,29 @@
 #include <dpl/test/test_runner_multiprocess.h>
 #include <privilege-control.h>
 #include <sys/smack.h>
+#include <string>
+#include <errno.h>
+#include <string.h>
 
 const uid_t APP_UID = 5000;
 const gid_t APP_GID = 5000;
 const uid_t DB_ALARM_UID = 6001;
 const gid_t DB_ALARM_GID = 6001;
-
-typedef std::unique_ptr<smack_accesses, std::function<void(smack_accesses*)> > AccessesUniquePtr;
-typedef std::unique_ptr<int, std::function<void(int*)> > FDUniquePtr;
+const std::string TMP_DIR("/tmp");
 
 int smack_runtime_check(void);
 int smack_check(void);
-int drop_root_privileges(void);
+int drop_root_privileges(uid_t appUid = APP_UID, gid_t appGid = APP_GID);
+void setLabelForSelf(const int line, const char *label);
+void add_process_group(const char* group_name);
+void remove_process_group(const char* group_name);
+std::string formatCstr(const char *cstr);
+int files_compare(int fd1, int fd2);
+void mkdirSafe(const std::string &path, mode_t mode);
+void mktreeSafe(const std::string &path, mode_t mode);
+void creatSafe(const std::string &path, mode_t mode);
+void symlinkSafe(const std::string &targetPath, const std::string &linkPath);
+void removeDir(const std::string &path);
 
 #define RUNNER_TEST_SMACK(Proc)                                                     \
     void Proc();                                                                    \
@@ -127,14 +138,6 @@ int drop_root_privileges(void);
     }                                                                                \
     void Proc##Multi()
 
-
-void closeFileDsr(int *fd);
-void dropRootPrivileges(const int line);
-void setLabelForSelf(const int line, const char *label);
-void addSmackRule(const int line, const char *subject, const char *object, const char *access);
-void removeSmackRule(const int line, const char *subject, const char *object, const char *access);
-
-
 namespace DB {
 
     class Transaction
@@ -168,9 +171,6 @@ namespace DB {
         RUNNER_ASSERT_MSG(PC_OPERATION_SUCCESS == DB::Transaction::db_result,      \
         "perm_end returned: " << DB::Transaction::db_result);
 
-// Common typedefs
-typedef std::unique_ptr<smack_accesses,std::function<void (smack_accesses*)> > SmackUniquePtr;
-
 // Common macros and labels used in tests
 extern const char *WGT_APP_ID;