Revise testsuit: Add missing testcase and add util header for frequently used functions

[platform/core/security/privilege-checker.git] / test / tc-privilege-manager.c

diff --git a/test/tc-privilege-manager.c b/test/tc-privilege-manager.c
index 50a2bbb..791ee3f 100755 (executable)
--- a/test/tc-privilege-manager.c
+++ b/test/tc-privilege-manager.c
@@ -1,201 +1,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 #include <glib.h>
 #include <privilege_manager.h>
+#include "tc-common.h"
 
-#define BRIGHTNESS 0
-#define RED 31
-#define GREEN 32
-#define YELLOW 33
-#define BLUE 34
-#define WHITE 37
-#define BG_BLACK 40
-#define ShowErrorMsg(condition, error_message, result, ...) \
-       __print_result(__get_result_string(result)); \
-       if (condition) { \
-               __print_error_message(error_message); \
-               free(error_message); \
-               error_message = NULL; \
-       }
-
-static void __change_color_to_red()
-{
-       printf("%c[%d;%dm", 0x1B, BRIGHTNESS, RED);
-}
-
-static void __change_color_to_green()
-{
-       printf("%c[%d;%dm", 0x1B, BRIGHTNESS, GREEN);
-}
-
-static void __change_color_to_yellow()
-{
-       printf("%c[%d;%dm", 0x1B, BRIGHTNESS, YELLOW);
-}
-
-static void __change_color_to_blue()
-{
-       printf("%c[%d;%dm", 0x1B, BRIGHTNESS, BLUE);
-}
-
-static void __change_color_to_origin()
-{
-       printf("%c[%dm", 0x1B, 0);
-}
-
-static void __change_to_bold_red()
-{
-       printf("%c[%dm%c[%dm", 0x1B, 1, 0x1B, RED);
-}
-
-static void __change_to_bold_yellow()
-{
-       printf("%c[%dm%c[%dm", 0x1B, 1, 0x1B, YELLOW);
-}
-
-static int fail_cnt = 0;
-static int success_cnt = 0;
-GList *privilege_list = NULL;
-
-static const char *__get_result_string(privilege_manager_error_e ret)
-{
-       if (ret == PRVMGR_ERR_NONE)
-               return "PRVMGR_ERR_NONE";
-       else if (ret == PRVMGR_ERR_INVALID_PRIVILEGE)
-               return "PRVMGR_ERR_INVALID_PRIVILEGE";
-       else if (ret == PRVMGR_ERR_INVALID_PARAMETER)
-               return "PRVMGR_ERR_INVALID_PARAMETER";
-       else if (ret == PRVMGR_ERR_INTERNAL_ERROR)
-               return "PRVMGR_ERR_INTERNAL_ERROR";
-       else if (ret == PRVMGR_ERR_USING_BANNED_PRIVILEGE)
-               return "PRVMGR_ERR_USING_BANNED_PRIVILEGE";
-
-       return "FAIL";
-}
-static void __print_error_message(char *error_message)
-{
-       char *token = NULL;
-       char *temp = strdup(error_message);
-       char *save = NULL;
-
-       char err_type[256] = { 0, };
-
-       if (strstr(error_message, "DEPRECATED") != NULL)
-               strncat(err_type, "PRVMGR_ERR_DEPRECATED_PRIVILEGE ", strlen("PRVMGR_ERR_DEPRECATED_PRIVILEGE "));
-
-       if (strstr(error_message, "NO_EXIST") != NULL)
-               strncat(err_type, "PRVMGR_ERR_NO_EXIST_PRIVILEGE ", strlen("PRVMGR_ERR_NO_EXIST_PRIVILEGE "));
-
-       if (strstr(error_message, "MISMATCHED") != NULL)
-               strncat(err_type, "PRVMGR_ERR_MISMACHED_PRIVILEGE_LEVEL ", strlen("PRVMGR_ERR_MISMACHED_PRIVILEGE_LEVEL "));
-
-       if (strstr(error_message, "INVALID_PARAMETER") != NULL)
-               strncat(err_type, "PRVMGR_ERR_INVALID_PARAMETER ", strlen("PRVMGR_ERR_INVALID_PARAMETER "));
-
-       if (strstr(error_message, "BANNED") != NULL)
-               strncat(err_type, "PRVMGR_ERR_USING_BANNED_PRIVILEGE ", strlen("PRVMGR_ERR_USING_BANNED_PRIVILEGE "));
-
-       if (strlen(err_type) == 0) {
-               fail_cnt++;
-               strncat(err_type, "test failed - unknown error type", strlen("test failed - unknown error type "));
-               __change_color_to_red();
-       } else {
-               __change_color_to_blue();
-       }
-       printf("Error Message : %s\n", err_type);
-       __change_color_to_origin();
-
-       token = strtok_r(temp, "|", &save);
-       while (token) {
-               printf("%s\n", token);
-               token = strtok_r(NULL, "|", &save);
-       }
-       printf("\n");
-       free(temp);
-}
-
-typedef enum {
-       goal = 1,
-       cert_level = 2,
-       api_version = 3,
-       pkg_type = 4,
-       expect = 5
-} tcinfo_type_e;
-
-static void __tcinfo(tcinfo_type_e type, char *input_string, ...)
-{
-       switch (type) {
-       case goal:
-               __change_color_to_yellow();
-               printf("TEST >> %s\n\n", input_string);
-               __change_color_to_origin();
-               break;
-       case cert_level:
-               printf("\n- signature level : %s\n\n", input_string);
-               break;
-       case api_version:
-               printf("API VERSION : %s\n", input_string);
-               break;
-       case pkg_type:
-               printf("PACKAGE TYPE : %s\n", input_string);
-               break;
-       case expect:
-               printf("- expected result : %s\n", input_string);
-               break;
-       default:
-               printf("no matching enum for input\n");
-       }
-}
-
-static void __privinfo(char *name, char *level, char *comment)
-{
-       if (level != NULL)
-               printf("|%s| ", level);
-       printf("%s", name);
-       privilege_list = g_list_append(privilege_list, name);
-       if (comment != NULL)
-               printf("   -- %s", comment);
-       printf("\n");
-}
-
-static void __print_result(const char *input_string)
-{
-       printf("- achieved result : %s\n\n", input_string);
-}
-
-static void __print_line()
-{
-       printf("-------------------------------------------------------------------\n");
-}
-
-static void __print_dline()
+void __privilege_manager_get_mapped_privilege_list()
 {
-       printf("===================================================================\n");
-}
-
-static void __print_privilege_list(GList * privilege_list)
-{
-       GList *l;
-       printf("Print mapped privilege list: \n");
-       for (l = privilege_list; l != NULL; l = l->next) {
-               char *privilege_name = (char *)l->data;
-               printf("%s\n", privilege_name);
-       }
-}
+       int ret = 0;
+       GList* mapped_privilege_list = NULL;
+       ret = privilege_manager_get_mapped_privilege_list(api_version, pkg_type, privilege_list, &mapped_privilege_list);
+       /* TBD : Add function to compare mapped list and correct list
+       if (mapped_privilege_list != NULL)
+               __check_mapping_n_count_result(ret, 1, mapped_privilege_list); */
+       __print_result('m', ret);
+       __print_line();
 
