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

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

diff --git a/capi/include/privilege_db_manager.h b/capi/include/privilege_db_manager.h
index 9ddf244..aaf6cc3 100755 (executable)
--- a/capi/include/privilege_db_manager.h
+++ b/capi/include/privilege_db_manager.h
@@ -80,6 +80,7 @@ int privilege_db_manager_get_black_list(int uid, privilege_db_manager_package_ty
 int privilege_db_manager_set_black_list(int uid, privilege_db_manager_package_type_e pacakge_type, GList *privilege_list);
 int privilege_db_manager_unset_black_list(int uid, privilege_db_manager_package_type_e package_type, GList *privilege_list);
 
+/* Return the number of black-listed privileges in given privilege list */
 int privilege_db_manager_check_black_list(int uid, privilege_db_manager_package_type_e pacakge_type, GList *privilege_list);
 
 #ifdef __cplusplus

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7edf76a..b3a372b 100755 (executable)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,17 +2,20 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(PACKAGE_NAME tc-privilege-checker)
 PROJECT(${PACKAGE_NAME})
 
+SET(TC_COMMON tc-common)
 SET(TC1_NAME tc-privilege-db-manager)
 SET(TC2_NAME tc-privilege-manager)
 SET(TC3_NAME tc-privilege-info)
 SET(TC4_NAME tc-privilege-black-list)
 
-SET(TC1_SRCS ${TC1_NAME}.c)
-SET(TC2_SRCS ${TC2_NAME}.c)
-SET(TC3_SRCS ${TC3_NAME}.c)
-SET(TC4_SRCS ${TC4_NAME}.c)
+SET(TC_COMMON_SRCS ${TC_COMMON}.c)
+SET(TC1_SRCS ${TC1_NAME}.c ${TC_COMMON_SRCS})
+SET(TC2_SRCS ${TC2_NAME}.c ${TC_COMMON_SRCS})
+SET(TC3_SRCS ${TC3_NAME}.c ${TC_COMMON_SRCS})
+SET(TC4_SRCS ${TC4_NAME}.c ${TC_COMMON_SRCS})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/capi/include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test)
 
 IF("${PROFILE_TYPE}" STREQUAL "WEARABLE")
     ADD_DEFINITIONS("-DPROFILE_TYPE_WEARABLE")

diff --git a/test/tc-common.c b/test/tc-common.c
new file mode 100755 (executable)
index 0000000..8e435c1
--- /dev/null
+++ b/test/tc-common.c
@@ -0,0 +1,252 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <glib.h>
+#include <tc-common.h>
+
+/*** Color section ***/
+void __color_to_red()
+{
+       printf("%c[%d;%dm", 0x1B, BRIGHTNESS, RED);
+}
+void __color_to_green()
+{
+       printf("%c[%d;%dm", 0x1B, BRIGHTNESS, GREEN);
+}
+void __color_to_yellow()
+{
+       printf("%c[%d;%dm", 0x1B, BRIGHTNESS, YELLOW);
+}
+void __color_to_blue()
+{
+       printf("%c[%d;%dm", 0x1B, BRIGHTNESS, BLUE);
+}
+void __color_to_origin()
+{
+       printf("%c[%dm", 0x1B, 0);
+}
+void __color_to_bold_red()
+{
+       printf("%c[%dm%c[%dm", 0x1B, 1, 0x1B, RED);
+}
+void __color_to_bold_yellow()
+{
+       printf("%c[%dm%c[%dm", 0x1B, 1, 0x1B, YELLOW);
+}
+
+/* error enum to string */
+char* __get_result_string(char type, int ret)
+{
+       switch (type) {
+       case 'm':
+               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";
+               break;
+       case 'd':
+               if (ret == PRIVILEGE_DB_MANAGER_ERR_NONE)
+                       return "PRIVILEGE_DB_MANAGER_ERR_NONE";
+               else if (ret == PRIVILEGE_DB_NO_EXIST_RESULT)
+                       return "PRIVILEGE_DB_NO_EXIST_RESULT";
+               else if (ret == PRIVILEGE_DB_MANAGER_ERR_CONNECTION_FAIL)
+                       return "PRIVILEGE_DB_MANAGER_ERR_CONNECTION_FAIL";
+               else if (ret == PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY)
+                       return "PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY";
+               else if (ret == PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY)
+                       return "PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY";
+               else if (ret == PRIVILEGE_DB_MANAGER_ERR_INVALID_TYPE)
+                       return "PRIVILEGE_DB_MANAGER_ERR_INVALID_TYPE";
+               else if (ret == PRIVILEGE_DB_MANAGER_ERR_DB_BUSY_FAIL)
+            return "PRIVILEGE_DB_MANAGER_ERR_DB_BUSY_FAIL";
+               else if (ret == PRIVILEGE_DB_MANAGER_ERR_DB_CONSTRAINT_FAIL)
+            return "PRIVILEGE_DB_MANAGER_ERR_DB_CONSTRAINT_FAIL";
+               else if (ret == PRIVILEGE_DB_MANAGER_ERR_DB_FULL_FAIL)
+            return "PRIVILEGE_DB_MANAGER_ERR_DB_FULL_FAIL";
+               else if (ret == PRIVILEGE_DB_MANAGER_ERR_DB_UPDATE_FAIL)
+            return "PRIVILEGE_DB_MANAGER_ERR_DB_UPDATE_FAIL";
+               break;
+       default:
+               break;
+       }
+
+       return "FAIL";
+}
+
+/* shows error_message returned by privilege_manager_verify_privilege() */
+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 "));
+               __color_to_red();
+       } else {
+               __color_to_blue();
+       }
+       printf("\nError Message : %s\n", err_type);
+       __color_to_origin();
+
+       token = strtok_r(temp, "|", &save);
+       while (token) {
+               printf("%s\n", token);
+               token = strtok_r(NULL, "|", &save);
+       }
+       printf("\n");
+       free(temp);
+}
+
+void __tcinfo(tcinfo_type_e type, ...)
+{
+       va_list ap;
+       va_start(ap, type);
+       switch (type) {
+       case goal: /* shows test goal */
+               __color_to_yellow();
+               printf("TEST >> %s\n\n", (char*)va_arg(ap, int));
+               __color_to_origin();
+               break;
+       case cert_level: /* set certificate level */
+               visibility_string = (char*)va_arg(ap, int);
+               if (strncmp(visibility_string, "public", strlen(visibility_string)) == 0)
+                       visibility = PRVMGR_PACKAGE_VISIBILITY_PUBLIC;
+               else if (strncmp(visibility_string, "partner", strlen(visibility_string)) == 0)
+                       visibility = PRVMGR_PACKAGE_VISIBILITY_PARTNER;
+               else if(strncmp(visibility_string, "platform", strlen(visibility_string)) == 0)
+                       visibility = PRVMGR_PACKAGE_VISIBILITY_PLATFORM;
+               else
+                       printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WRONG CERT LEVEL!!!!!!!!!!!!!!!!!!!!!");
+               printf("\n- SIGNATURE LEVEL : %s\n", visibility_string);
+               break;
+       case version_type: /* set api_version and pkg_type */
+               __print_dline();
+               __color_to_bold_yellow();
+               api_version = (char*)va_arg(ap, int);
+               char* pkg_type_string = (char*)va_arg(ap, int);
+               if(strncmp("core", pkg_type_string, strlen("core")) == 0 )
+                       pkg_type = PRVMGR_PACKAGE_TYPE_CORE;
+               else if(strncmp("wrt", pkg_type_string, strlen("wrt")) == 0)
+                       pkg_type = PRVMGR_PACKAGE_TYPE_WRT;
+               else
+                       printf("!!!!!!!!!!!!!!!!!!!!!!WRONG PACKAGE TYPE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+               printf("- API VERSION : %s\n", api_version);
+               printf("- PACKAGE TYPE : %s\n", pkg_type_string);
+               __color_to_origin();
+               __print_dline();
+               __print_nline();
+               break;
+       case expect: /* set expected_result */
+               expected_result = va_arg(ap, int);
+               break;
+       case results: /* shows expected result and achieved result */
+               printf("\n- EXPECTED RESULT : %s\n", (char*)va_arg(ap, int));
+               printf("- ACHIEVED RESULT : %s\n\n", (char*)va_arg(ap, int));
+               break;
+       case function: /* shows function to test */
+               __color_to_yellow();
+               __print_dline();
+               printf("# TEST FUNCTION : %s()\n", (char*)va_arg(ap, int));
+               __print_dline();
+               __color_to_origin();
+               break;
+       default:
+               printf("no matching enum for input\n");
+       }
+       va_end(ap);
+}
+
+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");
+}
+
+void __print_line()
+{
+       printf("-------------------------------------------------------------------\n");
+}
+
+void __print_dline()
+{
+       printf("===================================================================\n");
+}
+
+void __print_nline()
+{
+       printf("\n");
+}
+
+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);
+       }
+}
+
+bool __check_result(int result)
+{
+       if (expected_result == result)
+               return true;
+       else
+               return false;
+}
+
+bool __count_result(int result)
+{
+       bool success = __check_result(result);
+       if (success)
+               success_cnt++;
+       else
+               fail_cnt++;
+       return success;
+}
+
+void __print_result(char type, int result)
+{
+       __tcinfo(results, __get_result_string(type, expected_result), __get_result_string(type, result));
+       if (__count_result(result)) {
+               __color_to_green();
+               printf(">> test success\n");
+       } else {
+               __color_to_bold_red();
+               printf(">> test fail\n");
+       }
+       __color_to_origin();
+}
+

