Fix failed test cases in privilege-info.c

Change-Id: I774343dda0230b5e07a90a46ba78fcb59a2c21b0
Signed-off-by: Le <xuan.tien@samsung.com>

diff --git a/test/tc-privilege-info.c b/test/tc-privilege-info.c
index b0ba8cb1d5830c8d849609ac641b7cd32871702b..203e504fae0b5f8e467b543e68b4bc2463ad315c 100644 (file)
--- a/test/tc-privilege-info.c
+++ b/test/tc-privilege-info.c
@@ -427,31 +427,27 @@ void __test_privilege_info_get_privilege_list_by_privacy()
 
 void __test_privilege_info_get_privacy_by_privilege()
 {
-       printf("privilege : http://tizen.org/privilege/apphistory.read\n");
        char* privacy = NULL;
+
+       __print_line();
+
+       __tcinfo(goal, POS_TC_PREFIX "__test_privilege_info_get_privacy_by_privilege");
+       printf("privilege : http://tizen.org/privilege/apphistory.read\n");
+
        int ret = privilege_info_get_privacy_by_privilege("http://tizen.org/privilege/apphistory.read", &privacy);
-       if ((ENABLE_ASKUSER && ret == PRVMGR_ERR_NONE) || (DISABLE_ASKUSER && ret == PRVMGR_ERR_INVALID_PARAMETER)) {
-               success_cnt++;
-               printf_green("Test SUCCEEDED, ret = %s, privacy id: %s\n", __get_result_string('m', ret), privacy);
-       } else {
-               fail_cnt++;
-               printf_red("Test FAILED\n");
-       }
+       __check_the_return_code('m', PRVMGR_ERR_NONE, ret);
 
        free(privacy);
        privacy = NULL;
 
        __print_line();
 
+       __tcinfo(goal, NEG_TC_PREFIX "__test_privilege_info_get_privacy_by_privilege");
        printf("privilege : http://tizen.org/privilege/internet\n");
+
        ret = privilege_info_get_privacy_by_privilege("http://tizen.org/privilege/internet", &privacy);
-       if (ret == PRVMGR_ERR_INVALID_PARAMETER) {
-               success_cnt++;
-               printf_green("Test SUCCEEDED, privilege: http://tizen.org/privilege/internet is not a privacy related.\n");
-       } else {
-               fail_cnt++;
-               printf_red("Test FAILED\n");
-       }
+       __check_the_return_code('m', PRVMGR_ERR_INVALID_PARAMETER, ret);
+
        free(privacy);
        __print_line();
 }
@@ -595,6 +591,7 @@ void __test_privilege_info_get_privilege_type()
        /* Set up done */
 
        __print_line();
+       __tcinfo(goal, POS_TC_PREFIX "privilege_info_get_privilege_type");
        printf("uid = 5001\n");
        printf("pkgid = org.test.webapp_4\n");
        printf("privilege = http://tizen.org/privilege/internet\n");
@@ -611,6 +608,7 @@ void __test_privilege_info_get_privilege_type()
        type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_MAX;
 
        __print_line();
+       __tcinfo(goal, POS_TC_PREFIX "privilege_info_get_privilege_type");
        printf("uid = 5001\n");
        printf("pkgid = org.test.webapp_4\n");
        printf("privilege = http://tizen.org/privilege/mediastorage\n");
@@ -638,12 +636,13 @@ void __test_privilege_info_get_privilege_type()
        type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_MAX;
 
        __print_line();
+       __tcinfo(goal, POS_TC_PREFIX "privilege_info_get_privilege_type");
        printf("uid = 5001\n");
        printf("pkgid = org.test.webapp_4\n");
        printf("privilege = http://tizen.org/privilege/call\n");