-static void __check_verify_result(privilege_manager_error_e expected_result, privilege_manager_error_e result)
-{
-       if (expected_result != result) {
-               __change_to_bold_red();
-               printf(">> test fail\n");
-               fail_cnt++;
-       } else {
-               __change_color_to_green();
-               printf(">> test success\n");
-               success_cnt++;
-       }
-       __change_color_to_origin();
+       gfree(privilege_list);
+       gfree(mapped_privilege_list);
 }
 
 static void __test_privilege_manager_get_mapped_privilege_list()
@@ -203,116 +26,81 @@ static void __test_privilege_manager_get_mapped_privilege_list()
        int ret = 0;
        GList *mapped_privilege_list;
 
-       __tcinfo(goal, "api_version == NULL");
+       /* Test for invalid input parameter */
+       __tcinfo(version_type, NULL, "core");
+       __tcinfo(goal, "!!! WRONG PARAM !!! api_version = NULL");
        __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/camera", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PARAMETER");
-       ret = privilege_manager_get_mapped_privilege_list(NULL, PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_INVALID_PARAMETER, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PARAMETER);
+       __privilege_manager_get_mapped_privilege_list();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
-       __tcinfo(goal, "api_version == 2.3.4.5.1");
+       __tcinfo(version_type, "2.3.4.5.1", "core");
+       __tcinfo(goal, "!!! WRONG PARAM !!! api_version == 2.3.4.5.1");
        __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/camera", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PARAMETER");