diff --git a/test/tc-common.h b/test/tc-common.h
new file mode 100755 (executable)
index 0000000..bfe1dff
--- /dev/null
+++ b/test/tc-common.h
@@ -0,0 +1,70 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <glib.h>
+#include <privilege_manager.h>
+#include <privilege_db_manager.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, ...) \
+       if (condition) { \
+               __print_error_message(error_message); \
+               free(error_message); \
+               error_message = NULL; \
+       }
+#define gfree(list) \
+       g_list_free(list); \
+       list = NULL;
+
+int success_cnt;
+int fail_cnt;
+GList *privilege_list;
+int expected_result;
+privilege_manager_visibility_e visibility;
+char* visibility_string;
+privilege_manager_package_type_e pkg_type;
+char* api_version;
+
+void __color_to_red();
+void __color_to_green();
+void __color_to_yellow();
+void __color_to_blue();
+void __color_to_origin();
+void __color_to_bold_red();
+void __color_to_bold_yellow();
+
+void __print_line();
+void __print_dline();
+void __print_nline();
+void __print_test_func();
+
+char* __get_result_string(char type, int ret);
+void __print_error_message(char *error_message);
+
+typedef enum {
+       goal = 1,
+       cert_level = 2,
+       expect = 3,
+       results = 5,
+       function = 6,
+       version_type = 7
+} tcinfo_type_e;
+
+void __tcinfo(tcinfo_type_e type, ...);
+void __privinfo(char *name, char *level, char *comment);
+
+void __print_privilege_list(GList * privilege_list);
+
+bool __check_result(int result);
+bool __count_result(int result);
+void __print_result(char type, int result);
+
+

diff --git a/test/tc-privilege-black-list.c b/test/tc-privilege-black-list.c
index 9e718f5..54143bb 100755 (executable)
--- a/test/tc-privilege-black-list.c
+++ b/test/tc-privilege-black-list.c
@@ -5,295 +5,98 @@
 #include <privilege_manager.h>
 #include <privilege_info.h>
 #include <privilege_db_manager.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,
-       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 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)
-{
-       printf("%s", name);
-       privilege_list = g_list_append(privilege_list, name);
-       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()
-{
-       printf("===================================================================\n");
-}
-
-static void __print_privilege_list(GList * privilege_list)
-{
-       GList *l;
-       printf("Print privilege list: \n");
-       for (l = privilege_list; l != NULL; l = l->next) {
-               char *privilege_name = (char *)l->data;
-               printf("%s\n", privilege_name);
-       }
-}
-
-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();
-}
-
+#include "tc-common.h"
 
 static void __test_black_list_set_unset()
 {
        int ret = 0;
        GList *black_list;
 
-       __change_to_bold_yellow();
+       __color_to_bold_yellow();
        printf("\nTest black list set/unset/get\n\n");
-       __change_color_to_origin();
+       __color_to_origin();
 
        __tcinfo(goal, "uid = 0, Get wrt black list");
        ret = privilege_info_get_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, &black_list);
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
+       __print_result('m', ret);
        __print_privilege_list(black_list);
        __print_line();
