[UTC][privilege-info][ACR-1546][Change return value of API]

- Modify utc according to the following changes:
    - AS-IS: If the given privilege not exist then return success
    - TO-BE: If the given privilege not exist then return error
    - Changes: Convert positive cases with undefined privilege name
	       input as negative cases.
- changed APIs:
    - privilege_info_get_display_name()
    - privilege_info_get_description()
    - privilege_info_get_display_name_by_pkgtype()
    - privilege_info_get_description_by_pkgtype()

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

diff --git a/src/utc/privilege-info/tct-privilege-info-core_mobile.h b/src/utc/privilege-info/tct-privilege-info-core_mobile.h
index 0f8e84891d56a102bbb637e5f4375d97e8462904..1022bac32d2744c9df58d78c3696e2e3a54d8bfb 100755 (executable)
--- a/src/utc/privilege-info/tct-privilege-info-core_mobile.h
+++ b/src/utc/privilege-info/tct-privilege-info-core_mobile.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+// Copyright (c) 2014-2020 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
 // you may not use this file except in compliance with the License.
@@ -22,24 +22,24 @@
 extern void utc_privilege_info_startup(void);
 extern int utc_privilege_info_get_display_name_p1(void);
 extern int utc_privilege_info_get_display_name_p2(void);
-extern int utc_privilege_info_get_display_name_p3(void);
-extern int utc_privilege_info_get_display_name_n(void);
+extern int utc_privilege_info_get_display_name_n1(void);
+extern int utc_privilege_info_get_display_name_n2(void);
 extern int utc_privilege_info_get_description_p1(void);
 extern int utc_privilege_info_get_description_p2(void);