-       ret = privilege_manager_get_mapped_privilege_list("2.3.4.5.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_INVALID_PARAMETER, ret);
-       __print_line();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PARAMETER);
+       __privilege_manager_get_mapped_privilege_list();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
-       __tcinfo(goal, "api_version == 2.3");
+       __tcinfo(version_type, "2.3", "core");
+       __tcinfo(goal, "api_version == 2.3, wrong privilege => returned mapping privilege list should be null");
        __privinfo("http://tizen.org/privilege/wrong-privilege-name", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       if (mapped_privilege_list == NULL)
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       ret = privilege_manager_get_mapped_privilege_list(api_version, pkg_type, privilege_list, &mapped_privilege_list);
+       if (mapped_privilege_list == NULL) {
                printf("it's null\n");
-       else
+               __print_result('m', ret);
+       } else {
                printf("it's NOT null\n");
-       __print_privilege_list(mapped_privilege_list);
+               ret = -1;
+               __print_result('m', ret);
+               __print_privilege_list(mapped_privilege_list);
+               gfree(mapped_privilege_list);
+       }
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
-
 #ifdef PROFILE_TYPE_MOBILE
 
        /* 2.3 core - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3");
-       __tcinfo(pkg_type, "core");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "2.3", "core");
 
-       __tcinfo(goal, "normal mapping");
+       __tcinfo(goal, "TC1");
        __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
        __privinfo("http://tizen.org/privilege/camera", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
+       gfree(privilege_list);
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
-
-       __tcinfo(goal, "normal mapping");
+       __tcinfo(goal, "TC2");
        __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/account.write", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/nfc.admin", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/contact.read", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/calendar.read", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/camera", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/vpnservice", NULL, "Valid from 3.0 so it should be ignored");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
+
+       /* 2.4 core - mobile */
+       __tcinfo(version_type, "2.4", "core");
 
        /* 3.0 core - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3");
-       __tcinfo(pkg_type, "core");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "3.0", "core");
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/message.read", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("3.0", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        /* 2.2.1 wrt - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.2.1");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "2.2.1", "wrt");
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
@@ -320,15 +108,13 @@ static void __test_privilege_manager_get_mapped_privilege_list()
        __privinfo("http://tizen.org/privilege/nfc.admin", NULL, NULL);
        __privinfo("http://tizen.org/privilege/contact.read", NULL, NULL);
        __privinfo("http://tizen.org/privilege/calendar.read", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_get_mapped_privilege_list("2.2.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       ret = privilege_manager_get_mapped_privilege_list(api_version, PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/platform", NULL, NULL);
@@ -336,15 +122,13 @@ static void __test_privilege_manager_get_mapped_privilege_list()
        __privinfo("http://tizen.org/privilege/nfc.admin", NULL, NULL);
        __privinfo("http://tizen.org/privilege/contact.write", NULL, NULL);
        __privinfo("http://tizen.org/privilege/datasync", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_get_mapped_privilege_list("2.2.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       ret = privilege_manager_get_mapped_privilege_list(api_version, PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
@@ -352,23 +136,16 @@ static void __test_privilege_manager_get_mapped_privilege_list()
        __privinfo("http://tizen.org/privilege/nfc.p2p", NULL, NULL);
        __privinfo("http://tizen.org/privilege/call", NULL, NULL);
        __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.2.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        /* 2.3 wrt - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "2.3", "wrt");
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
@@ -376,15 +153,13 @@ static void __test_privilege_manager_get_mapped_privilege_list()
        __privinfo("http://tizen.org/privilege/nfc.admin", NULL, NULL);
        __privinfo("http://tizen.org/privilege/contact.read", NULL, NULL);
        __privinfo("http://tizen.org/privilege/calendar.read", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/platform", NULL, NULL);
@@ -392,15 +167,13 @@ static void __test_privilege_manager_get_mapped_privilege_list()
        __privinfo("http://tizen.org/privilege/nfc.admin", NULL, NULL);
        __privinfo("http://tizen.org/privilege/contact.write", NULL, NULL);
        __privinfo("http://tizen.org/privilege/datasync", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
@@ -408,80 +181,75 @@ static void __test_privilege_manager_get_mapped_privilege_list()
        __privinfo("http://tizen.org/privilege/nfc.p2p", NULL, NULL);
        __privinfo("http://tizen.org/privilege/call", NULL, NULL);
        __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/location", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/platform", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        /* 2.4 wrt - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.4");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "2.4", "wrt");
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/location", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/platform", NULL, NULL);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_get_mapped_privilege_list("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
 #endif
 }
 
-static void __test_privilege_manager_verify_privilege()
+void __privilege_manager_verify_privilege()
 {
-       char *error_message = NULL;
+       char* error_message = NULL;
        int ret = 0;
+       ret = privilege_manager_verify_privilege(api_version, pkg_type, privilege_list, visibility, &error_message);
+       __print_result('m', ret);
+       ShowErrorMsg(error_message != NULL, error_message, ret);
+       __print_line();
+
+       gfree(privilege_list);
+}
 
+static void __test_privilege_manager_verify_privilege()
+{
+       __tcinfo(version_type, NULL, "core");
        __tcinfo(goal, "api_version == NULL");
        __privinfo("http://tizen.org/privilege/account.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/account.write", "Public", NULL);
@@ -490,15 +258,10 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/calendar.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/systemsettings", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PARAMETER");
-       ret = privilege_manager_verify_privilege(NULL, PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PARAMETER, ret);
-       __print_line();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PARAMETER);
+       __privilege_manager_verify_privilege();
 
+       __tcinfo(version_type, "2.3.4.2.1", "core");
        __tcinfo(goal, "invalid api_version == 2.3.4.2.1");
        __privinfo("http://tizen.org/privilege/account.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/account.write", "Public", NULL);
@@ -507,16 +270,10 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/calendar.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/systemsettings", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PARAMETER");
-       ret = privilege_manager_verify_privilege("2.3.4.2.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PARAMETER, ret);
-       __print_line();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
-
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PARAMETER);
+       __privilege_manager_verify_privilege();
 
+       __tcinfo(version_type, "2.", "core");
        __tcinfo(goal, "invalid api_version == 2.");
        __privinfo("http://tizen.org/privilege/account.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/account.write", "Public", NULL);
@@ -525,15 +282,10 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/calendar.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/systemsettings", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PARAMETER");
-       ret = privilege_manager_verify_privilege("2.", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PARAMETER, ret);
-       __print_line();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PARAMETER);
+       __privilege_manager_verify_privilege();
 
+       __tcinfo(version_type, "a.b", "core");
        __tcinfo(goal, "invalid api_version == a.b");
        __privinfo("http://tizen.org/privilege/account.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/account.write", "Public", NULL);
@@ -542,24 +294,13 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/calendar.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/systemsettings", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PARAMETER");
-       ret = privilege_manager_verify_privilege("a.b", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PARAMETER, ret);
-       __print_line();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PARAMETER);
+       __privilege_manager_verify_privilege();
 
 #ifdef PROFILE_TYPE_MOBILE
 
        /* 2.3 core - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3.0");
-       __tcinfo(pkg_type, "core");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "2.3", "core");
 
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public");
        __privinfo("http://tizen.org/privilege/account.read", "Public", NULL);
@@ -580,14 +321,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/keymanager", "Public", NULL);
        __privinfo("http://tizen.org/privilege/systemsettings", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.0", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform");
        __privinfo("http://tizen.org/privilege/bookmark.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bluetooth.admin", "Platform", NULL);
@@ -600,14 +336,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/telephony.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/web-history.admin", "Platform", NULL);
        __tcinfo(cert_level, "platform");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/account.readd", NULL, NULL);
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
@@ -616,14 +347,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/healthinfo", NULL, "Valid from 2.3.1");
        __privinfo("http://tizen.org/privilege/keygrab", NULL, "Valid from 2.4");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, !!! Level=Mismatched !!!");
        __privinfo("http://tizen.org/privilege/bookmark.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bluetooth.admin", "Platform", NULL);
@@ -634,22 +360,12 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/nfc.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.admin", "Platform", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       printf("\n");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.3.1 core - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3.1");
-       __tcinfo(pkg_type, "core");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(version_type, "2.3.1", "core");
+
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public");
        __privinfo("http://tizen.org/privilege/account.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/account.write", "Public", NULL);
@@ -671,14 +387,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/widget.viewer", "Public", "Valid from 2.3.1");
        __privinfo("http://tizen.org/privilege/secureelement", "Public", "Valid from 2.3.1");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform");
        __privinfo("http://tizen.org/privilege/bookmark.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bluetooth.admin", "Platform", NULL);
@@ -692,14 +403,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/web-history.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/reboot", "Platform", "Valid from 2.3.1");
        __tcinfo(cert_level, "platform");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/account.readd", NULL, NULL);
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
@@ -708,14 +414,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/ime", NULL, "Valid from 2.4");
        __privinfo("http://tizen.org/privilege/keygrab", NULL, "Valid from 2.4");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!!");
        __privinfo("http://tizen.org/privilege/email.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Platform", NULL);
@@ -727,33 +428,18 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/web-history.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/reboot", "Platform", "Valid from 2.3.1");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! DEPRECATED !!!");
        __privinfo("http://tizen.org/privilege/systemsettings", NULL, "Deprecated from 2.3.1");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       printf("\n");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.4 core - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.4");
-       __tcinfo(pkg_type, "core");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(version_type, "2.4", "core");
+
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public");
        __privinfo("http://tizen.org/privilege/internet", "Public", NULL);
        __privinfo("http://tizen.org/privilege/keymanager", "Public", NULL);
@@ -767,47 +453,32 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/mapservice", "Public", "Valid from 2.4");
        __privinfo("http://tizen.org/privilege/mediacontroller.client", "Public", "Valid from 2.4");
        __privinfo("http://tizen.org/privilege/mediacontroller.server", "Public", "Valid from 2.4");
-       __privinfo("http://tizen.org/privilege/minicontrol.provider", "Public", "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/minicontrol.provider", "Public", "Valid from 2.4 and deprecated from 3.0");
        __privinfo("http://tizen.org/privilege/mediahistory.read", "Public", "Valid from 2.4");
        __privinfo("http://tizen.org/privilege/packagemanager.clearcache", "Public", "Valid from 2.4");
        __privinfo("http://tizen.org/privilege/systemmonitor", "Public", "Valid from 2.4");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform");
        __privinfo("http://tizen.org/privilege/web-history.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/reboot", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/inputgenerator", "Platform", "Valid from 2.4");
        __privinfo("http://tizen.org/privilege/keygrab", "Platform", "Valid from 2.4");
-       __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(cert_level, "platform");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/account.readd", NULL, NULL);
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/tizen/privilege/internet", NULL, NULL);
        __privinfo("http://tizen.org/privilege/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", NULL, NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!!");
        __privinfo("http://tizen.org/privilege/telephony.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/web-history.admin", "Platform", NULL);
@@ -815,132 +486,143 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/inputgenerator", "Platform", "Valid from 2.4");
        __privinfo("http://tizen.org/privilege/keygrab", "Platform", "Valid from 2.4");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! DEPRECATED !!!");
        __privinfo("http://tizen.org/privilege/systemsettings", NULL, "Deprecated from 2.3.1");
        __privinfo("http://tizen.org/privilege/keymanager.admin", NULL, "Deprecated from 2.4");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       printf("\n");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       /* 3.0 core - mobile */
+       __tcinfo(version_type, "3.0", "core");
+
+       __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public");
+       __privinfo("http://tizen.org/privilege/internet", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/healthinfo", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/widget.viewer", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/secureelement", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/apphistory.read", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/appmanager.kill.bgapp", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/ime", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/imemanager", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mapservice", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mediacontroller.client", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mediacontroller.server", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mediahistory.read", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/packagemanager.clearcache", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/systemmonitor", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/vpnservice", "Public", "Valid from 3.0, Mobile profile only");
+       __privinfo("http://tizen.org/privilege/d2d.datasharing", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/location.coarse", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/use_ir", "Public", "Valid from 3.0");
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform");
+       __privinfo("http://tizen.org/privilege/web-history.admin", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/reboot", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/inputgenerator", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/keygrab", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/vpnservice.admin", "Platform", "Valid from 3.0, Mobile profile only");
+       __tcinfo(cert_level, "platform");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! NAME NOT EXIST !!!");
+       __privinfo("http://tizen.org/privilege/account.readd", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
+       __privinfo("http://tizen.org/tizen/privilege/internet", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/internal/default/public", NULL, "Internal Privilege");
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! LEVEL MISMATCHED !!!");
+       __privinfo("http://tizen.org/privilege/telephony.admin", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/web-history.admin", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/reboot", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/inputgenerator", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/keygrab", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/vpnservice.admin", "Platform", "Mobile profile only");
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! DEPRECATED !!!");
+       __privinfo("http://tizen.org/privilege/systemsettings", NULL, "Deprecated from 2.3.1");
+       __privinfo("http://tizen.org/privilege/keymanager.admin", NULL, "Deprecated from 2.4");
+       __privinfo("http://tizen.org/privilege/keymanager", NULL, "Deprecated from 3.0");
+       __privinfo("http://tizen.org/privilege/minicontrol.provider", NULL, "Deprecated from 3.0");
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.2.1 Web - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.2.1");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(version_type, "2.2.1", "wrt");
+
        __tcinfo(goal, "!!! NAME NOT EXIST !!! -- Under 2.3.1, Undefined privileges on web apps are ignored");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
        __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.2.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED -- with public signatured certificate!!!");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.2.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED -- with partner signatured certificate!!!");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.2.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.3 Web - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(version_type, "2.3", "wrt");
+
        __tcinfo(goal, "!!! NAME NOT EXIST !!! -- Under 2.3.1, Undefined privileges on web apps are ignored");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
        __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED -- with public signatured certificate!!!");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED -- with partner signatured certificate!!!");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.3.1 Web - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3.1");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(version_type, "2.3.1", "wrt");
+
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public ");
        __privinfo("http://tizen.org/privilege/bluetooth.gap", "Public", NULL);
        __privinfo("http://tizen.org/privilege/bluetooth.health", "Public", NULL);
@@ -968,14 +650,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/telephony", "Public", NULL);
        __privinfo("http://tizen.org/privilege/websetting", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Partner ");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
@@ -990,14 +667,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/nfc.admin", "Public", NULL);
        __privinfo("http://tizen.org/privilege/notification", "Public", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform ");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
@@ -1015,14 +687,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/nfc.admin", "Public", NULL);
        __privinfo("http://tizen.org/privilege/notification", "Public", NULL);
        __tcinfo(cert_level, "platform");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
@@ -1030,62 +697,37 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
        __privinfo("http://tizen.org/privilege/ime", NULL, "Valid from 2.4");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! DEPRECATED !!!");
        __privinfo("http://tizen.org/privilege/calendar", NULL, "Deprecated from 2.0");
        __privinfo("http://tizen.org/privilege/mediacontent", NULL, "Deprecated from 2.0");
        __privinfo("http://tizen.org/privilege/systemmanager", NULL, "Deprecated from 2.3.1");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with public signatured certificate");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with partner signatured certificate");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.4 Web - mobile */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.4");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(version_type, "2.4", "wrt");
+
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public ");
        __privinfo("http://tizen.org/privilege/alarm", "Public", NULL);
        __privinfo("http://tizen.org/privilege/application.info", "Public", NULL);
@@ -1115,14 +757,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/mediacontroller.client", "Public", "Valid from 2.4");
        __privinfo("http://tizen.org/privilege/mediacontroller.server", "Public", "Valid from 2.4");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Partner ");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
@@ -1137,14 +774,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/nfc.admin", "Public", NULL);
        __privinfo("http://tizen.org/privilege/notification", "Public", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform ");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
@@ -1162,28 +794,18 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/nfc.admin", "Public", NULL);
        __privinfo("http://tizen.org/privilege/notification", "Public", NULL);
        __tcinfo(cert_level, "platform");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
        __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! DEPRECATED !!!");
        __privinfo("http://tizen.org/privilege/systemmanager", NULL, "Deprecated from 2.3.1");
        __privinfo("http://tizen.org/privilege/bluetooth.admin", NULL, "Deprecated from 2.4");
@@ -1192,79 +814,146 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/bluetooth.health", NULL, "Deprecated from 2.4");
        __privinfo("http://tizen.org/privilege/websetting", NULL, "Deprecated from 2.4");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with public signatured certificate");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with partner signatured certificate");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       /* 3.0 Web - mobile */
+       __tcinfo(version_type, "3.0", "wrt");
+
+       __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public ");
+       __privinfo("http://tizen.org/privilege/alarm", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/application.info", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/calendar.read", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/call", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/callhistory.read", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/contact.write", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/content.read", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/datacontrol.consumer", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/datasync", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/download", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/filesystem.read", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/fullscreen", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/healthinfo", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/internet", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/location", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mediacapture", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/messaging.write", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/nfc.admin", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/notification", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/package.info", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/power", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/telephony", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/bluetooth", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/ime", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/led", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mediacontroller.client", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mediacontroller.server", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/d2d.datasharing", "Public", "Valid from 3.0");
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform ");
+       __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
+       __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
+       __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
+       __privinfo("http://tizen.org/privilege/call", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/content.read", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/datacontrol.consumer", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/internet", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/location", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mediacapture", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/messaging.write", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/nfc.admin", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/notification", "Public", NULL);
+       __tcinfo(cert_level, "platform");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! NAME NOT EXIST !!!");
+       __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! DEPRECATED !!!");
+       __privinfo("http://tizen.org/privilege/systemmanager", NULL, "Deprecated from 2.3.1");
+       __privinfo("http://tizen.org/privilege/bluetooth.admin", NULL, "Deprecated from 2.4");
+       __privinfo("http://tizen.org/privilege/bluetooth.gap", NULL, "Deprecated from 2.4");
+       __privinfo("http://tizen.org/privilege/bluetooth.spp", NULL, "Deprecated from 2.4");
+       __privinfo("http://tizen.org/privilege/bluetooth.health", NULL, "Deprecated from 2.4");
+       __privinfo("http://tizen.org/privilege/websetting", NULL, "Deprecated from 2.4");
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with public signatured certificate");
+       __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
+       __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
+       __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with partner signatured certificate");
+       __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
+       __tcinfo(cert_level, "partner");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* Web - mobile => Test for duplicated privilege history */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "1.0 and 2.4");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
-       __tcinfo(goal, "bluetooth exist at 1.0 and 2.4 -----1.0");
+
+       __tcinfo(goal, "bluetooth exist at 1.0 and 2.4");
+
+       __tcinfo(version_type, "1.0", "wrt");
        __privinfo("http://tizen.org/privilege/bluetooth", NULL, NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("1.0", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
-       __tcinfo(goal, "bluetooth exist at 1.0 and 2.4------2.4");
+       __tcinfo(version_type, "2.3.1", "wrt");
        __privinfo("http://tizen.org/privilege/bluetooth", NULL, NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(version_type, "2.4", "wrt");
+       __privinfo("http://tizen.org/privilege/bluetooth", NULL, NULL);
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
 #endif
 #ifdef PROFILE_TYPE_WEARABLE
 
        /* 2.3.1 core - wearable */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3.1");
-       __tcinfo(pkg_type, "core");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "2.3.1", "core");
 
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public");
        __privinfo("http://tizen.org/privilege/alarm.get", "Public", NULL);
@@ -1284,14 +973,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/telephony", "Public", NULL);
        __privinfo("http://tizen.org/privilege/widget.viewer", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform");
        __privinfo("http://tizen.org/privilege/bluetooth.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Platform", NULL);
@@ -1301,32 +985,23 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/packagemanager.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/telephony.admin", "Platform", NULL);
        __tcinfo(cert_level, "platform");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
        __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/contact.read", NULL, "Mobile profile only until 2.4");
+       __privinfo("http://tizen.org/privilege/contact.read", NULL, "Mobile profile only until 3.0");
        __privinfo("http://tizen.org/privilege/calendar.read", "Public", "Mobile profile only");
        __privinfo("http://tizen.org/privilege/calendar.write", "Public", "Mobile profile only");
-       __privinfo("http://tizen.org/privilege/ime", NULL, "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/ime", NULL, "Valid from 3.0");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!!");
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/keymanager.admin", "Platform", NULL);
@@ -1336,69 +1011,47 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/telephony.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/reboot", "Platform", "Valid from 2.3.1");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       printf("\n");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
-
-       /* 2.4 core - wearable */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.4");
-       __tcinfo(pkg_type, "core");
-       __change_color_to_origin();
-       __print_dline();
+       /* 3.0 core - wearable */
+       __tcinfo(version_type, "3.0", "core");
 
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public");
-       __privinfo("http://tizen.org/privilege/account.read", "Public", "Valid from 2.4");
-       __privinfo("http://tizen.org/privilege/account.write", "Public", "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/account.read", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/account.write", "Public", "Valid from 3.0");
        __privinfo("http://tizen.org/privilege/alarm.get", "Public", NULL);
        __privinfo("http://tizen.org/privilege/bluetooth", "Public", NULL);
        __privinfo("http://tizen.org/privilege/call", "Public", NULL);
        __privinfo("http://tizen.org/privilege/callhistory.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/callhistory.write", "Public", NULL);
-       __privinfo("http://tizen.org/privilege/contact.read", "Public", "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/contact.read", "Public", "Valid from 3.0");
        __privinfo("http://tizen.org/privilege/display", "Public", NULL);
        __privinfo("http://tizen.org/privilege/download", "Public", NULL);
        __privinfo("http://tizen.org/privilege/display", "Public", NULL);
        __privinfo("http://tizen.org/privilege/internet", "Public", NULL);
        __privinfo("http://tizen.org/privilege/mapservice", "Public", "Valid from 2.4");
-       __privinfo("http://tizen.org/privilege/mediacontroller.client", "Public", "Valid from 2.4");
-       __privinfo("http://tizen.org/privilege/minicontrol.provider", "Public", "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/mediacontroller.client", "Public", "Valid from 3.0");
        __privinfo("http://tizen.org/privilege/nfc", "Public", NULL);
-       __privinfo("http://tizen.org/privilege/packagemanager.clearcache", "Public", "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/packagemanager.clearcache", "Public", "Valid from 3.0");
        __privinfo("http://tizen.org/privilege/telephony", "Public", NULL);
        __privinfo("http://tizen.org/privilege/widget.viewer", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform");
        __privinfo("http://tizen.org/privilege/bluetooth.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Platform", NULL);
-       __privinfo("http://tizen.org/privilege/keygrab", "Platform", "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/keygrab", "Platform", "Valid from 3.0");
        __privinfo("http://tizen.org/privilege/systemsettings.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/nfc.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/telephony.admin", "Platform", NULL);
        __tcinfo(cert_level, "platform");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
@@ -1407,99 +1060,60 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/calendar.read", "Public", "Mobile profile only");
        __privinfo("http://tizen.org/privilege/calendar.write", "Public", "Mobile profile only");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!!");
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/systemsettings.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/nfc.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.admin", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/telephony.admin", "Platform", NULL);
-       __privinfo("http://tizen.org/privielge/keygrab", "Platform", "Valid from 2.4");
+       __privinfo("http://tizen.org/privielge/keygrab", "Platform", "Valid from 3.0");
        __privinfo("http://tizen.org/privilege/reboot", "Platform", "Valid from 2.3.1");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! DEPRECATED !!!");
-       __privinfo("http://tizen.org/privilege/keymanager.admin", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/keymanager.admin", "Platform", "Deprecated from 3.0");
+       __privinfo("http://tizen.org/privilege/keymanager", "Public", "Deprecated from 3.0");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       printf("\n");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.3 Web - wearable */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(version_type, "2.3", "wrt");
+
        __tcinfo(goal, "!!! NAME NOT EXIST !!! -- Under 2.3.1, Undefined privileges on web apps are ignored");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
        __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED -- with public signatured certificate!!!");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED -- with partner signatured certificate!!!");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.3.1 Web - wearable */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3.1");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
-
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       __tcinfo(version_type, "2.3.1", "wrt");
+
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public ");
        __privinfo("http://tizen.org/privilege/audiorecorder", "Public", "Wearable profile only");
        __privinfo("http://tizen.org/privilege/camera", "Public", "Wearable profile only");
@@ -1523,14 +1137,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/power", "Public", NULL);
        __privinfo("http://tizen.org/privilege/telephony", "Public", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Partner ");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
@@ -1538,14 +1147,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/content.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/internet", "Public", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform ");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
@@ -1557,74 +1161,44 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/location", "Public", NULL);
        __privinfo("http://tizen.org/privilege/mediacapture", "Public", NULL);
        __tcinfo(cert_level, "platform");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
        __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
        __privinfo("http://tizen.org/privilege/contact.read", NULL, "Mobile profile only");
-       __privinfo("http://tizen.org/privilege/ime", NULL, "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/ime", NULL, "Valid from 3.0");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! DEPRECATED !!!");
        __privinfo("http://tizen.org/privilege/systemmanager", NULL, "Deprecated from 2.3.1");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with public signatured certificate");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with partner signatured certificate");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       /* 2.4 Web - wearable */
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.4");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
+       /* 3.0 Web - wearable */
+       __tcinfo(version_type, "3.0", "wrt");
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public ");
        __privinfo("http://tizen.org/privilege/audiorecorder", "Public", "Wearable profile only");
        __privinfo("http://tizen.org/privilege/camera", "Public", "Wearable profile only");
@@ -1639,19 +1213,16 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/package.info", "Public", NULL);
        __privinfo("http://tizen.org/privilege/power", "Public", NULL);
        __privinfo("http://tizen.org/privilege/telephony", "Public", NULL);
-       __privinfo("http://tizen.org/privilege/bluetooth", "Public", "Valid from 2.4");
-       __privinfo("http://tizen.org/privilege/ime", "Public", "Valid from 2.4");
-       __privinfo("http://tizen.org/privilege/mediacontroller.client", "Public", "Valid from 2.4");
-       __privinfo("http://tizen.org/privilege/mediacontroller.server", "Public", "Valid from 2.4");
+       __privinfo("http://tizen.org/privilege/bluetooth", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/ime", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/led", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/mediacontroller.client", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/mediacontroller.server", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/d2d.datasharing", "Public", "Valid from 3.0");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Partner ");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
@@ -1659,14 +1230,9 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/content.read", "Public", NULL);
        __privinfo("http://tizen.org/privilege/internet", "Public", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform ");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
@@ -1678,128 +1244,80 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/location", "Public", NULL);
        __privinfo("http://tizen.org/privilege/mediacapture", "Public", NULL);
        __tcinfo(cert_level, "platform");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!!");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
        __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
        __privinfo("http://tizen.org/privilege/contact.read", NULL, "Mobile profile only");
+       __privinfo("http://tizen.org/privilege/vpnservice", NULL, "Mobile profile only");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
        __tcinfo(goal, "!!! DEPRECATED !!!");
        __privinfo("http://tizen.org/privilege/systemmanager", NULL, "Deprecated from 2.3.1");
-       __privinfo("http://tizen.org/privilege/bluetooth.gap", NULL, "Deprecated from 2.4");
-       __privinfo("http://tizen.org/privilege/bluetooth.spp", NULL, "Deprecated from 2.4");
-       __privinfo("http://tizen.org/privilege/bluetooth.health", NULL, "Deprecated from 2.4");
-       __privinfo("http://tizen.org/privilege/bluetooth.admin", NULL, "Deprecated from 2.4");
+       __privinfo("http://tizen.org/privilege/bluetooth.gap", NULL, "Deprecated from 3.0");
+       __privinfo("http://tizen.org/privilege/bluetooth.spp", NULL, "Deprecated from 3.0");
+       __privinfo("http://tizen.org/privilege/bluetooth.health", NULL, "Deprecated from 3.0");
+       __privinfo("http://tizen.org/privilege/bluetooth.admin", NULL, "Deprecated from 3.0");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with public signatured certificate");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with partner signatured certificate");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 #endif
 #ifdef PROFILE_TYPE_TV
        /* 2.3 Web - TV */
 
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.3");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "2.3", "wrt");
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! NAME NOT EXIST !!! -- Under 2.3.1, Undefined privileges on web apps are ignored");
        __privinfo("http://tizen.org/privilege/XXXXXXXX", NULL, NULL);
        __privinfo("http://tizen.org/privilege/account.writeeeeee", NULL, NULL);
        __privinfo("http://tizen.org/privilege/alarm.gettttttttt", NULL, NULL);
        __privinfo("http://tizen.org/privilege/bluetoothsdfwfvwfdwgwgwgeegw", NULL, NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED -- with public signatured certificate!!!");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/networkbearerselection", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/systemmanager", "Partner", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED -- with partner signatured certificate!!!");
        __privinfo("http://tizen.org/privilege/bluetoothmanager", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/bookmark.read", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
        /* 2.4 Web - TV */
 
-       __print_dline();
-       __change_to_bold_yellow();
-       __tcinfo(api_version, "2.4");
-       __tcinfo(pkg_type, "wrt");
-       __change_color_to_origin();
-       __print_dline();
+       __tcinfo(version_type, "2.4", "wrt");
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Public ");
        __privinfo("http://tizen.org/privilege/alarm", "Public", NULL);
        __privinfo("http://tizen.org/privilege/application.info", "Public", NULL);
@@ -1814,94 +1332,119 @@ static void __test_privilege_manager_verify_privilege()
        __privinfo("http://tizen.org/privilege/tv.window", "Public", "TV profile only");
        __privinfo("http://tizen.org/privilege/tv.inputdevice", "Public", "TV profile only");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Partner ");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform ");
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
+       __tcinfo(cert_level, "platform");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! DEPRECATED !!!");
+       __privinfo("http://tizen.org/privilege/systemmanager", NULL, "Deprecated from 2.3.1");
+       __privinfo("http://tizen.org/privilege/websetting", NULL, "Deprecated from 2.4");
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with public signatured certificate");
+       __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
+       __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with partner signatured certificate");
+       __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PLATFORM, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
+       /* 3.0 Web - TV */
+
+       __tcinfo(version_type, "3.0", "wrt");
+
+       __privinfo("http://tizen.org/privilege/alarm", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/application.info", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/internet", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/mediacapture", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/package.info", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/system", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/telephony", "Public", NULL);
+       __privinfo("http://tizen.org/privilege/tv.audio", "Public", "TV profile only");
+       __privinfo("http://tizen.org/privilege/tv.channel", "Public", "TV profile only");
+       __privinfo("http://tizen.org/privilege/tv.display", "Public", "TV profile only");
+       __privinfo("http://tizen.org/privilege/tv.window", "Public", "TV profile only");
+       __privinfo("http://tizen.org/privilege/tv.inputdevice", "Public", "TV profile only");
+       __privinfo("http://tizen.org/privilege/d2d.datasharing", "Public", "Valid from 3.0");
+       __privinfo("http://tizen.org/privilege/volume.set", "Public", "Valid from 3.0");
+       __tcinfo(cert_level, "public");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Partner ");
+       __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
+       __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
+       __tcinfo(cert_level, "partner");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
+
+       __tcinfo(goal, "Name=OK, Version=OK, Level=OK -- Platform ");
+       __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
+       __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
+       __tcinfo(cert_level, "platform");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! DEPRECATED !!!");
        __privinfo("http://tizen.org/privilege/systemmanager", NULL, "Deprecated from 2.3.1");
        __privinfo("http://tizen.org/privilege/websetting", NULL, "Deprecated from 2.4");
+       __privinfo("http://tizen.org/privilege/keymanager", NULL, "Deprecated from 3.0");
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with public signatured certificate");
        __privinfo("http://tizen.org/privilege/appmanager.certificate", "Partner", NULL);
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __privinfo("http://tizen.org/privilege/appmanager.kill", "Partner", NULL);
        __tcinfo(cert_level, "public");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
        __tcinfo(goal, "!!! LEVEL MISMATCHED !!! -- with partner signatured certificate");
        __privinfo("http://tizen.org/privilege/packagemanager.install", "Platform", NULL);
        __tcinfo(cert_level, "partner");
-       __tcinfo(expect, "PRVMGR_ERR_INVALID_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PARTNER, &error_message);
-       ShowErrorMsg(error_message != NULL, error_message, ret);
-       __check_verify_result(PRVMGR_ERR_INVALID_PRIVILEGE, ret);
-       __print_line();
+       __tcinfo(expect, PRVMGR_ERR_INVALID_PRIVILEGE);
+       __privilege_manager_verify_privilege();
+
 #endif
-       g_list_free(privilege_list);
-       privilege_list = NULL;
 }
 
 int main()
 {
-       __change_color_to_yellow();
-       printf("Test function : privilege_manager_verify_privilege\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_manager_verify_privilege");
        __test_privilege_manager_verify_privilege();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_manager_get_mapped_privilege_list\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_manager_get_mapped_privilege_list");
        __test_privilege_manager_get_mapped_privilege_list();
 
-       __change_color_to_green();
+       __color_to_green();
        printf("Test Complete\n");
        printf("success : %d, ", success_cnt);
-       __change_color_to_red();
+       __color_to_red();
        printf("fail : %d\n", fail_cnt);
-       __change_color_to_origin();
+       __color_to_origin();
 
        return 0;
 }