-       g_list_free(black_list);
-       black_list = NULL;
+       gfree(black_list);
 
        __tcinfo(goal, "uid = 0, Add wrt privileges");
-       __privinfo("http://tizen.org/privilege/filesystem.read");
-       __privinfo("http://tizen.org/privilege/account.read");
-       __privinfo("http://tizen.org/privilege/internet");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __privinfo("http://tizen.org/privilege/filesystem.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_set_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "uid = 0, Get wrt black list");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_info_get_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, &black_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(black_list);
        __print_line();
-       g_list_free(black_list);
+       gfree(black_list);
        black_list = NULL;
 
        __tcinfo(goal, "uid = 0, Add wrt privileges -- Add duplicated privileges");
-       __privinfo("http://tizen.org/privilege/filesystem.read");
-       __privinfo("http://tizen.org/privilege/account.read");
-       __privinfo("http://tizen.org/privilege/internet");
-       __privinfo("http://tizen.org/privilege/mediacapture");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __privinfo("http://tizen.org/privilege/filesystem.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/mediacapture", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_set_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "uid = 0, Get wrt black list");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_info_get_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, &black_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(black_list);
        __print_line();
-       g_list_free(black_list);
+       gfree(black_list);
        black_list = NULL;
 
        __tcinfo(goal, "uid = 0, Remove wrt privileges");
-       __privinfo("http://tizen.org/privilege/filesystem.read");
-       __privinfo("http://tizen.org/privilege/account.read");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __privinfo("http://tizen.org/privilege/filesystem.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_unset_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "uid = 0, Get wrt black list");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_info_get_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, &black_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(black_list);
        __print_line();
-       g_list_free(black_list);
+       gfree(black_list);
        black_list = NULL;
 
        __tcinfo(goal, "uid = 0, Remove wrt privileges -- Try to remove already removed privileges");
-       __privinfo("http://tizen.org/privilege/filesystem.read");
-       __privinfo("http://tizen.org/privilege/account.read");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __privinfo("http://tizen.org/privilege/filesystem.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_unset_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, privilege_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "uid = 0, Get wrt black list");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_info_get_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, &black_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(black_list);
        __print_line();
-       g_list_free(black_list);
+       gfree(black_list);
        black_list = NULL;
 
 }
@@ -304,75 +107,65 @@ static void __test_black_list_check()
        GList *black_list = NULL;
        int ret = 0;
 
-       __change_to_bold_yellow();
+       __color_to_bold_yellow();
        printf("\nTest privilege list with banned privilege\n\n");
-       __change_color_to_origin();
+       __color_to_origin();
 
        __tcinfo(goal, "uid = 0, Get wrt black list");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_info_get_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, &black_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(black_list);
        __print_line();
-       g_list_free(black_list);
-       black_list = NULL;
+       gfree(black_list);
 
        __tcinfo(goal, "uid = 0, contains banned privilege");
-       __privinfo("http://tizen.org/privilege/mediacapture");
-       __privinfo("http://tizen.org/privilege/internet");
-       __privinfo("http://tizen.org/privilege/telephony");
-       __tcinfo(expect, "PRVMGR_ERR_USING_BANNED_PRIVILEGE");
+       __privinfo("http://tizen.org/privilege/mediacapture", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/telephony", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_USING_BANNED_PRIVILEGE);
        ret = privilege_db_manager_check_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, privilege_list);
        if (ret > 0)
                ret = PRVMGR_ERR_USING_BANNED_PRIVILEGE;
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_USING_BANNED_PRIVILEGE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "uid = 0, Not contains banned privilege");
-       __privinfo("http://tizen.org/privilege/account.write");
-       __privinfo("http://tizen.org/privilege/mediacontroller.client");
-       __privinfo("http://tizen.org/privilege/telephony");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __privinfo("http://tizen.org/privilege/account.write", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/mediacontroller.client", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/telephony", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_db_manager_check_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, privilege_list);
        if (ret > 0)
                ret = PRVMGR_ERR_USING_BANNED_PRIVILEGE;
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "uid = 1, Contains banned privilege but the UID is different");
-       __privinfo("http://tizen.org/privilege/account.read");
-       __privinfo("http://tizen.org/privilege/internet");
-       __privinfo("http://tizen.org/privilege/telephony");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/telephony", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_db_manager_check_black_list(1, PRVMGR_PACKAGE_TYPE_WRT, privilege_list);
        if (ret > 0)
                ret = PRVMGR_ERR_USING_BANNED_PRIVILEGE;
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "uid = 0, Contains banned privilege but the package type is different");
-       __privinfo("http://tizen.org/privilege/account.read");
-       __privinfo("http://tizen.org/privilege/internet");
-       __privinfo("http://tizen.org/privilege/telephony");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/telephony", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_db_manager_check_black_list(0, PRVMGR_PACKAGE_TYPE_CORE, privilege_list);
        if (ret > 0)
                ret = PRVMGR_ERR_USING_BANNED_PRIVILEGE;
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 }
 
 static void __test_black_list_verify_privilege()
@@ -381,105 +174,66 @@ static void __test_black_list_verify_privilege()
        char *error_message = NULL;
        int ret = 0;
 
-       __change_to_bold_yellow();
+       __color_to_bold_yellow();
        printf("\nTest privilege_manager_verify_privilege with banned privilege\n\n");
-       __change_color_to_origin();
+       __color_to_origin();
 
        __tcinfo(goal, "uid = 0, Get wrt black list");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_info_get_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, &black_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(black_list);
        __print_line();
 
