Adjust API changes to local test

- adjust privilege_info_get_privilege_type() interface changes
- enable local test build

Change-Id: I42b7b5ef3329ffd026c576eb6510a05abfaa43a0
Signed-off-by: Yunjin Lee <yunjin-.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 435160e..85f79fb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,4 +19,4 @@ ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"")
 
 ADD_SUBDIRECTORY(capi)
 ADD_SUBDIRECTORY(tool)
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)

diff --git a/packaging/privilege-checker.spec b/packaging/privilege-checker.spec
index f3e8908..7ea06a9 100644 (file)
--- a/packaging/privilege-checker.spec
+++ b/packaging/privilege-checker.spec
@@ -253,11 +253,11 @@ mv %{_sysconfdir}/privilege-checker.ini.iot %{_sysconfdir}/privilege-checker.ini
 %{_libdir}/pkgconfig/security-privilege-manager.pc
 
 %files -n tc-privilege-checker
-#%{_bindir}/tc-privilege-db-manager
-#%{_bindir}/tc-privilege-manager
-#%{_bindir}/tc-privilege-info
-#%{_bindir}/tc-privilege-black-list
-#%{_bindir}/tc-privilege-package-info
+%{_bindir}/tc-privilege-db-manager
+%{_bindir}/tc-privilege-manager
+%{_bindir}/tc-privilege-info
+%{_bindir}/tc-privilege-black-list
+%{_bindir}/tc-privilege-package-info
 
 %files -n privilege-verifier
 %license LICENSE.APLv2

diff --git a/test/tc-privilege-black-list.c b/test/tc-privilege-black-list.c
index 72b8435..6be8f71 100755 (executable)
--- a/test/tc-privilege-black-list.c
+++ b/test/tc-privilege-black-list.c
@@ -315,7 +315,7 @@ void __test_mdm_black_list_type()
 
        __tcinfo(goal, "Get privilege type. Privilege is mdm blacklisted");
        printf("uid = 0, privilege = http://tizen.org/privilege/aaa\n");
