Fix set privilege tests for OSP and EFL

[platform/core/test/security-tests.git] / tests / libprivilege-control-tests / common / libprivilege-control_test_common.h

diff --git a/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h b/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h
index acb7d2b..7b61764 100644 (file)
--- a/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h
+++ b/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h
@@ -54,7 +54,7 @@
 
 #define APP_TEST "app_test"
 
-#define EFL_APP_ID            "EFL_APP_ID"
+#define EFL_APP_ID             "hello-tizen"
 
 #define APP_FRIEND_1 "app_friend_1"
 #define APP_FRIEND_2 "app_friend_2"
@@ -63,6 +63,7 @@
 #define LIBPRIVILEGE_TEST_DAC_FILE     "/usr/share/privilege-control/test_privilege_control_rules.dac"
 #define LIBPRIVILEGE_TEST_DAC_FILE_WGT "/usr/share/privilege-control/WRT_test_privilege_control_rules_wgt.dac"
 #define LIBPRIVILEGE_TEST_DAC_FILE_OSP "/usr/share/privilege-control/OSP_test_privilege_control_rules_osp.dac"
+#define LIBPRIVILEGE_TEST_DAC_FILE_EFL "/usr/share/privilege-control/EFL_test_privilege_control_rules_efl.dac"
 
 #define APP_TEST_APP_1 "test-application1"
 #define APP_TEST_APP_2 "test-application_2"
@@ -92,6 +93,8 @@
 #define OSP_PARTNER_APP_PATH  "/opt/usr/apps/j4RuPsZrNt/bin/PysiuMisiu123OspPartner"
 #define OSP_PLATFORM_APP_PATH "/opt/usr/apps/V5LKqDFBXm/bin/PysiuMisiu123OspPlatform"
 
+#define EFL_APP_PATH          "/usr/bin/hello-tizen"
+
 #define APP_SET_PRIV_PATH      "/etc/smack/test_privilege_control_DIR/test_set_app_privilege/test_APP"
 
 #define APP_NPRUNTIME       "app_np_test"
@@ -283,9 +286,9 @@ const rules_t rules2_r = {
     { "test_subject_15", WGT_APP_ID, "r" }
 };
 
-// Rules from EFL_test_privilege_control_rules_osp.smack for osp_platform
+// Rules from EFL_test_privilege_control_rules_efl.smack for rpm
 const rules_t rules_efl = {
-    { APP_ID, "test_book_efl", "r" }
+    { EFL_APP_ID, "test_book_efl", "r" }
 };
 
 // Rules from WRT_test_privilege_control_rules_wgt.smack for wgt
@@ -434,7 +437,7 @@ void read_gids(std::set<unsigned> &set, const char *file_path);
 void check_groups(const char *dac_file);
 
 int file_exists(const char *path);
-void check_app_installed(int line_no, const char *app_path);
+void check_app_installed(const char *app_path);
 
 int nftw_remove_labels(const char *fpath, const struct stat* /*sb*/,
                        int /*typeflag*/, struct FTW* /*ftwbuf*/);