-       __tcinfo(goal, "2.3.1, wrt, Name=OK, Version=OK, Level=OK -- Public ");
-       __privinfo("http://tizen.org/privilege/bluetooth.gap");
-       __privinfo("http://tizen.org/privilege/bluetooth.health");
-       __privinfo("http://tizen.org/privilege/alarm");
-       __privinfo("http://tizen.org/privilege/application.info");
-       __privinfo("http://tizen.org/privilege/calendar.read");
-       __privinfo("http://tizen.org/privilege/call");
-       __privinfo("http://tizen.org/privilege/callhistory.read");
-       __privinfo("http://tizen.org/privilege/contact.write");
-       __privinfo("http://tizen.org/privilege/content.read");
-       __privinfo("http://tizen.org/privilege/datacontrol.consumer");
-       __privinfo("http://tizen.org/privilege/datasync");
-       __privinfo("http://tizen.org/privilege/download");
-       __privinfo("http://tizen.org/privilege/filesystem.read");
-       __privinfo("http://tizen.org/privilege/fullscreen");
-       __privinfo("http://tizen.org/privilege/healthinfo");
-       __privinfo("http://tizen.org/privilege/internet");
-       __privinfo("http://tizen.org/privilege/location");
-       __privinfo("http://tizen.org/privilege/mediacapture");
-       __privinfo("http://tizen.org/privilege/messaging.write");
-       __privinfo("http://tizen.org/privilege/nfc.admin");
-       __privinfo("http://tizen.org/privilege/notification");
-       __privinfo("http://tizen.org/privilege/package.info");
-       __privinfo("http://tizen.org/privilege/power");
-       __privinfo("http://tizen.org/privilege/telephony");
-       __privinfo("http://tizen.org/privilege/websetting");
-       __tcinfo(expect, "PRVMGR_ERR_USING_BANNED_PRIVILEGE");
-       ret = privilege_manager_verify_privilege("2.3.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, PRVMGR_PACKAGE_VISIBILITY_PUBLIC, &error_message);
+       __tcinfo(goal, "2.4, wrt, Name=OK, Version=OK, Level=OK -- Public => Using Banned Privilege");
+       __privinfo("http://tizen.org/privilege/alarm", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/application.info", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/content.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/download", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/filesystem.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/mediacapture", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/package.info", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/telephony", NULL, NULL);
+       __tcinfo(expect, PRVMGR_ERR_USING_BANNED_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_USING_BANNED_PRIVILEGE, ret);
+       __print_result('m', ret);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
        __tcinfo(goal, "uid = 0, Remove all banned wrt privileges");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_manager_unset_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, black_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_line();
-       g_list_free(black_list);
-       black_list = NULL;
+       gfree(black_list);
 
        __tcinfo(goal, "uid = 0, Get wrt black list");
-       __tcinfo(expect, "PRVMGR_ERR_NONE");
+       __tcinfo(expect, PRVMGR_ERR_NONE);
        ret = privilege_info_get_black_list(0, PRVMGR_PACKAGE_TYPE_WRT, &black_list);
-       __print_result(__get_result_string(ret));
-       __check_verify_result(PRVMGR_ERR_NONE, ret);
+       __print_result('m', ret);
        __print_privilege_list(black_list);
        __print_line();
 
-
-       __tcinfo(goal, "2.3.1, wrt, Name=OK, Version=OK, Level=OK -- Public ");
-       __privinfo("http://tizen.org/privilege/bluetooth.gap");
-       __privinfo("http://tizen.org/privilege/bluetooth.health");
-       __privinfo("http://tizen.org/privilege/alarm");
-       __privinfo("http://tizen.org/privilege/application.info");
-       __privinfo("http://tizen.org/privilege/calendar.read");
-       __privinfo("http://tizen.org/privilege/call");
-       __privinfo("http://tizen.org/privilege/callhistory.read");
-       __privinfo("http://tizen.org/privilege/contact.write");
-       __privinfo("http://tizen.org/privilege/content.read");
-       __privinfo("http://tizen.org/privilege/datacontrol.consumer");
-       __privinfo("http://tizen.org/privilege/datasync");
-       __privinfo("http://tizen.org/privilege/download");
-       __privinfo("http://tizen.org/privilege/filesystem.read");
-       __privinfo("http://tizen.org/privilege/fullscreen");
-       __privinfo("http://tizen.org/privilege/healthinfo");
-       __privinfo("http://tizen.org/privilege/internet");
-       __privinfo("http://tizen.org/privilege/location");
-       __privinfo("http://tizen.org/privilege/mediacapture");
-       __privinfo("http://tizen.org/privilege/messaging.write");
-       __privinfo("http://tizen.org/privilege/nfc.admin");
-       __privinfo("http://tizen.org/privilege/notification");
-       __privinfo("http://tizen.org/privilege/package.info");
-       __privinfo("http://tizen.org/privilege/power");
-       __privinfo("http://tizen.org/privilege/telephony");
-       __privinfo("http://tizen.org/privilege/websetting");
-       __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);
+       __tcinfo(goal, "2.4, wrt, Name=OK, Version=OK, Level=OK -- Public ");
+       __privinfo("http://tizen.org/privilege/alarm", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/application.info", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/content.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/download", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/filesystem.read", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/internet", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/mediacapture", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/package.info", NULL, NULL);
+       __privinfo("http://tizen.org/privilege/telephony", NULL, NULL);
+       __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_result('m', ret);
        __print_line();
 
-       g_list_free(privilege_list);
-       privilege_list = NULL;
+       gfree(privilege_list);
 
 }
 
@@ -487,39 +241,26 @@ int main()
 {
        __print_dline();
 
-       __change_color_to_yellow();
-       printf("\n");
-       printf("Test function : privilege_manager_set_black_list\n");
-       printf("                privilege_manager_unset_black_list\n");
-       printf("                privilege_info_get_black_list\n");
-       printf("\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_manager_set_black_list");
+       __tcinfo(function, "privilege_manager_unset_black_list");
+       __tcinfo(function, "privilege_info_get_black_list");
        __test_black_list_set_unset();
 
-       __print_dline();
-
-       __change_color_to_yellow();
-       printf("Test function : privilege_db_manager_check_black_list\n");
-       printf("                privilege_info_get_black_list\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_db_manager_check_black_list");
+       __tcinfo(function, "privilege_info_get_black_list");
        __test_black_list_check();
 
-       __print_dline();
-
-
-       __change_color_to_yellow();
-       printf("Test function : privilege_manager_verify_privilege\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_manager_verify_privilege");
        __test_black_list_verify_privilege();
 
        __print_dline();
 
-       __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;
 }

diff --git a/test/tc-privilege-db-manager.c b/test/tc-privilege-db-manager.c
index 4871fe8..48072ce 100755 (executable)
--- a/test/tc-privilege-db-manager.c
+++ b/test/tc-privilege-db-manager.c
@@ -2,35 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <privilege_db_manager.h>
-
-#define BRIGHTNESS 0
-#define RED 31
-#define GREEN 32
-#define YELLOW 33
-#define BG_BLACK 40
-
-static int fail_cnt = 0;
-static int success_cnt = 0;
-
-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_origin()
-{
-       printf("%c[%dm", 0x1B, 0);
-}
+#include <tc-common.h>
 
 static void __free_privilege_list(GList * privilege_list)
 {
@@ -53,24 +25,11 @@ static void __free_privilege_list(GList * privilege_list)
                        free(privilege_info_db_row->issued_version);
                if (privilege_info_db_row->expired_version != NULL)
                        free(privilege_info_db_row->expired_version);
+               if (privilege_info_db_row->changed_to != NULL)
+                       free(privilege_info_db_row->changed_to);
        }
 }
 