-       ret = privilege_info_get_privilege_type(0, "org.zzz.zzz", "http://tizen.org/privilege/aaa", &type);
+       ret = privilege_info_get_privilege_type(0, "org.zzz.zzz", PRVMGR_PACKAGE_TYPE_CORE, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/aaa", &type);
        printf("type = %s\n", __get_privilege_type_string(type));
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_BLACKLIST) {
                success_cnt++;
@@ -328,7 +328,7 @@ void __test_mdm_black_list_type()
 
        __tcinfo(goal, "Get privilege type. Privilege is NOT mdm blacklisted");
        printf("uid = 0, privilege = http://tizen.org/privilege/xxx\n");
-       ret = privilege_info_get_privilege_type(0, "org.zzz.zzz", "http://tizen.org/privilege/xxx", &type);
+       ret = privilege_info_get_privilege_type(0, "org.zzz.zzz", PRVMGR_PACKAGE_TYPE_CORE, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/xxx", &type);
        printf("type = %s\n", __get_privilege_type_string(type));
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL) {
                success_cnt++;

diff --git a/test/tc-privilege-info.c b/test/tc-privilege-info.c
index 5e0a277..9efb370 100755 (executable)
--- a/test/tc-privilege-info.c
+++ b/test/tc-privilege-info.c
@@ -476,7 +476,6 @@ static void __test_privilege_info_get_privilege_group_display_name()
 static void __test_privilege_info_get_privilege_type()
 {
        int ret = 0;
-       int test = 0;
        privilege_manager_privilege_type_e type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_MAX;
 
        /* Set test app info */
@@ -511,7 +510,7 @@ static void __test_privilege_info_get_privilege_type()
        printf("pkgid = org.test.webapp_4\n");
        printf("privilege = http://tizen.org/privilege/internet\n");
        printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL\n");
-       ret = privilege_info_get_privilege_type(5001, "org.test.webapp_4", "http://tizen.org/privilege/internet", &type);
+       ret = privilege_info_get_privilege_type(5001, "org.test.webapp_4", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/internet", &type);
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL) {
                success_cnt++;
                printf_green("success\n");
@@ -526,7 +525,7 @@ static void __test_privilege_info_get_privilege_type()
        printf("uid = 5001\n");
        printf("pkgid = org.test.webapp_4\n");
        printf("privilege = http://tizen.org/privilege/mediastorage\n");
-       ret = privilege_info_get_privilege_type(5001, "org.test.webapp_4", "http://tizen.org/privilege/mediastorage", &type);
+       ret = privilege_info_get_privilege_type(5001, "org.test.webapp_4", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/mediastorage", &type);
        if (_get_tizen_profile() == TIZEN_PROFILE_WEARABLE) {
                printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY\n");
                if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY) {
@@ -554,7 +553,7 @@ static void __test_privilege_info_get_privilege_type()
        printf("pkgid = org.test.webapp_4\n");
        printf("privilege = http://tizen.org/privilege/call\n");
        printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY\n");
-       ret = privilege_info_get_privilege_type(5001, "org.test.webapp_4", "http://tizen.org/privilege/call", &type);
+       ret = privilege_info_get_privilege_type(5001, "org.test.webapp_4", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/call", &type);
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY) {
                success_cnt++;
                printf_green("success\n");
@@ -570,7 +569,7 @@ static void __test_privilege_info_get_privilege_type()
        printf("pkgid = org.test.webapp_5\n");
        printf("privilege = http://tizen.org/privilege/mediastorage\n");
        printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY\n");
-       ret = privilege_info_get_privilege_type(5001, "org.test.webapp_5", "http://tizen.org/privilege/mediastorage", &type);
+       ret = privilege_info_get_privilege_type(5001, "org.test.webapp_5", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/mediastorage", &type);
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY) {
                success_cnt++;
                printf_green("success\n");
@@ -582,28 +581,6 @@ static void __test_privilege_info_get_privilege_type()
        type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_MAX;
 
        __print_line();
-       printf("uid = 5001\n");
-       printf("pkgid = org.tizen.chromium-efl\n");
-       printf("privilege = http://tizen.org/privilege/location\n");
-       ret = privilege_info_get_privilege_type(5001, "org.tizen.chromium-efl", "http://tizen.org/privilege/location", &type);
-       if (DISABLE_ASKUSER) {
-               printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL\n");
-               test = (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL);
-       } else {
-               printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY\n");
-               test = (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY);
-       }
-       if (test) {
-               success_cnt++;
-               printf_green("success\n");
-       } else {
-               fail_cnt++;
-               printf_red("fail. ret = %s, type = %s\n", __get_result_string('m', ret), __get_privilege_type_string(type));
-       }
-
-       type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_MAX;
-
-       __print_line();
        printf("uid = 0\n");
        printf("pkgid = org.tizen.testtest\n");
        printf("privilege = http://tizen.org/privilege/yyyyy\n");
@@ -615,7 +592,7 @@ static void __test_privilege_info_get_privilege_type()
 
        __print_line();
        printf("check privilege type\n");
-       ret = privilege_info_get_privilege_type(0, "org.tizen.testtest", "http://tizen.org/privilege/yyyyy", &type);
+       ret = privilege_info_get_privilege_type(0, "org.tizen.testtest", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/yyyyy", &type);
        printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_BLACKLIST\n");
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_BLACKLIST) {
                success_cnt++;
@@ -636,7 +613,7 @@ static void __test_privilege_info_get_privilege_type()
        printf("uid = 5001\n");
        printf("pkgid = NULL\n");
        printf("privilege = \n");
-       ret = privilege_info_get_privilege_type(5001, NULL, NULL, &type);
+       ret = privilege_info_get_privilege_type(5001, NULL, PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, NULL, &type);
        printf("expected ret = PRVMGR_ERR_INVALID_PARAMETER\n");
        if (ret == PRVMGR_ERR_INVALID_PARAMETER) {
                success_cnt++;
@@ -652,7 +629,7 @@ static void __test_privilege_info_get_privilege_type()
        printf("uid = 5001\n");
        printf("pkgid = org.tizen.testtest\n");
        printf("privilege = http://tizen.org/privilege/yyyyy\n");
-       ret = privilege_info_get_privilege_type(5001, "org.tizen.testtest", "http://tizen.org/privilege/yyyyy", &type);
+       ret = privilege_info_get_privilege_type(5001, "org.tizen.testtest", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/yyyyy", &type);
        printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL\n");
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL) {
                success_cnt++;