projects / platform / core / security / privilege-checker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5dd290a)
Refactoring for __test_privilege_manager_get_mapped_privilege_list function in tc... 78/319078/4
authortranthanhtung2001 <tran.tung@samsung.com>
Tue, 15 Oct 2024 01:59:45 +0000 (08:59 +0700)
committertranthanhtung2001 <tran.tung@samsung.com>
Tue, 15 Oct 2024 06:17:54 +0000 (13:17 +0700)
Change-Id: I6b664d13a5c0d771f92447f5c4174fb58fea3a75
Signed-off-by: tranthanhtung2001 <tran.tung@samsung.com>
capi/src/privilege_db_manager.c patch | blob | history
test/tc-privilege-manager.c patch | blob | history

diff --git a/capi/src/privilege_db_manager.c b/capi/src/privilege_db_manager.c
index b9b5f2391b6177d0d644cd42527f5b4367316313..5050eb43b2e506a0e0c8de62f9a42236a0e2ec2b 100644 (file)
--- a/capi/src/privilege_db_manager.c
+++ b/capi/src/privilege_db_manager.c
@@ -381,7 +381,7 @@ int privilege_db_manager_get_mapped_privilege_list(const char *api_version, priv
        char *privilege_list_str = NULL;
        TryReturn(__make_privilege_list_str(privilege_list, &privilege_list_str) == 0 && privilege_list_str != NULL, sqlite3_close(db), PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY, "[PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY] making privilege_list_str for where in query is failed.");
 
-       char *sql =  sqlite3_mprintf("select distinct mapped_privilege_name, from_api_version, to_api_version from privilege_mapping where package_type_id=%d and privilege_name in(%s)", package_type, privilege_list_str, package_type);
+       char *sql =  sqlite3_mprintf("select distinct mapped_privilege_name, from_api_version, to_api_version from privilege_mapping where package_type_id=%d and privilege_name in(%s)", package_type, privilege_list_str);
        SAFE_SQLITE_FREE(privilege_list_str);
 
        TRY_PREPARE_STMT(db, sql, &stmt);
diff --git a/test/tc-privilege-manager.c b/test/tc-privilege-manager.c
index 50ec80d7465a0b3807c03fef0c0b04201ccadf28..a311630b560c28ce2bf0c666b2aa7ec7c79c77bf 100644 (file)
--- a/test/tc-privilege-manager.c
+++ b/test/tc-privilege-manager.c
@@ -75,23 +75,14 @@ void __test_privilege_manager_get_mapped_privilege_list()
        /* 2.3 core - mobile */
        __tcinfo(version_type, "2.3", "core");
 
-       __tcinfo(goal, POS_TC_PREFIX "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);
-       ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
-       __print_privilege_list(mapped_privilege_list);
-       __print_line();
-       gfree(privilege_list);
-
-       __tcinfo(goal, POS_TC_PREFIX "TC2");
+       __tcinfo(goal, POS_TC_PREFIX "check privilege_manager_get_mapped_privilege_list with the params below");
        __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);
        __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);
+       ret = privilege_manager_get_mapped_privilege_list(api_version, PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
+       __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
 
@@ -103,7 +94,7 @@ void __test_privilege_manager_get_mapped_privilege_list()
        __tcinfo(goal, POS_TC_PREFIX "normal mapping");
        __privinfo("http://tizen.org/privilege/message.read", NULL, NULL);
        __tcinfo(expect, PRVMGR_ERR_NONE);
-       ret = privilege_manager_get_mapped_privilege_list("3.0", PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
+       ret = privilege_manager_get_mapped_privilege_list(api_version, PRVMGR_PACKAGE_TYPE_CORE, privilege_list, &mapped_privilege_list);
        __print_result('m', ret);
        __print_privilege_list(mapped_privilege_list);
        __print_line();
@@ -119,36 +110,9 @@ 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(api_version, PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result('m', ret);
-       __print_privilege_list(mapped_privilege_list);
-       __print_line();
-
-       gfree(privilege_list);
-
-       __tcinfo(goal, POS_TC_PREFIX "normal mapping");
-       __privinfo("http://tizen.org/privilege/internal/default/platform", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
-       __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(api_version, PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result('m', ret);
-       __print_privilege_list(mapped_privilege_list);
-       __print_line();
-
-       gfree(privilege_list);
-
-       __tcinfo(goal, POS_TC_PREFIX "normal mapping");
-       __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/content.read", NULL, NULL);
        __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);
-       ret = privilege_manager_get_mapped_privilege_list("2.2.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
+       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();
@@ -164,56 +128,12 @@ 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.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result('m', ret);
-       __print_privilege_list(mapped_privilege_list);
-       __print_line();
-
-       gfree(privilege_list);
-
-       __tcinfo(goal, POS_TC_PREFIX "normal mapping");
-       __privinfo("http://tizen.org/privilege/internal/default/platform", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/account.read", NULL, NULL);
-       __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.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result('m', ret);
-       __print_privilege_list(mapped_privilege_list);
-       __print_line();
-
-       gfree(privilege_list);
-
-       __tcinfo(goal, POS_TC_PREFIX "normal mapping");
-       __privinfo("http://tizen.org/privilege/internal/default/public", NULL, NULL);
-       __privinfo("http://tizen.org/privilege/content.read", NULL, NULL);
        __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);
-       ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
-       __print_result('m', ret);
-       __print_privilege_list(mapped_privilege_list);
-       __print_line();
-
-       gfree(privilege_list);
-
-       __tcinfo(goal, POS_TC_PREFIX "normal mapping");
        __privinfo("http://tizen.org/privilege/location", NULL, NULL);
-       __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('m', ret);
-       __print_privilege_list(mapped_privilege_list);
-       __print_line();
-
-       gfree(privilege_list);
-
-       __tcinfo(goal, POS_TC_PREFIX "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/platform", NULL, NULL);
        __tcinfo(expect, PRVMGR_ERR_NONE);
-       ret = privilege_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
+       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();
@@ -225,18 +145,9 @@ void __test_privilege_manager_get_mapped_privilege_list()
 
        __tcinfo(goal, POS_TC_PREFIX "normal mapping");
        __privinfo("http://tizen.org/privilege/location", NULL, NULL);
-       __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('m', ret);
-       __print_privilege_list(mapped_privilege_list);
-       __print_line();
-
-       gfree(privilege_list);
-
-       __tcinfo(goal, POS_TC_PREFIX "normal mapping");
        __privinfo("http://tizen.org/privilege/internal/default/platform", NULL, NULL);
        __tcinfo(expect, PRVMGR_ERR_NONE);
-       ret = privilege_manager_get_mapped_privilege_list("2.4", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list);
+       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();
Domain: Security / Application Privilege;