-static const char *__get_result_string(privilege_db_manager_error_e ret)
-{
-       if (ret == PRIVILEGE_DB_MANAGER_ERR_NONE)
-               return "PRIVILEGE_DB_MANAGER_ERR_NONE";
-       else if (ret == PRIVILEGE_DB_NO_EXIST_RESULT)
-               return "PRIVILEGE_DB_NO_EXIST_RESULT";
-       else if (ret == PRIVILEGE_DB_MANAGER_ERR_CONNECTION_FAIL)
-               return "PRIVILEGE_DB_MANAGER_ERR_CONNECTION_FAIL";
-       else if (ret == PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY)
-               return "PRIVILEGE_DB_MANAGER_ERR_INVALID_QUERY";
-       else if (ret == PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY)
-               return "PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY";
-       else
-               return "FAIL";
-}
 
 void __test_privilege_db_manager_get_privilege_list()
 {
@@ -78,10 +37,10 @@ void __test_privilege_db_manager_get_privilege_list()
        int ret = privilege_db_manager_get_privilege_list("2.4", PRIVILEGE_DB_MANAGER_PACKAGE_TYPE_CORE, &privilege_list);
        if (ret != PRIVILEGE_DB_MANAGER_ERR_NONE) {
                printf("failed to call privilege_db_manager_get_privilege_list()\n");
-               printf("error message = %s\n", __get_result_string(ret));
-               __change_color_to_red();
+               printf("error message = %s\n", __get_result_string('d', ret));
+               __color_to_red();
                printf("test fail\n");
-               __change_color_to_origin();
+               __color_to_origin();
                fail_cnt++;
                return;
        }
@@ -94,9 +53,9 @@ void __test_privilege_db_manager_get_privilege_list()
        }
        __free_privilege_list(privilege_list);
 
-       __change_color_to_green();
+       __color_to_green();
        printf("test success\n");
-       __change_color_to_origin();
+       __color_to_origin();
        success_cnt++;
 }
 
@@ -112,7 +71,7 @@ void __print_mapped_privilege_list(int ret, GList* mapped_privilege_list)
        } else
                fail_cnt++;
 
-       printf("test result = %s\n", __get_result_string(ret));
+       printf("test result = %s\n", __get_result_string('d', ret));
 }
 
 void __test_privilege_db_manager_get_mapped_privilege_list()
@@ -121,7 +80,7 @@ void __test_privilege_db_manager_get_mapped_privilege_list()
        GList *mapped_privilege_list = NULL;
        int ret;
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/internal/default/public\n");
        printf("api_version : 2.4\n");
        printf("package type : wrt\n");
@@ -134,7 +93,7 @@ void __test_privilege_db_manager_get_mapped_privilege_list()
        g_list_free(mapped_privilege_list);
        mapped_privilege_list = NULL;
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/mediacapture\n");
        printf("api_version : 2.4\n");
        printf("package type : wrt\n");
@@ -147,7 +106,7 @@ void __test_privilege_db_manager_get_mapped_privilege_list()
        g_list_free(mapped_privilege_list);
        mapped_privilege_list = NULL;
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/internal/default/public\n");
        printf("privilege : http://tizen.org/privilege/mediacapture\n");
        printf("api_version : 2.4\n");
@@ -162,7 +121,7 @@ void __test_privilege_db_manager_get_mapped_privilege_list()
        g_list_free(mapped_privilege_list);
        mapped_privilege_list = NULL;
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/internal/default/public\n");
        printf("api_version : 2.2.1\n");
        printf("package type : wrt\n");
@@ -175,7 +134,7 @@ void __test_privilege_db_manager_get_mapped_privilege_list()
        g_list_free(mapped_privilege_list);
        mapped_privilege_list = NULL;
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/mediacapture\n");
        printf("api_version : 2.2.1\n");
        printf("package type : wrt\n");
@@ -188,7 +147,7 @@ void __test_privilege_db_manager_get_mapped_privilege_list()
        g_list_free(mapped_privilege_list);
        mapped_privilege_list = NULL;
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/content.read\n");
        printf("api_version : 2.2.1\n");
        printf("package type : wrt\n");
@@ -201,7 +160,7 @@ void __test_privilege_db_manager_get_mapped_privilege_list()
        g_list_free(mapped_privilege_list);
        mapped_privilege_list = NULL;
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/internal/webappdefault\n");
        printf("privilege : http://tizen.org/privilege/internal/default/public\n");
        printf("privilege : http://tizen.org/privilege/mediacapture\n");
@@ -218,19 +177,19 @@ void __test_privilege_db_manager_get_mapped_privilege_list()
        g_list_free(privilege_list);
        g_list_free(mapped_privilege_list);
 
-       __change_color_to_green();
+       __color_to_green();
        printf("test success\n");