-extern int utc_privilege_info_get_description_p3(void);
-extern int utc_privilege_info_get_description_n(void);
+extern int utc_privilege_info_get_description_n1(void);
+extern int utc_privilege_info_get_description_n2(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_p1(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_p2(void);
-extern int utc_privilege_info_get_display_name_by_pkgtype_p3(void);
-extern int utc_privilege_info_get_display_name_by_pkgtype_p4(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_n1(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_n2(void);
+extern int utc_privilege_info_get_display_name_by_pkgtype_n3(void);
+extern int utc_privilege_info_get_display_name_by_pkgtype_n4(void);
 extern int utc_privilege_info_get_description_by_pkgtype_p1(void);
 extern int utc_privilege_info_get_description_by_pkgtype_p2(void);
-extern int utc_privilege_info_get_description_by_pkgtype_p3(void);
-extern int utc_privilege_info_get_description_by_pkgtype_p4(void);
 extern int utc_privilege_info_get_description_by_pkgtype_n1(void);
 extern int utc_privilege_info_get_description_by_pkgtype_n2(void);
+extern int utc_privilege_info_get_description_by_pkgtype_n3(void);
+extern int utc_privilege_info_get_description_by_pkgtype_n4(void);
 extern int utc_privilege_info_get_privacy_display_name_p(void);
 extern int utc_privilege_info_get_privacy_display_name_n1(void);
 extern int utc_privilege_info_get_privacy_display_name_n2(void);
@@ -55,24 +55,24 @@ extern int utc_privilege_info_free_privilege_info_list_n1(void);
 testcase tc_array[] = {
        {"utc_privilege_info_get_display_name_p1",utc_privilege_info_get_display_name_p1,NULL,NULL},
        {"utc_privilege_info_get_display_name_p2",utc_privilege_info_get_display_name_p2,NULL,NULL},
-       {"utc_privilege_info_get_display_name_p3",utc_privilege_info_get_display_name_p3,NULL,NULL},
-       {"utc_privilege_info_get_display_name_n",utc_privilege_info_get_display_name_n,NULL,NULL},
+       {"utc_privilege_info_get_display_name_n1",utc_privilege_info_get_display_name_n1,NULL,NULL},
+       {"utc_privilege_info_get_display_name_n2",utc_privilege_info_get_display_name_n2,NULL,NULL},
        {"utc_privilege_info_get_description_p1",utc_privilege_info_get_description_p1,NULL,NULL},
        {"utc_privilege_info_get_description_p2",utc_privilege_info_get_description_p2,NULL,NULL},
-       {"utc_privilege_info_get_description_p3",utc_privilege_info_get_description_p3,NULL,NULL},
-       {"utc_privilege_info_get_description_n",utc_privilege_info_get_description_n,NULL,NULL},
+       {"utc_privilege_info_get_description_n1",utc_privilege_info_get_description_n1,NULL,NULL},
+       {"utc_privilege_info_get_description_n2",utc_privilege_info_get_description_n2,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_p1",utc_privilege_info_get_display_name_by_pkgtype_p1,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_p2",utc_privilege_info_get_display_name_by_pkgtype_p2,NULL,NULL},
-       {"utc_privilege_info_get_display_name_by_pkgtype_p3",utc_privilege_info_get_display_name_by_pkgtype_p3,NULL,NULL},
-       {"utc_privilege_info_get_display_name_by_pkgtype_p4",utc_privilege_info_get_display_name_by_pkgtype_p4,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_n1",utc_privilege_info_get_display_name_by_pkgtype_n1,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_n2",utc_privilege_info_get_display_name_by_pkgtype_n2,NULL,NULL},
+       {"utc_privilege_info_get_display_name_by_pkgtype_n3",utc_privilege_info_get_display_name_by_pkgtype_n3,NULL,NULL},
+       {"utc_privilege_info_get_display_name_by_pkgtype_n4",utc_privilege_info_get_display_name_by_pkgtype_n4,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_p1",utc_privilege_info_get_description_by_pkgtype_p1,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_p2",utc_privilege_info_get_description_by_pkgtype_p2,NULL,NULL},
-       {"utc_privilege_info_get_description_by_pkgtype_p3",utc_privilege_info_get_description_by_pkgtype_p3,NULL,NULL},
-       {"utc_privilege_info_get_description_by_pkgtype_p4",utc_privilege_info_get_description_by_pkgtype_p4,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_n1",utc_privilege_info_get_description_by_pkgtype_n1,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_n2",utc_privilege_info_get_description_by_pkgtype_n2,NULL,NULL},
+       {"utc_privilege_info_get_description_by_pkgtype_n3",utc_privilege_info_get_description_by_pkgtype_n3,NULL,NULL},
+       {"utc_privilege_info_get_description_by_pkgtype_n4",utc_privilege_info_get_description_by_pkgtype_n4,NULL,NULL},
        {"utc_privilege_info_get_privacy_display_name_p",utc_privilege_info_get_privacy_display_name_p,utc_privilege_info_startup,NULL},
        {"utc_privilege_info_get_privacy_display_name_n1",utc_privilege_info_get_privacy_display_name_n1,utc_privilege_info_startup,NULL},
        {"utc_privilege_info_get_privacy_display_name_n2",utc_privilege_info_get_privacy_display_name_n2,utc_privilege_info_startup,NULL},

diff --git a/src/utc/privilege-info/tct-privilege-info-core_tizeniot.h b/src/utc/privilege-info/tct-privilege-info-core_tizeniot.h
index 0f8e84891d56a102bbb637e5f4375d97e8462904..1022bac32d2744c9df58d78c3696e2e3a54d8bfb 100755 (executable)
--- a/src/utc/privilege-info/tct-privilege-info-core_tizeniot.h
+++ b/src/utc/privilege-info/tct-privilege-info-core_tizeniot.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+// Copyright (c) 2014-2020 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
 // you may not use this file except in compliance with the License.
@@ -22,24 +22,24 @@
 extern void utc_privilege_info_startup(void);
 extern int utc_privilege_info_get_display_name_p1(void);
 extern int utc_privilege_info_get_display_name_p2(void);
-extern int utc_privilege_info_get_display_name_p3(void);
-extern int utc_privilege_info_get_display_name_n(void);
+extern int utc_privilege_info_get_display_name_n1(void);
+extern int utc_privilege_info_get_display_name_n2(void);
 extern int utc_privilege_info_get_description_p1(void);
 extern int utc_privilege_info_get_description_p2(void);
-extern int utc_privilege_info_get_description_p3(void);
-extern int utc_privilege_info_get_description_n(void);
+extern int utc_privilege_info_get_description_n1(void);
+extern int utc_privilege_info_get_description_n2(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_p1(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_p2(void);
-extern int utc_privilege_info_get_display_name_by_pkgtype_p3(void);
-extern int utc_privilege_info_get_display_name_by_pkgtype_p4(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_n1(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_n2(void);
+extern int utc_privilege_info_get_display_name_by_pkgtype_n3(void);
+extern int utc_privilege_info_get_display_name_by_pkgtype_n4(void);
 extern int utc_privilege_info_get_description_by_pkgtype_p1(void);
 extern int utc_privilege_info_get_description_by_pkgtype_p2(void);
-extern int utc_privilege_info_get_description_by_pkgtype_p3(void);
-extern int utc_privilege_info_get_description_by_pkgtype_p4(void);
 extern int utc_privilege_info_get_description_by_pkgtype_n1(void);
 extern int utc_privilege_info_get_description_by_pkgtype_n2(void);
+extern int utc_privilege_info_get_description_by_pkgtype_n3(void);
+extern int utc_privilege_info_get_description_by_pkgtype_n4(void);
 extern int utc_privilege_info_get_privacy_display_name_p(void);
 extern int utc_privilege_info_get_privacy_display_name_n1(void);
 extern int utc_privilege_info_get_privacy_display_name_n2(void);
@@ -55,24 +55,24 @@ extern int utc_privilege_info_free_privilege_info_list_n1(void);
 testcase tc_array[] = {
        {"utc_privilege_info_get_display_name_p1",utc_privilege_info_get_display_name_p1,NULL,NULL},
        {"utc_privilege_info_get_display_name_p2",utc_privilege_info_get_display_name_p2,NULL,NULL},
-       {"utc_privilege_info_get_display_name_p3",utc_privilege_info_get_display_name_p3,NULL,NULL},
-       {"utc_privilege_info_get_display_name_n",utc_privilege_info_get_display_name_n,NULL,NULL},
+       {"utc_privilege_info_get_display_name_n1",utc_privilege_info_get_display_name_n1,NULL,NULL},
+       {"utc_privilege_info_get_display_name_n2",utc_privilege_info_get_display_name_n2,NULL,NULL},
        {"utc_privilege_info_get_description_p1",utc_privilege_info_get_description_p1,NULL,NULL},
        {"utc_privilege_info_get_description_p2",utc_privilege_info_get_description_p2,NULL,NULL},
-       {"utc_privilege_info_get_description_p3",utc_privilege_info_get_description_p3,NULL,NULL},
-       {"utc_privilege_info_get_description_n",utc_privilege_info_get_description_n,NULL,NULL},
+       {"utc_privilege_info_get_description_n1",utc_privilege_info_get_description_n1,NULL,NULL},
+       {"utc_privilege_info_get_description_n2",utc_privilege_info_get_description_n2,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_p1",utc_privilege_info_get_display_name_by_pkgtype_p1,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_p2",utc_privilege_info_get_display_name_by_pkgtype_p2,NULL,NULL},
-       {"utc_privilege_info_get_display_name_by_pkgtype_p3",utc_privilege_info_get_display_name_by_pkgtype_p3,NULL,NULL},
-       {"utc_privilege_info_get_display_name_by_pkgtype_p4",utc_privilege_info_get_display_name_by_pkgtype_p4,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_n1",utc_privilege_info_get_display_name_by_pkgtype_n1,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_n2",utc_privilege_info_get_display_name_by_pkgtype_n2,NULL,NULL},
+       {"utc_privilege_info_get_display_name_by_pkgtype_n3",utc_privilege_info_get_display_name_by_pkgtype_n3,NULL,NULL},
+       {"utc_privilege_info_get_display_name_by_pkgtype_n4",utc_privilege_info_get_display_name_by_pkgtype_n4,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_p1",utc_privilege_info_get_description_by_pkgtype_p1,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_p2",utc_privilege_info_get_description_by_pkgtype_p2,NULL,NULL},
-       {"utc_privilege_info_get_description_by_pkgtype_p3",utc_privilege_info_get_description_by_pkgtype_p3,NULL,NULL},
-       {"utc_privilege_info_get_description_by_pkgtype_p4",utc_privilege_info_get_description_by_pkgtype_p4,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_n1",utc_privilege_info_get_description_by_pkgtype_n1,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_n2",utc_privilege_info_get_description_by_pkgtype_n2,NULL,NULL},
+       {"utc_privilege_info_get_description_by_pkgtype_n3",utc_privilege_info_get_description_by_pkgtype_n3,NULL,NULL},
+       {"utc_privilege_info_get_description_by_pkgtype_n4",utc_privilege_info_get_description_by_pkgtype_n4,NULL,NULL},
        {"utc_privilege_info_get_privacy_display_name_p",utc_privilege_info_get_privacy_display_name_p,utc_privilege_info_startup,NULL},
        {"utc_privilege_info_get_privacy_display_name_n1",utc_privilege_info_get_privacy_display_name_n1,utc_privilege_info_startup,NULL},
        {"utc_privilege_info_get_privacy_display_name_n2",utc_privilege_info_get_privacy_display_name_n2,utc_privilege_info_startup,NULL},

diff --git a/src/utc/privilege-info/tct-privilege-info-core_wearable.h b/src/utc/privilege-info/tct-privilege-info-core_wearable.h
index 0f8e84891d56a102bbb637e5f4375d97e8462904..1022bac32d2744c9df58d78c3696e2e3a54d8bfb 100755 (executable)
--- a/src/utc/privilege-info/tct-privilege-info-core_wearable.h
+++ b/src/utc/privilege-info/tct-privilege-info-core_wearable.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+// Copyright (c) 2014-2020 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
 // you may not use this file except in compliance with the License.
@@ -22,24 +22,24 @@
 extern void utc_privilege_info_startup(void);
 extern int utc_privilege_info_get_display_name_p1(void);
 extern int utc_privilege_info_get_display_name_p2(void);
-extern int utc_privilege_info_get_display_name_p3(void);
-extern int utc_privilege_info_get_display_name_n(void);
+extern int utc_privilege_info_get_display_name_n1(void);
+extern int utc_privilege_info_get_display_name_n2(void);
 extern int utc_privilege_info_get_description_p1(void);
 extern int utc_privilege_info_get_description_p2(void);
-extern int utc_privilege_info_get_description_p3(void);
-extern int utc_privilege_info_get_description_n(void);
+extern int utc_privilege_info_get_description_n1(void);
+extern int utc_privilege_info_get_description_n2(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_p1(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_p2(void);
-extern int utc_privilege_info_get_display_name_by_pkgtype_p3(void);
-extern int utc_privilege_info_get_display_name_by_pkgtype_p4(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_n1(void);
 extern int utc_privilege_info_get_display_name_by_pkgtype_n2(void);
+extern int utc_privilege_info_get_display_name_by_pkgtype_n3(void);
+extern int utc_privilege_info_get_display_name_by_pkgtype_n4(void);
 extern int utc_privilege_info_get_description_by_pkgtype_p1(void);
 extern int utc_privilege_info_get_description_by_pkgtype_p2(void);
-extern int utc_privilege_info_get_description_by_pkgtype_p3(void);
-extern int utc_privilege_info_get_description_by_pkgtype_p4(void);
 extern int utc_privilege_info_get_description_by_pkgtype_n1(void);
 extern int utc_privilege_info_get_description_by_pkgtype_n2(void);
+extern int utc_privilege_info_get_description_by_pkgtype_n3(void);
+extern int utc_privilege_info_get_description_by_pkgtype_n4(void);
 extern int utc_privilege_info_get_privacy_display_name_p(void);
 extern int utc_privilege_info_get_privacy_display_name_n1(void);
 extern int utc_privilege_info_get_privacy_display_name_n2(void);
@@ -55,24 +55,24 @@ extern int utc_privilege_info_free_privilege_info_list_n1(void);
 testcase tc_array[] = {
        {"utc_privilege_info_get_display_name_p1",utc_privilege_info_get_display_name_p1,NULL,NULL},
        {"utc_privilege_info_get_display_name_p2",utc_privilege_info_get_display_name_p2,NULL,NULL},
-       {"utc_privilege_info_get_display_name_p3",utc_privilege_info_get_display_name_p3,NULL,NULL},
-       {"utc_privilege_info_get_display_name_n",utc_privilege_info_get_display_name_n,NULL,NULL},
+       {"utc_privilege_info_get_display_name_n1",utc_privilege_info_get_display_name_n1,NULL,NULL},
+       {"utc_privilege_info_get_display_name_n2",utc_privilege_info_get_display_name_n2,NULL,NULL},
        {"utc_privilege_info_get_description_p1",utc_privilege_info_get_description_p1,NULL,NULL},
        {"utc_privilege_info_get_description_p2",utc_privilege_info_get_description_p2,NULL,NULL},
-       {"utc_privilege_info_get_description_p3",utc_privilege_info_get_description_p3,NULL,NULL},
-       {"utc_privilege_info_get_description_n",utc_privilege_info_get_description_n,NULL,NULL},
+       {"utc_privilege_info_get_description_n1",utc_privilege_info_get_description_n1,NULL,NULL},
+       {"utc_privilege_info_get_description_n2",utc_privilege_info_get_description_n2,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_p1",utc_privilege_info_get_display_name_by_pkgtype_p1,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_p2",utc_privilege_info_get_display_name_by_pkgtype_p2,NULL,NULL},
-       {"utc_privilege_info_get_display_name_by_pkgtype_p3",utc_privilege_info_get_display_name_by_pkgtype_p3,NULL,NULL},
-       {"utc_privilege_info_get_display_name_by_pkgtype_p4",utc_privilege_info_get_display_name_by_pkgtype_p4,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_n1",utc_privilege_info_get_display_name_by_pkgtype_n1,NULL,NULL},
        {"utc_privilege_info_get_display_name_by_pkgtype_n2",utc_privilege_info_get_display_name_by_pkgtype_n2,NULL,NULL},
+       {"utc_privilege_info_get_display_name_by_pkgtype_n3",utc_privilege_info_get_display_name_by_pkgtype_n3,NULL,NULL},
+       {"utc_privilege_info_get_display_name_by_pkgtype_n4",utc_privilege_info_get_display_name_by_pkgtype_n4,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_p1",utc_privilege_info_get_description_by_pkgtype_p1,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_p2",utc_privilege_info_get_description_by_pkgtype_p2,NULL,NULL},
-       {"utc_privilege_info_get_description_by_pkgtype_p3",utc_privilege_info_get_description_by_pkgtype_p3,NULL,NULL},
-       {"utc_privilege_info_get_description_by_pkgtype_p4",utc_privilege_info_get_description_by_pkgtype_p4,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_n1",utc_privilege_info_get_description_by_pkgtype_n1,NULL,NULL},
        {"utc_privilege_info_get_description_by_pkgtype_n2",utc_privilege_info_get_description_by_pkgtype_n2,NULL,NULL},
+       {"utc_privilege_info_get_description_by_pkgtype_n3",utc_privilege_info_get_description_by_pkgtype_n3,NULL,NULL},
+       {"utc_privilege_info_get_description_by_pkgtype_n4",utc_privilege_info_get_description_by_pkgtype_n4,NULL,NULL},
        {"utc_privilege_info_get_privacy_display_name_p",utc_privilege_info_get_privacy_display_name_p,utc_privilege_info_startup,NULL},
        {"utc_privilege_info_get_privacy_display_name_n1",utc_privilege_info_get_privacy_display_name_n1,utc_privilege_info_startup,NULL},
        {"utc_privilege_info_get_privacy_display_name_n2",utc_privilege_info_get_privacy_display_name_n2,utc_privilege_info_startup,NULL},

diff --git a/src/utc/privilege-info/utc-privilege-info.c b/src/utc/privilege-info/utc-privilege-info.c
index 4a6eb28083784446746e95442cf6e31a13d45dc9..bd2ea13447810861aaa057815bac702667dfc6c9 100755 (executable)
--- a/src/utc/privilege-info/utc-privilege-info.c
+++ b/src/utc/privilege-info/utc-privilege-info.c
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+// Copyright (c) 2014-2020 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
 // you may not use this file except in compliance with the License.
@@ -74,46 +74,39 @@ int utc_privilege_info_get_display_name_p2(void)
 }
 
 /**
- * @testcase        utc_privilege_info_get_display_name_p3
+ * @testcase        utc_privilege_info_get_display_name_n1
  * @since_tizen     2.3
  * @description     Get privilege display name
- *                  - get privilege display name with invalid privilege name
+ *                  - get privilege display name with null input parameters
  */
-int utc_privilege_info_get_display_name_p3(void)
+int utc_privilege_info_get_display_name_n1(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    char* api_version = "2.3";
     char* display_name = NULL;
-    char* not_exist_privilege_name = "http://tizen.org/privilege/badge.adminnnnnnnnn";
-    char* not_exist_privilege_display_name = "badge.adminnnnnnnnn";
-    int out_param_check = 1;
 
-    ret = privilege_info_get_display_name(api_version, not_exist_privilege_name, &display_name);
-    if(strcmp(display_name,not_exist_privilege_display_name)==0)
-    {
-        out_param_check = 0;
-    }
+    ret = privilege_info_get_display_name(NULL, NULL, &display_name);
     _free(display_name);
-    assert_eq(out_param_check, 0);
-    assert_eq(ret, PRVINFO_ERROR_NONE);
+    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
+
     return 0;
 }
 
 /**
- * @testcase        utc_privilege_info_get_display_name_n
- * @since_tizen     2.3
+ * @testcase        utc_privilege_info_get_display_name_n2
+ * @since_tizen     6.0
  * @description     Get privilege display name
- *                  - get privilege display name with null input parameters
+ *                  - get privilege display name with invalid privilege name
  */
-int utc_privilege_info_get_display_name_n(void)
+int utc_privilege_info_get_display_name_n2(void)
 {
     int ret = PRVINFO_ERROR_NONE;
+    char* api_version = "2.3";
     char* display_name = NULL;
+    char* not_exist_privilege_name = "http://tizen.org/privilege/badge.adminnnnnnnnn";
 
-    ret = privilege_info_get_display_name(NULL, NULL, &display_name);
+    ret = privilege_info_get_display_name(api_version, not_exist_privilege_name, &display_name);
     _free(display_name);
-    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
-
+    assert_eq(ret, PRVINFO_ERROR_NO_MATCHING_PRIVILEGE);
     return 0;
 }
 
@@ -156,39 +149,39 @@ int utc_privilege_info_get_description_p2(void)
 }
 
 /**
- * @testcase        utc_privilege_info_get_description_p3
+ * @testcase        utc_privilege_info_get_description_n1
  * @since_tizen     2.3
  * @description     Get privilege description
- *                  - get privilege description with invalid privilege name
+ *                  - get privilege description with null input parameters
  */
-int utc_privilege_info_get_description_p3(void)
+int utc_privilege_info_get_description_n1(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    char* api_version = "2.3";
     char* description = NULL;
-    char* not_exist_privilege_name = "http://tizen.org/privilege/badge.adminnnnnnnnn";
 
-    ret = privilege_info_get_description(api_version, not_exist_privilege_name, &description);
+    ret = privilege_info_get_description(NULL, NULL, &description);
     _free(description);
-    assert_eq(ret, PRVINFO_ERROR_NONE);
+    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
+
     return 0;
 }
 
 /**
- * @testcase        utc_privilege_info_get_description_n
- * @since_tizen     2.3
+ * @testcase        utc_privilege_info_get_description_n2
+ * @since_tizen     6.0
  * @description     Get privilege description
- *                  - get privilege description with null input parameters
+ *                  - get privilege description with invalid privilege name
  */
-int utc_privilege_info_get_description_n(void)
+int utc_privilege_info_get_description_n2(void)
 {
     int ret = PRVINFO_ERROR_NONE;
+    char* api_version = "2.3";
     char* description = NULL;
+    char* not_exist_privilege_name = "http://tizen.org/privilege/badge.adminnnnnnnnn";
 
-    ret = privilege_info_get_description(NULL, NULL, &description);
+    ret = privilege_info_get_description(api_version, not_exist_privilege_name, &description);
     _free(description);
-    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
-
+    assert_eq(ret, PRVINFO_ERROR_NO_MATCHING_PRIVILEGE);
     return 0;
 }
 
@@ -216,7 +209,7 @@ int utc_privilege_info_get_display_name_by_pkgtype_p1(void)
  * @testcase        utc_privilege_info_get_display_name_by_pkgtype_p2
  * @since_tizen     2.3
  * @description     Get privilege display name with package type
- *                  - get privilege display name with invalid privilege name and valid package type
+ *                  - get privilege display name with valid web privilege name and package type
  */
 int utc_privilege_info_get_display_name_by_pkgtype_p2(void)
 {
@@ -224,107 +217,92 @@ int utc_privilege_info_get_display_name_by_pkgtype_p2(void)
     char* api_version = "2.3";
     const char* package_type = "PRVINFO_PACKAGE_TYPE_WEB";
     char* display_name = NULL;
-    char* not_exist_privilege_name = "http://tizen.org/privilege/badge.adminnnnnnnnn";
-    char* not_exist_privilege_display_name = "badge.adminnnnnnnnn";
-    int out_param_check = 1;
+    char* web_privilege_name = "http://tizen.org/privilege/mediacapture";
 
-    ret = privilege_info_get_display_name_by_pkgtype(package_type, api_version, not_exist_privilege_name, &display_name);
-    if(strcmp(display_name,not_exist_privilege_display_name)==0)
-    {
-        out_param_check = 0;
-    }
+    ret = privilege_info_get_display_name_by_pkgtype(package_type, api_version, web_privilege_name, &display_name);
     _free(display_name);
-    assert_eq(out_param_check, 0);
     assert_eq(ret, PRVINFO_ERROR_NONE);
     return 0;
 }
 
 
 /**
- * @testcase        utc_privilege_info_get_display_name_by_pkgtype_p3
+ * @testcase        utc_privilege_info_get_display_name_by_pkgtype_n1
  * @since_tizen     2.3
  * @description     Get privilege display name with package type
- *                  - get privilege display name with valid privilege name and mismatched package type
+ *                  - get privilege display name with null input parameters
  */
-int utc_privilege_info_get_display_name_by_pkgtype_p3(void)
+int utc_privilege_info_get_display_name_by_pkgtype_n1(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    char* api_version = "2.2";
-    const char* native_package_type = "PRVINFO_PACKAGE_TYPE_NATIVE";
+    const char* package_type = "PRVINFO_PACKAGE_TYPE_NATIVE";
     char* display_name = NULL;
-    char* web_privilege_name = "http://tizen.org/privilege/filesystem.read";
-    char* package_type_mismatched_privilege_display_name = "filesystem.read";
-    int out_param_check = 1;
 
-    ret = privilege_info_get_display_name_by_pkgtype(native_package_type, api_version, web_privilege_name, &display_name);
-    if(strcmp(display_name,package_type_mismatched_privilege_display_name)==0)
-    {
-        out_param_check = 0;
-    }
+    ret = privilege_info_get_display_name_by_pkgtype(package_type, NULL, NULL, &display_name);
     _free(display_name);
-    assert_eq(out_param_check, 0);
-    assert_eq(ret, PRVINFO_ERROR_NONE);
+    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
+
     return 0;
 }
 
 /**
- * @testcase        utc_privilege_info_get_display_name_by_pkgtype_p4
+ * @testcase        utc_privilege_info_get_display_name_by_pkgtype_n2
  * @since_tizen     2.3
  * @description     Get privilege display name with package type
- *                  - get privilege display name with valid web privilege name and package type
+ *                  - get privilege display name with invalid package type parameters
  */
-int utc_privilege_info_get_display_name_by_pkgtype_p4(void)
+int utc_privilege_info_get_display_name_by_pkgtype_n2(void)
 {
     int ret = PRVINFO_ERROR_NONE;
     char* api_version = "2.3";
-    const char* package_type = "PRVINFO_PACKAGE_TYPE_WEB";
+    const char* package_type = "PRVINFO_PACKAGE_TYPE_WRONG";
     char* display_name = NULL;
-    char* web_privilege_name = "http://tizen.org/privilege/mediacapture";
+    char* privilege_name = "http://tizen.org/privilege/internet";
 
-    ret = privilege_info_get_display_name_by_pkgtype(package_type, api_version, web_privilege_name, &display_name);
+    ret = privilege_info_get_display_name_by_pkgtype(package_type, api_version, privilege_name, &display_name);
     _free(display_name);
-    assert_eq(ret, PRVINFO_ERROR_NONE);
+    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
+
     return 0;
 }
 
-
 /**
- * @testcase        utc_privilege_info_get_display_name_by_pkgtype_n1
- * @since_tizen     2.3
+ * @testcase        utc_privilege_info_get_display_name_by_pkgtype_n3
+ * @since_tizen     6.0
  * @description     Get privilege display name with package type
- *                  - get privilege display name with null input parameters
+ *                  - get privilege display name with invalid privilege name and valid package type
  */
-int utc_privilege_info_get_display_name_by_pkgtype_n1(void)
+int utc_privilege_info_get_display_name_by_pkgtype_n3(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    const char* package_type = "PRVINFO_PACKAGE_TYPE_NATIVE";
+    char* api_version = "2.3";
+    const char* package_type = "PRVINFO_PACKAGE_TYPE_WEB";
     char* display_name = NULL;
+    char* not_exist_privilege_name = "http://tizen.org/privilege/badge.adminnnnnnnnn";
 
-    ret = privilege_info_get_display_name_by_pkgtype(package_type, NULL, NULL, &display_name);
+    ret = privilege_info_get_display_name_by_pkgtype(package_type, api_version, not_exist_privilege_name, &display_name);
     _free(display_name);
-    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
-
+    assert_eq(ret, PRVINFO_ERROR_NO_MATCHING_PRIVILEGE);
     return 0;
 }
 
 /**
- * @testcase        utc_privilege_info_get_display_name_by_pkgtype_n2
- * @since_tizen     2.3
+ * @testcase        utc_privilege_info_get_display_name_by_pkgtype_n4
+ * @since_tizen     6.0
  * @description     Get privilege display name with package type
- *                  - get privilege display name with invalid package type parameters
+ *                  - get privilege display name with valid privilege name and mismatched package type
  */
-int utc_privilege_info_get_display_name_by_pkgtype_n2(void)
+int utc_privilege_info_get_display_name_by_pkgtype_n4(void)
 {
     int ret = PRVINFO_ERROR_NONE;
     char* api_version = "2.3";
-    const char* package_type = "PRVINFO_PACKAGE_TYPE_WRONG";
+    const char* native_package_type = "PRVINFO_PACKAGE_TYPE_NATIVE";
     char* display_name = NULL;
-    char* privilege_name = "http://tizen.org/privilege/internet";
+    char* web_privilege_name = "http://tizen.org/privilege/filesystem.read";
 
-    ret = privilege_info_get_display_name_by_pkgtype(package_type, api_version, privilege_name, &display_name);
+    ret = privilege_info_get_display_name_by_pkgtype(native_package_type, api_version, web_privilege_name, &display_name);
     _free(display_name);
-    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
-
+    assert_eq(ret, PRVINFO_ERROR_NO_MATCHING_PRIVILEGE);
     return 0;
 }
 
@@ -352,99 +330,99 @@ int utc_privilege_info_get_description_by_pkgtype_p1(void)
  * @testcase        utc_privilege_info_get_description_by_pkgtype_p2
  * @since_tizen     2.3
  * @description     Get privilege description with package type
- *                  - get privilege description with invalid privilege name and valid package type
+ *                  - get privilege description with valid web privilege name and package type
  */
 int utc_privilege_info_get_description_by_pkgtype_p2(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    char* api_version = "2.3";
+    char* api_version="2.3";
     const char* package_type = "PRVINFO_PACKAGE_TYPE_WEB";
     char* description = NULL;
-    char* not_exist_privilege_name = "http://tizen.org/privilege/badge.adminnnnnnnnn";
+    char* web_privilege_name = "http://tizen.org/privilege/mediacapture";
 
-    ret = privilege_info_get_description_by_pkgtype(package_type, api_version, not_exist_privilege_name, &description);
+    ret = privilege_info_get_description_by_pkgtype(package_type, api_version, web_privilege_name, &description);
     _free(description);
     assert_eq(ret, PRVINFO_ERROR_NONE);
     return 0;
 }
 
 /**
- * @testcase        utc_privilege_info_get_description_by_pkgtype_p3
+ * @testcase        utc_privilege_info_get_description_by_pkgtype_n1
  * @since_tizen     2.3
  * @description     Get privilege description with package type
- *                  - get privilege description with valid privilege name and mismatched package type
+ *                  - get privilege description with null input parameters
  */
-int utc_privilege_info_get_description_by_pkgtype_p3(void)
+int utc_privilege_info_get_description_by_pkgtype_n1(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    char* api_version = "2.2";
-    const char* native_package_type = "PRVINFO_PACKAGE_TYPE_NATIVE";
+    const char* package_type = "PRVINFO_PACKAGE_TYPE_NATIVE";
     char* description = NULL;
-    char* web_privilege_name = "http://tizen.org/privilege/filesystem.read";
 
-    ret = privilege_info_get_display_name_by_pkgtype(native_package_type, api_version, web_privilege_name, &description);
+    ret = privilege_info_get_description_by_pkgtype(package_type, NULL, NULL, &description);
     _free(description);
-    assert_eq(ret, PRVINFO_ERROR_NONE);
+    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
+
     return 0;
 }
 
 /**
- * @testcase        utc_privilege_info_get_description_by_pkgtype_p4
+ * @testcase        utc_privilege_info_get_description_by_pkgtype_n2
  * @since_tizen     2.3
  * @description     Get privilege description with package type
- *                  - get privilege description with valid web privilege name and package type
+ *                  - get privilege description with invalid package type parameters
  */
-int utc_privilege_info_get_description_by_pkgtype_p4(void)
+int utc_privilege_info_get_description_by_pkgtype_n2(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    char* api_version="2.3";
-    const char* package_type = "PRVINFO_PACKAGE_TYPE_WEB";
+    char* api_version = "2.3";
+    const char* package_type = "PRVINFO_PACKAGE_TYPE_WRONG";
     char* description = NULL;
-    char* web_privilege_name = "http://tizen.org/privilege/mediacapture";
+    char* privilege_name = "http://tizen.org/privilege/internet";
 
-    ret = privilege_info_get_description_by_pkgtype(package_type, api_version, web_privilege_name, &description);
+    ret = privilege_info_get_description_by_pkgtype(package_type, api_version, privilege_name, &description);
     _free(description);
-    assert_eq(ret, PRVINFO_ERROR_NONE);
+    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
+
     return 0;
 }
 
 /**
- * @testcase        utc_privilege_info_get_description_by_pkgtype_n1
- * @since_tizen     2.3
+ * @testcase        utc_privilege_info_get_description_by_pkgtype_n3
+ * @since_tizen     6.0
  * @description     Get privilege description with package type
- *                  - get privilege description with null input parameters
+ *                  - get privilege description with invalid privilege name and valid package type
  */
-int utc_privilege_info_get_description_by_pkgtype_n1(void)
+int utc_privilege_info_get_description_by_pkgtype_n3(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    const char* package_type = "PRVINFO_PACKAGE_TYPE_NATIVE";
+    char* api_version = "2.3";
+    const char* package_type = "PRVINFO_PACKAGE_TYPE_WEB";
     char* description = NULL;
+    char* not_exist_privilege_name = "http://tizen.org/privilege/badge.adminnnnnnnnn";
 
-    ret = privilege_info_get_description_by_pkgtype(package_type, NULL, NULL, &description);
+    ret = privilege_info_get_description_by_pkgtype(package_type, api_version, not_exist_privilege_name, &description);
     _free(description);
-    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
-
+    assert_eq(ret, PRVINFO_ERROR_NO_MATCHING_PRIVILEGE);
     return 0;
 }
 
 /**
- * @testcase        utc_privilege_info_get_description_by_pkgtype_n2
- * @since_tizen     2.3
+ * @testcase        utc_privilege_info_get_description_by_pkgtype_n4
+ * @since_tizen     6.0
  * @description     Get privilege description with package type
- *                  - get privilege description with invalid package type parameters
+ *                  - get privilege description with valid privilege name and mismatched package type
  */
-int utc_privilege_info_get_description_by_pkgtype_n2(void)
+int utc_privilege_info_get_description_by_pkgtype_n4(void)
 {
     int ret = PRVINFO_ERROR_NONE;
     char* api_version = "2.3";
-    const char* package_type = "PRVINFO_PACKAGE_TYPE_WRONG";
+    const char* native_package_type = "PRVINFO_PACKAGE_TYPE_NATIVE";
     char* description = NULL;
-    char* privilege_name = "http://tizen.org/privilege/internet";
+    char* web_privilege_name = "http://tizen.org/privilege/filesystem.read";
 
-    ret = privilege_info_get_description_by_pkgtype(package_type, api_version, privilege_name, &description);
+    ret = privilege_info_get_display_name_by_pkgtype(native_package_type, api_version, web_privilege_name, &description);
     _free(description);
-    assert_eq(ret, PRVINFO_ERROR_INVALID_PARAMETER);
-
+    assert_eq(ret, PRVINFO_ERROR_NO_MATCHING_PRIVILEGE);
     return 0;
 }
 
@@ -545,7 +523,7 @@ static void __free_privilege_info_list(gpointer privilege_info_list)
 int utc_privilege_info_get_privilege_info_list_p1(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    int return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
+    privilege_consumer_return_code_e return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
 
     GList* privilege_name_list = NULL;
     GList* privilege_info_list = NULL;
@@ -575,7 +553,7 @@ int utc_privilege_info_get_privilege_info_list_p1(void)
 int utc_privilege_info_get_privilege_info_list_p2(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    int return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
+    privilege_consumer_return_code_e return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
 
     GList* privilege_name_list = NULL;
     GList* privilege_info_list = NULL;
@@ -606,7 +584,7 @@ int utc_privilege_info_get_privilege_info_list_p2(void)
 int utc_privilege_info_get_privilege_info_list_p3(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    int return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
+    privilege_consumer_return_code_e return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
 
     GList* privilege_name_list = NULL;
     GList* privilege_info_list = NULL;
@@ -636,7 +614,7 @@ int utc_privilege_info_get_privilege_info_list_p3(void)
 int utc_privilege_info_get_privilege_info_list_p4(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    int return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
+    privilege_consumer_return_code_e return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
 
     GList* privilege_name_list = NULL;
     GList* privilege_info_list = NULL;
@@ -666,7 +644,7 @@ int utc_privilege_info_get_privilege_info_list_p4(void)
 int utc_privilege_info_get_privilege_info_list_p5(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    int return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
+    privilege_consumer_return_code_e return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
 
     GList* privilege_name_list = NULL;
     GList* privilege_info_list = NULL;
@@ -696,7 +674,7 @@ int utc_privilege_info_get_privilege_info_list_p5(void)
 int utc_privilege_info_get_privilege_info_list_n1(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    int return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
+    privilege_consumer_return_code_e return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
 
     GList* privilege_name_list = NULL;
     GList* privilege_info_list = NULL;
@@ -723,7 +701,7 @@ int utc_privilege_info_get_privilege_info_list_n1(void)
 int utc_privilege_info_free_privilege_info_list_p1(void)
 {
     int ret = PRVINFO_ERROR_NONE;
-    int return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
+    privilege_consumer_return_code_e return_result = PRIVILEGE_CONSUMER_RETURN_CODE_SUCCESS;
 
     GList* privilege_name_list = NULL;
     GList* privilege_info_list = NULL;