Spring cleaning

[platform/core/test/security-tests.git] / src / common / tests_common.h

diff --git a/src/common/tests_common.h b/src/common/tests_common.h
index 251e111..da78ac9 100644 (file)
--- a/src/common/tests_common.h
+++ b/src/common/tests_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2013 - 2019 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -29,35 +29,25 @@
 #include <dpl/test/test_runner.h>
 #include <dpl/test/test_runner_child.h>
 #include <dpl/test/test_runner_multiprocess.h>
-#include <sys/smack.h>
+
+#include <algorithm>
 #include <sys/types.h>
 #include <string>
 #include <tuple>
-#include <errno.h>
 #include <string.h>
 
-const uid_t APP_UID     = 5000;
-const gid_t APP_GID     = 5000;
-const uid_t APP_UID_2   = 5200;
-const gid_t APP_GID_2   = 5200;
-const uid_t DB_ALARM_UID = 6001;
-const gid_t DB_ALARM_GID = 6001;
-const std::string TMP_DIR("/tmp");
+const uid_t APP_UID     = 5001;
+const gid_t APP_GID     = 100;
 
 bool smack_check(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);
 void waitPid(pid_t pid);
-void change_label(const char* label);
+
+pid_t runInChild(const std::function<void(void)> &process);
+void runInChildParentWait(const std::function<void(void)> &process);
 
 #define RUNNER_TEST_SMACK(Proc, ...)                                                        \
     void Proc(std::tuple<__VA_ARGS__> &optionalArgsTuple);                                  \
@@ -131,20 +121,4 @@ void change_label(const char* label);
     }                                                                                       \
     void Proc##Multi(std::tuple<__VA_ARGS__> &optionalArgsTuple DPL_UNUSED)
 
-#define RUNNER_MULTIPROCESS_TEST_NOSMACK(Proc, ...)                                         \
-    void Proc(std::tuple<__VA_ARGS__> &optionalArgsTuple);                                  \
-    void Proc##Multi(std::tuple<__VA_ARGS__> &optionalArgsTuple);                           \
-    static int Static##Proc##Init()                                                         \
-    {                                                                                       \
-        if (!smack_check())                                                                 \
-            DPL::Test::TestRunnerSingleton::Instance().RegisterTest(                        \
-                new DPL::Test::TestCaseExtended<__VA_ARGS__>(#Proc, &Proc));                \
-        return 0;                                                                           \
-    }                                                                                       \
-    const int DPL_UNUSED Static##Proc##InitVar = Static##Proc##Init();                      \
-    void Proc(std::tuple<__VA_ARGS__> &optionalArgsTuple) {                                 \
-        DPL::Test::RunMultiProc(std::bind(Proc##Multi, optionalArgsTuple));                 \
-    }                                                                                       \
-    void Proc##Multi(std::tuple<__VA_ARGS__> &optionalArgsTuple DPL_UNUSED)
-
 #endif