-       __change_color_to_origin();
+       __color_to_origin();
        success_cnt++;
 }
 
 void __check_get_privilege_display_result(privilege_db_manager_error_e expected_result, privilege_db_manager_error_e result, char *privilege_display)
 {
-       printf("expected result = %s, result = %s\n", __get_result_string(expected_result), __get_result_string(result));
+       printf("expected result = %s, result = %s\n", __get_result_string('d', expected_result), __get_result_string('d', result));
 
        if (expected_result != result) {
                printf("not matched\n");
-               __change_color_to_red();
+               __color_to_red();
                printf("test fail\n");
                fail_cnt++;
        } else {
@@ -241,11 +200,11 @@ void __check_get_privilege_display_result(privilege_db_manager_error_e expected_
                else
                        printf("privilege_display = %s\n", privilege_display);
 
-               __change_color_to_green();
+               __color_to_green();
                printf("test success\n");
                success_cnt++;
        }
-       __change_color_to_origin();
+       __color_to_origin();
 }
 
 void __test_privilege_db_manager_get_privilege_display()
@@ -254,7 +213,7 @@ void __test_privilege_db_manager_get_privilege_display()
 
        char *privilege_display = NULL;
 #ifdef PROFILE_TYPE_MOBILE
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/location\n");
        printf("privilege_type : core\n");
        printf("expected result : PRIVILEGE_DB_MANAGER_ERR_NONE\n");
@@ -262,7 +221,7 @@ void __test_privilege_db_manager_get_privilege_display()
        __check_get_privilege_display_result(PRIVILEGE_DB_MANAGER_ERR_NONE, ret, privilege_display);
        free(privilege_display);
 #endif
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/internet\n");
        printf("privilege_type : wrt\n");
        printf("expected result : PRIVILEGE_DB_MANAGER_ERR_NONE\n");
@@ -271,7 +230,7 @@ void __test_privilege_db_manager_get_privilege_display()
        __check_get_privilege_display_result(PRIVILEGE_DB_MANAGER_ERR_NONE, ret, privilege_display);
        free(privilege_display);
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/messasdfsfsdfsdfad\n");
        printf("expected result : PRIVILEGE_DB_NO_EXIST_RESULT\n");
        privilege_display = NULL;
@@ -279,7 +238,7 @@ void __test_privilege_db_manager_get_privilege_display()
        __check_get_privilege_display_result(PRIVILEGE_DB_NO_EXIST_RESULT, ret, privilege_display);
        free(privilege_display);
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("api_version is NULL\n");
        printf("privilege : http://tizen.org/privilege/internet\n");
        printf("privilege_type : wrt\n");
@@ -289,7 +248,7 @@ void __test_privilege_db_manager_get_privilege_display()
        __check_get_privilege_display_result(PRIVILEGE_DB_MANAGER_ERR_NONE, ret, privilege_display);
        free(privilege_display);
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("api_version is NULL\n");
        printf("privilege : http://tizen.org/privilege/messasdfsfsdfsdfad\n");
        printf("expected result : PRIVILEGE_DB_NO_EXIST_RESULT\n");
@@ -298,17 +257,17 @@ void __test_privilege_db_manager_get_privilege_display()
        __check_get_privilege_display_result(PRIVILEGE_DB_NO_EXIST_RESULT, ret, privilege_display);
        free(privilege_display);
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
 
 }
 
 void __check_get_privilege_description_result(privilege_db_manager_error_e expected_result, privilege_db_manager_error_e result, char *privilege_description)
 {
-       printf("expected result = %s, result = %s\n", __get_result_string(expected_result), __get_result_string(result));
+       printf("expected result = %s, result = %s\n", __get_result_string('d', expected_result), __get_result_string('d', result));
 
        if (expected_result != result) {
                printf("not matched\n");
-               __change_color_to_red();
+               __color_to_red();
                printf("test fail\n");
                fail_cnt++;
        } else {
@@ -319,21 +278,19 @@ void __check_get_privilege_description_result(privilege_db_manager_error_e expec
                else
                        printf("privilege_description = %s\n", privilege_description);
 
-               __change_color_to_green();
+               __color_to_green();
                printf("test success\n");
                success_cnt++;
        }
-       __change_color_to_origin();
+       __color_to_origin();
 }
 
 void __test_privilege_db_manager_get_privilege_description()
 {
-
        int ret;
-
        char *privilege_description = NULL;
 #ifdef PROFILE_TYPE_MOBILE
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/location\n");
        printf("privilege_type : core\n");
        printf("expected result : PRIVILEGE_DB_MANAGER_ERR_NONE\n");
@@ -345,7 +302,7 @@ void __test_privilege_db_manager_get_privilege_description()
                privilege_description = NULL;
        }
 #endif
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/internet\n");
        printf("privilege_type : wrt\n");
        printf("expected result : PRIVILEGE_DB_MANAGER_ERR_NONE\n");
@@ -357,7 +314,7 @@ void __test_privilege_db_manager_get_privilege_description()
                privilege_description = NULL;
        }
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("privilege : http://tizen.org/privilege/messasdfsfsdfsdfad\n");
        printf("expected result : PRIVILEGE_DB_NO_EXIST_RESULT\n");
        ret = privilege_db_manager_get_privilege_description(PRIVILEGE_DB_MANAGER_PACKAGE_TYPE_CORE, "http://tizen.org/privilege/messasdfsfsdfsdfad", "2.3", &privilege_description);
@@ -368,7 +325,7 @@ void __test_privilege_db_manager_get_privilege_description()
                privilege_description = NULL;
        }
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("api_version is NULL\n");
        printf("privilege : http://tizen.org/privilege/internet\n");
        printf("privilege_type : wrt\n");
@@ -381,13 +338,13 @@ void __test_privilege_db_manager_get_privilege_description()
                privilege_description = NULL;
        }
 
-       printf("-----------------------------------------------------------\n");
+       __print_line();
        printf("api_version is NULL\n");
        printf("privilege : http://tizen.org/privilege/messasdfsfsdfsdfad\n");
        printf("expected result : PRIVILEGE_DB_NO_EXIST_RESULT\n");
        ret = privilege_db_manager_get_privilege_description(PRIVILEGE_DB_MANAGER_PACKAGE_TYPE_CORE, "http://tizen.org/privilege/messasdfsfsdfsdfad", NULL, &privilege_description);
        __check_get_privilege_description_result(PRIVILEGE_DB_NO_EXIST_RESULT, ret, privilege_description);
-       printf("-----------------------------------------------------------\n");
+       __print_line();
 
        free(privilege_description);
 
@@ -395,32 +352,24 @@ void __test_privilege_db_manager_get_privilege_description()
 
 int main()
 {
-       __change_color_to_yellow();
-       printf("Test function : privilege_db_manager_get_privilege_list\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_db_manager_get_privilege_list");
        __test_privilege_db_manager_get_privilege_list();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_db_manager_get_mapped_privilege_list\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_db_manager_get_mapped_privilege_list");
        __test_privilege_db_manager_get_mapped_privilege_list();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_db_manager_get_privilege_display\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_db_manager_get_privilege_display");
        __test_privilege_db_manager_get_privilege_display();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_db_manager_get_privilege_description\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_db_manager_get_privilege_description");
        __test_privilege_db_manager_get_privilege_description();
 
-       __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;
 }