-       printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY\n");
+       printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL\n");
        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) {
+       if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL) {
                success_cnt++;
                printf_green("success\n");
        } else {
@@ -654,12 +653,13 @@ void __test_privilege_info_get_privilege_type()
        type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_MAX;
 
        __print_line();
+       __tcinfo(goal, POS_TC_PREFIX "privilege_info_get_privilege_type");
        printf("uid = 5001\n");
        printf("pkgid = org.test.webapp_5\n");
        printf("privilege = http://tizen.org/privilege/mediastorage\n");
-       printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_PRIVACY\n");
+       printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL\n");
        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) {
+       if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL) {
                success_cnt++;
                printf_green("success\n");
        } else {
@@ -681,8 +681,9 @@ void __test_privilege_info_get_privilege_type()
 
        __print_line();
        printf("check privilege type\n");
-       ret = privilege_info_get_privilege_type(0, "org.tizen.testtest", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/yyyyy", &type);
+       __tcinfo(goal, NEG_TC_PREFIX "privilege_info_get_privilege_type");
        printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_BLACKLIST\n");
+       ret = privilege_info_get_privilege_type(0, "org.tizen.testtest", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/yyyyy", &type);
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_BLACKLIST) {
                success_cnt++;
                printf_green("success\n");
@@ -699,11 +700,12 @@ void __test_privilege_info_get_privilege_type()
        type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_MAX;
 
        __print_line();
+       __tcinfo(goal, NEG_TC_PREFIX "privilege_info_get_privilege_type");
        printf("uid = 5001\n");
        printf("pkgid = NULL\n");
        printf("privilege = \n");
-       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");
+       ret = privilege_info_get_privilege_type(5001, NULL, PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, NULL, &type);
        if (ret == PRVMGR_ERR_INVALID_PARAMETER) {
                success_cnt++;
                printf_green("success\n");
@@ -715,11 +717,12 @@ void __test_privilege_info_get_privilege_type()
        type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_MAX;
 
        __print_line();
+       __tcinfo(goal, POS_TC_PREFIX "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", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/yyyyy", &type);
        printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL\n");
+       ret = privilege_info_get_privilege_type(5001, "org.tizen.testtest", PRVMGR_PACKAGE_TYPE_WRT, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, "http://tizen.org/privilege/yyyyy", &type);
        if (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL) {
                success_cnt++;
                printf_green("success\n");
@@ -754,57 +757,28 @@ void __test_privilege_info_is_user_settable()
        int ret = 0;
 
        __print_line();
+       __tcinfo(goal, POS_TC_PREFIX "__test_privilege_info_is_user_settable");
+       printf("privacy = http://tizen.org/privacy/camera\n");
        printf("pkgid = ise-default\n");
-       printf("privacy = http://tizen.org/privacy/location\n");
-       ret = privilege_info_is_user_settable("ise-default", "http://tizen.org/privacy/location");
+       ret = privilege_info_is_user_settable("ise-default", "http://tizen.org/privacy/camera");
        printf("is user settable\n");
-       if (ret == 1) {
-               success_cnt++;
-               printf_green("success\n");
-       } else {
-               fail_cnt++;
-               printf_red("fail. ret = %d\n", ret);
-       }
+       __check_the_return_code('m', PRVMGR_ERR_NONE, ret);
 
        __print_line();
+       __tcinfo(goal, NEG_TC_PREFIX "__test_privilege_info_is_user_settable");
        printf("pkgid = ise-default\n");
-       printf("privacy = http://tizen.org/privacy/camera\n");
-       ret = privilege_info_is_user_settable("ise-default", "http://tizen.org/privacy/camera");
-       printf("is not user settable\n");
-       if ((DISABLE_ASKUSER && ret == 1) || (ENABLE_ASKUSER && ret == 0)) {
-               success_cnt++;
-               printf_green("success. ret = %d\n", ret);
-       } else {
-               fail_cnt++;
-               printf_red("fail. ret = %d\n", ret);
-       }
-
-       __print_line();
-       printf("pkgid = org.tizen.testtest\n");
-       printf("privacy = http://tizen.org/privacy/userhistory\n");
-       ret = privilege_info_is_user_settable("org.tizen.testtest", "http://tizen.org/privacy/userhistory");
-       printf("is user settable\n");
-       if (ret == 1) {
-               success_cnt++;
-               printf_green("success\n");
-       } else {
-               fail_cnt++;
-               printf_red("fail. ret = %d\n", ret);
-       }
+       printf("privacy = http://tizen.org/privacy/location\n");
+       ret = privilege_info_is_user_settable("ise-default", "http://tizen.org/privacy/location");
+       printf("is not user settable, %d \n", ret);
+       __check_the_return_code('n', 1, ret);
 
        __print_line();
+       __tcinfo(goal, NEG_TC_PREFIX "__test_privilege_info_is_user_settable");
        printf("pkgid = org.tizen.testtest\n");
        printf("privacy = http://tizen.org/privacy/xxxxx\n");
        ret = privilege_info_is_user_settable("org.tizen.testtest", "http://tizen.org/privacy/xxxxx");
        printf("error must be occurred\n");
-       if (ret == -1) {
-               success_cnt++;
-               printf_green("success\n");
-       } else {
-               fail_cnt++;
-               printf_red("fail. ret = %d\n", ret);
-       }
-       __print_line();
+       __check_the_return_code('m', PRVMGR_ERR_INVALID_PARAMETER, ret);
 }
 
 void __test_privilege_info_get_same_privacy_grouped_privileges()
@@ -813,27 +787,16 @@ void __test_privilege_info_get_same_privacy_grouped_privileges()
        GList *privilege_list = NULL;
 
        __print_line();
+       __tcinfo(goal, POS_TC_PREFIX "privilege info get same privacy grouped privileges is privacy");
        printf("privilege = http://tizen.org/privilege/account.read\n");
-       ret = privilege_info_get_same_privacy_grouped_privileges("http://tizen.org/privilege/account.read", &privilege_list);
 
-       if (ENABLE_ASKUSER) {
-               printf("privacy = account\n");
-               if (ret == PRVMGR_ERR_NONE && privilege_list != NULL) {
-                       success_cnt++;
-                       printf_green("success\n");
-               } else {
-                       fail_cnt++;
-                       printf_red("failed. ret = %s\n", __get_result_string('m', ret));
-               }
+       ret = privilege_info_get_same_privacy_grouped_privileges("http://tizen.org/privilege/account.read", &privilege_list);
+       if (ret == PRVMGR_ERR_NONE && privilege_list != NULL) {
+               success_cnt++;
+               printf_green("success\n");
        } else {
-               printf("not privacy\n");
-               if (ret == PRVMGR_ERR_NONE && privilege_list == NULL) {
-                       success_cnt++;
-                       printf_green("success\n");
-               } else {
-                       fail_cnt++;
-                       printf_red("failed. ret = %s\n", __get_result_string('m', ret));
-               }
+               fail_cnt++;
+               printf_red("failed. ret = %s\n", __get_result_string('m', ret));
        }
 
        if (privilege_list != NULL) {
@@ -843,8 +806,8 @@ void __test_privilege_info_get_same_privacy_grouped_privileges()
        }
 
        __print_line();
+       __tcinfo(goal, NEG_TC_PREFIX "privilege info get same privacy grouped privileges not privacy");
        printf("privilege = http://tizen.org/privilege/internet\n");
-       printf("not privacy\n");
 
        ret = privilege_info_get_same_privacy_grouped_privileges("http://tizen.org/privilege/internet", &privilege_list);
        if (ret == PRVMGR_ERR_NONE && privilege_list == NULL) {
@@ -862,8 +825,8 @@ void __test_privilege_info_get_same_privacy_grouped_privileges()
        }
 
        __print_line();
+       __tcinfo(goal, NEG_TC_PREFIX "privilege info get same privacy grouped privileges not privacy");
        printf("privilege = http://tizen.org/privilege/internal/buxton/message.read\n");
-       printf("not privacy\n");
 
        ret = privilege_info_get_same_privacy_grouped_privileges("http://tizen.org/privilege/internal/buxton/message.read", &privilege_list);
        if (ret == PRVMGR_ERR_NONE && privilege_list == NULL) {