diff --git a/test/tc-privilege-info.c b/test/tc-privilege-info.c
index 02b0c05..770d8e5 100755 (executable)
--- a/test/tc-privilege-info.c
+++ b/test/tc-privilege-info.c
@@ -1,56 +1,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <privilege_info.h>
+#include <tc-common.h>
 
-#define BRIGHTNESS 0
-#define RED 31
-#define GREEN 32
-#define YELLOW 33
-#define BG_BLACK 40
-
-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_origin()
-{
-       printf("%c[%dm", 0x1B, 0);
-}
-
-static int fail_cnt = 0;
-static int success_cnt = 0;
-
-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";
-
-       return "FAIL";
-}
 static void __check_get_privilege_display_name_result(privilege_manager_error_e expected_result, privilege_manager_error_e result, const char *display_name)
 {
-       printf("expected result = %s, result = %s\n", __get_result_string(expected_result), __get_result_string(result));
+       printf("expected result = %s, result = %s\n", __get_result_string('m', expected_result), __get_result_string('m', result));
 
        if (expected_result != result) {
                printf("not matched\n");
-               __change_color_to_red();
+               __color_to_red();
                printf("test fail\n");
                fail_cnt++;
        } else {
@@ -61,27 +20,27 @@ static void __check_get_privilege_display_name_result(privilege_manager_error_e
                        if (display_name != NULL) {
                                printf("display_name = %s\n", display_name);
                                printf("display_name must be NULL\n");
-                               __change_color_to_red();
+                               __color_to_red();
                                printf("test fail\n");
                                fail_cnt++;
-                               __change_color_to_origin();
+                               __color_to_origin();
                                return;
                        }
                }
-               __change_color_to_green();
+               __color_to_green();
                printf("test success\n");
                success_cnt++;
        }
-       __change_color_to_origin();
+       __color_to_origin();
 }
 
 static void __check_get_privilege_description_result(privilege_manager_error_e expected_result, privilege_manager_error_e result, const char *description)
 {
-       printf("expected result = %s, result = %s\n", __get_result_string(expected_result), __get_result_string(result));
+       printf("expected result = %s, result = %s\n", __get_result_string('m', expected_result), __get_result_string('m', result));
 
        if (expected_result != result) {
                printf("not matched\n");
-               __change_color_to_red();
+               __color_to_red();
                printf("test fail\n");
                fail_cnt++;
        } else {
@@ -92,28 +51,28 @@ static void __check_get_privilege_description_result(privilege_manager_error_e e
                        if (description != NULL) {
                                printf("description = %s\n", description);
                                printf("description must be NULL\n");
-                               __change_color_to_red();
+                               __color_to_red();
                                printf("test fail\n");
                                fail_cnt++;
-                               __change_color_to_origin();
+                               __color_to_origin();
                                return;
                        }
                }
 
-               __change_color_to_green();
+               __color_to_green();
                printf("test success\n");
                success_cnt++;
        }
-       __change_color_to_origin();
+       __color_to_origin();
 }
 
 static void __check_get_privilege_group_display_name_result(privilege_manager_error_e expected_result, privilege_manager_error_e result, const char *group_name)
 {
-       printf("expected result = %s, result = %s\n", __get_result_string(expected_result), __get_result_string(result));
+       printf("expected result = %s, result = %s\n", __get_result_string('m', expected_result), __get_result_string('m', result));
 
        if (expected_result != result) {
                printf("not matched\n");
-               __change_color_to_red();
+               __color_to_red();
                printf("test fail\n");
                fail_cnt++;
        } else {
@@ -122,10 +81,10 @@ static void __check_get_privilege_group_display_name_result(privilege_manager_er
                if (result == PRVMGR_ERR_NONE) {
                        if (group_name == NULL) {
                                printf("group_name must not be NULL\n");
-                               __change_color_to_red();
+                               __color_to_red();
                                printf("test fail\n");
                                fail_cnt++;
-                               __change_color_to_origin();
+                               __color_to_origin();
                                return;
                        } else {
                                printf("group_name = %s\n", group_name);
@@ -134,23 +93,22 @@ static void __check_get_privilege_group_display_name_result(privilege_manager_er
                        if (group_name != NULL) {
                                printf("group_name = %s\n", group_name);
                                printf("group_name must be NULL\n");
-                               __change_color_to_red();
+                               __color_to_red();
                                printf("test fail\n");
                                fail_cnt++;
-                               __change_color_to_origin();
+                               __color_to_origin();
                                return;
                        }
                }
-               __change_color_to_green();
+               __color_to_green();
                printf("test success\n");
                success_cnt++;
        }
-       __change_color_to_origin();
+       __color_to_origin();
 }
 static void __test_privilege_info_is_privacy()
 {
        int ret;
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/account.read\n");
        ret = privilege_info_is_privacy("http://tizen.org/privilege/account.read");
        if (ret == 1) {
@@ -160,8 +118,8 @@ static void __test_privilege_info_is_privacy()
                fail_cnt++;
                printf("Test FAILED\n");
        }
+       __print_line();
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/internet\n");
        ret = privilege_info_is_privacy("http://tizen.org/privilege/internet");
        if (ret == 0) {
@@ -171,6 +129,7 @@ static void __test_privilege_info_is_privacy()
                fail_cnt++;
                printf("Test FAILED\n");
        }
+       __print_line();
 }
 
 static void __test_privilege_info_get_privacy_list()
@@ -188,14 +147,14 @@ static void __test_privilege_info_get_privacy_list()
                fail_cnt++;
                printf("Test FAILED\n");
        }
-       g_list_free(privacy_list);
+       gfree(privacy_list);
+       __print_line();
 }
 
 static void __test_privilege_info_get_privilege_list_by_privacy()
 {
        GList* privilege_list = NULL;
        GList* l;
-       printf("-----------------------------------------------------------\n");
        printf("privacy : ACCOUNT\n");
        int ret = privilege_info_get_privilege_list_by_privacy("ACCOUNT", &privilege_list);
        if (ret == 0) {
@@ -209,12 +168,11 @@ static void __test_privilege_info_get_privilege_list_by_privacy()
                printf("Test FAILED\n");
        }
 
-       if (privilege_list != NULL) {
-               g_list_free(privilege_list);
-               privilege_list = NULL;
-       }
+       if (privilege_list != NULL)
+               gfree(privilege_list);
+
+       __print_line();
 
-       printf("-----------------------------------------------------------\n");
        printf("privacy : USERHISTORY\n");
        ret = privilege_info_get_privilege_list_by_privacy("USERHISTORY", &privilege_list);
        if (ret == 0) {
@@ -228,7 +186,9 @@ static void __test_privilege_info_get_privilege_list_by_privacy()
                printf("Test FAILED\n");
        }
 
-       g_list_free(privilege_list);
+       gfree(privilege_list);
+
+       __print_line();
 }
 
 static void __test_privilege_info_get_privilege_display_name()
@@ -236,38 +196,33 @@ static void __test_privilege_info_get_privilege_display_name()
        int ret;
        char *display_name = NULL;
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/account.read\n");
-       printf("expected result : PRVMGR_ERR_NONE\n");
        display_name = NULL;
        ret = privilege_info_get_privilege_display_name("http://tizen.org/privilege/account.read", &display_name);
        __check_get_privilege_display_name_result(PRVMGR_ERR_NONE, ret, display_name);
        free(display_name);
+       __print_line();
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/badge.admin\n");
-       printf("expected result : PRVMGR_ERR_NONE\n");
        display_name = NULL;
        ret = privilege_info_get_privilege_display_name("http://tizen.org/privilege/badge.admin", &display_name);
        __check_get_privilege_display_name_result(PRVMGR_ERR_NONE, ret, display_name);
        free(display_name);
+       __print_line();
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/accousdfsdnt.resdfsdfad\n");
-       printf("expected result : PRVMGR_ERR_NONE\n");
        display_name = NULL;
        ret = privilege_info_get_privilege_display_name("http://tizen.org/privilege/accousdfsdnt.resdfsdfad", &display_name);
        __check_get_privilege_display_name_result(PRVMGR_ERR_NONE, ret, display_name);
        free(display_name);
+       __print_line();
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : NULL\n");
-       printf("expected result : PRVMGR_ERR_INVALID_PARAMETER\n");
        display_name = NULL;
        ret = privilege_info_get_privilege_display_name(NULL, &display_name);
        __check_get_privilege_display_name_result(PRVMGR_ERR_INVALID_PARAMETER, ret, display_name);
-       printf("-----------------------------------------------------------\n");
        free(display_name);
+       __print_line();
 }
 
 static void __test_privilege_info_get_privilege_description()
@@ -275,43 +230,38 @@ static void __test_privilege_info_get_privilege_description()
        int ret;
        char *description = NULL;
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/account.read\n");
-       printf("expected result : PRVMGR_ERR_NONE\n");
        ret = privilege_info_get_privilege_description("http://tizen.org/privilege/account.read", &description);
        __check_get_privilege_description_result(PRVMGR_ERR_NONE, ret, description);
+       __print_line();
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/badge.admin\n");
-       printf("expected result : PRVMGR_ERR_NONE\n");
        if (description != NULL) {
                free(description);
                description = NULL;
        }
        ret = privilege_info_get_privilege_description("http://tizen.org/privilege/badge.admin", &description);
        __check_get_privilege_description_result(PRVMGR_ERR_NONE, ret, description);
+       __print_line();
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/accousdfsdnt.resdfsdfad\n");
-       printf("expected result : PRVMGR_ERR_NONE\n");
        if (description != NULL) {
                free(description);
                description = NULL;
        }
        ret = privilege_info_get_privilege_description("http://tizen.org/privilege/accousdfsdnt.resdfsdfad", &description);
        __check_get_privilege_description_result(PRVMGR_ERR_NONE, ret, description);
+       __print_line();
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : NULL\n");
-       printf("expected result : PRVMGR_ERR_INVALID_PARAMETER\n");
        if (description != NULL) {
                free(description);
                description = NULL;
        }
        ret = privilege_info_get_privilege_description(NULL, &description);
        __check_get_privilege_description_result(PRVMGR_ERR_INVALID_PARAMETER, ret, description);
-       printf("-----------------------------------------------------------\n");
        free(description);
+       __print_line();
 }
 
 static void __test__privilege_info_get_privilege_group_display_name()
@@ -319,71 +269,52 @@ static void __test__privilege_info_get_privilege_group_display_name()
        int ret;
        char *group_name = NULL;
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/group/group0\n");
-       printf("expected result : PRVMGR_ERR_NONE\n");
        ret = privilege_info_get_privilege_group_display_name("http://tizen.org/privilege/group/group0", &group_name);
        __check_get_privilege_group_display_name_result(PRVMGR_ERR_NONE, ret, group_name);
        free(group_name);
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : http://tizen.org/privilege/group/group01232\n");
-       printf("expected result : PRVMGR_ERR_NONE\n");
        group_name = NULL;
        ret = privilege_info_get_privilege_group_display_name("http://tizen.org/privilege/group/group01232", &group_name);
        __check_get_privilege_group_display_name_result(PRVMGR_ERR_NONE, ret, group_name);
        free(group_name);
 
-       printf("-----------------------------------------------------------\n");
        printf("privilege : NULL\n");
-       printf("expected result : PRVMGR_ERR_INVALID_PARAMETER\n");
        group_name = NULL;
        ret = privilege_info_get_privilege_group_display_name(NULL, &group_name);
        __check_get_privilege_group_display_name_result(PRVMGR_ERR_INVALID_PARAMETER, ret, group_name);
-       printf("-----------------------------------------------------------\n");
        free(group_name);
 
 }
 
 int main()
 {
-       __change_color_to_yellow();
-       printf("Test function : privilege_info_is_privacy()\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_info_is_privacy");
        __test_privilege_info_is_privacy();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_info_get_privilege_display_name\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_info_get_privilege_display_name");
        __test_privilege_info_get_privilege_display_name();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_info_get_privilege_description\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_info_get_privilege_description");
        __test_privilege_info_get_privilege_description();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_info_get_privilege_group_display_name\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_info_get_privilege_group_display_name");
        __test__privilege_info_get_privilege_group_display_name();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_info_get_privacy_list\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_info_get_privacy_list");
        __test_privilege_info_get_privacy_list();
 
-       __change_color_to_yellow();
-       printf("Test function : privilege_info_get_privilege_list_by_privacy\n");
-       __change_color_to_origin();
+       __tcinfo(function, "privilege_info_get_privilege_list_by_privacy");
        __test_privilege_info_get_privilege_list_by_privacy();
 
-       __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;
 }

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;
 }