From: Yunjin Lee Date: Tue, 17 Jul 2018 07:57:36 +0000 (+0900) Subject: Fix test code to work properly X-Git-Tag: accepted/tizen/unified/20180817.061731~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b02f5412446ed32c9988a28f8d0f6c2e516a10b3;p=platform%2Fcore%2Fsecurity%2Fprivilege-checker.git Fix test code to work properly Change-Id: I0032115af0fea6d4c4f6ea4595ca4ab8f6f8fea2 Signed-off-by: Yunjin Lee --- diff --git a/test/tc-common.c b/test/tc-common.c index a6aa275..0800e97 100755 --- a/test/tc-common.c +++ b/test/tc-common.c @@ -117,7 +117,7 @@ void __print_error_message(char *error_message) 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) + 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) { diff --git a/test/tc-privilege-db-manager.c b/test/tc-privilege-db-manager.c index af3a3fd..1cf8e3f 100755 --- a/test/tc-privilege-db-manager.c +++ b/test/tc-privilege-db-manager.c @@ -47,9 +47,12 @@ void __print_mapped_privilege_list(int ret, GList* mapped_privilege_list) char *privilege_name = (char *)l->data; printf("mapped_privilege_name = %s\n", privilege_name); } + printf_green("success\n"); success_cnt++; - } else + } else { fail_cnt++; + printf_red("failed\n"); + } printf("test result = %s\n", __get_result_string('d', ret)); } @@ -103,10 +106,10 @@ void __test_privilege_db_manager_get_mapped_privilege_list() __print_line(); printf("privilege : http://tizen.org/privilege/internal/default/public\n"); - printf("api_version : 2.2.1\n"); + printf("api_version : 2.3\n"); printf("package type : wrt\n"); privilege_list = g_list_append(privilege_list, "http://tizen.org/privilege/internal/default/public"); - ret = privilege_db_manager_get_mapped_privilege_list("2.2.1", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list); + ret = privilege_db_manager_get_mapped_privilege_list("2.3", PRVMGR_PACKAGE_TYPE_WRT, privilege_list, &mapped_privilege_list); __print_mapped_privilege_list(ret, mapped_privilege_list); g_list_free(privilege_list); @@ -334,12 +337,12 @@ void __test_privilege_db_manager_get_privacy_by_privilege() ret = privilege_db_manager_get_privacy_by_privilege("http://tizen.org/privilege/account.read", &privacy_name); ret = privilege_db_manager_get_privacy_id_by_privilege("http://tizen.org/privilege/account.read", &privacy_id); printf("privacy name = %s, privacy_id = %d\n", privacy_name, privacy_id); - if (ret == 0 && !strcmp(privacy_name, "http://tizen.org/privacy/account") && privacy_id == 0) { + if ((ENABLE_ASKUSER && ret == 0 && !strcmp(privacy_name, "http://tizen.org/privacy/account") && privacy_id == 0) || (DISABLE_ASKUSER && ret == PRIVILEGE_DB_MANAGER_ERR_NO_EXIST_RESULT)) { success_cnt++; printf_green("success\n"); } else { fail_cnt++; - printf_red("fail\n"); + printf_red("fail. ret = %s\n", __get_result_string('d', ret)); } free(privacy_name); @@ -351,7 +354,7 @@ void __test_privilege_db_manager_get_privacy_by_privilege() ret = privilege_db_manager_get_privacy_by_privilege("http://tizen.org/privilege/location", &privacy_name); ret = privilege_db_manager_get_privacy_id_by_privilege("http://tizen.org/privilege/location", &privacy_id); printf("privacy name = %s, privacy_id = %d\n", privacy_name, privacy_id); - if (ret == 0 && !strcmp(privacy_name, "http://tizen.org/privacy/location") && privacy_id == 6) { + if ((ENABLE_ASKUSER && ret == 0 && !strcmp(privacy_name, "http://tizen.org/privacy/location") && privacy_id == 6) || (DISABLE_ASKUSER && ret == PRIVILEGE_DB_MANAGER_ERR_NO_EXIST_RESULT)) { success_cnt++; printf_green("success\n"); } else { @@ -367,7 +370,7 @@ void __test_privilege_db_manager_get_privacy_by_privilege() ret = privilege_db_manager_get_privacy_by_privilege("http://tizen.org/privilege/call", &privacy_name); ret = privilege_db_manager_get_privacy_id_by_privilege("http://tizen.org/privilege/call", &privacy_id); printf("privacy name = %s, privacy_id = %d\n", privacy_name, privacy_id); - if (ret == 0 && !strcmp(privacy_name, "http://tizen.org/privacy/call") && privacy_id == 3) { + if ((ENABLE_ASKUSER && ret == 0 && !strcmp(privacy_name, "http://tizen.org/privacy/call") && privacy_id == 3) || (DISABLE_ASKUSER && ret == PRIVILEGE_DB_MANAGER_ERR_NO_EXIST_RESULT)) { success_cnt++; printf_green("success\n"); } else { @@ -388,7 +391,7 @@ void __test_privilege_db_manager_is_privacy_white_list() printf("is privacy whitelist\n"); ret = privilege_db_manager_is_privacy_white_list("ise-default", "http://tizen.org/privilege/call"); printf("ret = %d\n", ret); - if (ret == 1) { + if ((ENABLE_ASKUSER && ret == 1) || (DISABLE_ASKUSER && ret == PRIVILEGE_DB_MANAGER_ERR_NO_EXIST_RESULT)) { success_cnt++; printf_green("success\n"); } else { @@ -402,7 +405,7 @@ void __test_privilege_db_manager_is_privacy_white_list() printf("is not privacy whitelist\n"); ret = privilege_db_manager_is_privacy_white_list("ise-default", "http://tizen.org/privilege/location"); printf("ret = %d\n", ret); - if ((ENABLE_ASKUSER && ret == 0) || (DISABLE_ASKUSER && ret == 1)) { + if ((ENABLE_ASKUSER && ret == 0) || (DISABLE_ASKUSER && ret == PRIVILEGE_DB_MANAGER_ERR_NO_EXIST_RESULT)) { success_cnt++; printf_green("success\n"); } else { @@ -416,7 +419,7 @@ void __test_privilege_db_manager_is_privacy_white_list() printf("is privacy whitelist\n"); ret = privilege_db_manager_is_privacy_white_list("ise-default", "http://tizen.org/privilege/calendar.read"); printf("ret = %d\n", ret); - if (ret == 1) { + if ((ENABLE_ASKUSER && ret == 1) || (DISABLE_ASKUSER && ret == PRIVILEGE_DB_MANAGER_ERR_NO_EXIST_RESULT)) { success_cnt++; printf_green("success\n"); } else { @@ -430,7 +433,7 @@ void __test_privilege_db_manager_is_privacy_white_list() printf("is not privacy whitelist\n"); ret = privilege_db_manager_is_privacy_white_list("orxxxxx", "http://tizen.org/privilege/call"); printf("ret = %d\n", ret); - if ((ENABLE_ASKUSER && ret == 0) || (DISABLE_ASKUSER && ret == 1)) { + if ((ENABLE_ASKUSER && ret == 0) || (DISABLE_ASKUSER && ret == PRIVILEGE_DB_MANAGER_ERR_NO_EXIST_RESULT)) { success_cnt++; printf_green("success\n"); } else { @@ -474,12 +477,12 @@ void __test_privilege_db_manager_is_user_settable() int ret = 0; __print_line(); - printf("pkgid: org.tizen.gps-syspopup\n"); + printf("pkgid: ise-default\n"); printf("privilege: http://tizen.org/privacy/calendar\n"); printf("is not user-settable\n"); - ret = privilege_db_manager_is_user_settable("org.tizen.gps-syspopup", "http://tizen.org/privacy/calendar"); + ret = privilege_db_manager_is_user_settable("ise-default", "http://tizen.org/privacy/calendar"); printf("ret = %d\n", ret); - if (ret == 0) { + if ((ENABLE_ASKUSER && ret == 0) || (DISABLE_ASKUSER && ret == 1)) { success_cnt++; printf_green("success\n"); } else { @@ -488,10 +491,10 @@ void __test_privilege_db_manager_is_user_settable() } __print_line(); - printf("pkgid: org.tizen.gps-syspopup\n"); + printf("pkgid: ise-default\n"); printf("privilege: http://tizen.org/privacy/location\n"); printf("is user-settable\n"); - ret = privilege_db_manager_is_user_settable("org.tizen.gps-syspopup", "http://tizen.org/privacy/location"); + ret = privilege_db_manager_is_user_settable("ise-default", "http://tizen.org/privacy/location"); printf("ret = %d\n", ret); if (ret == 1) { success_cnt++; diff --git a/test/tc-privilege-info.c b/test/tc-privilege-info.c index 8aec9ad..271eb7a 100755 --- a/test/tc-privilege-info.c +++ b/test/tc-privilege-info.c @@ -141,17 +141,6 @@ static void __test_privilege_info_is_internal() } __print_line(); - printf("privilege : http://tizen.org/privilege/internal/dbus\n"); - ret = privilege_info_is_internal("http://tizen.org/privilege/internal/dbus"); - if (ret == 1) { - success_cnt++; - printf_green("SUCCESS: http://tizen.org/privilege/internal/dbus is internal\n"); - } else { - fail_cnt++; - printf_red("Test FAILED. ret = %d\n", ret); - } - __print_line(); - printf("privilege : http://tizen.org/privilege/internet\n"); ret = privilege_info_is_internal("http://tizen.org/privilege/internet"); if (ret == 0) { @@ -178,9 +167,13 @@ static void __test_privilege_info_is_privacy() int ret; printf("privilege : http://tizen.org/privilege/account.read\n"); ret = privilege_info_is_privacy("http://tizen.org/privilege/account.read"); - if (ret == 1) { + if ((DISABLE_ASKUSER && ret == 0) || (ENABLE_ASKUSER && ret == 1)) { success_cnt++; - printf_green("SUCCESS: http://tizen.org/privilege/account.read is PRIVACY\n"); + if (DISABLE_ASKUSER) { + printf_green("SUCCESS: ret = %d, privacy privilege disabled.\n", ret); + } else { + printf_green("SUCCESS: ret = %d, http://tizen.org/privilege/account.read is PRIVACY\n", ret); + } } else { fail_cnt++; printf_red("Test FAILED. ret = %d\n", ret); @@ -352,9 +345,9 @@ static void __test_privilege_info_get_privacy_by_privilege() printf("privilege : http://tizen.org/privilege/apphistory.read\n"); char* privacy = NULL; int ret = privilege_info_get_privacy_by_privilege("http://tizen.org/privilege/apphistory.read", &privacy); - if (ret == PRVMGR_ERR_NONE) { + if ((ENABLE_ASKUSER && ret == PRVMGR_ERR_NONE) || (DISABLE_ASKUSER && ret == PRVMGR_ERR_INVALID_PARAMETER)) { success_cnt++; - printf_green("Test SUCCEEDED, privacy id: %s\n", privacy); + printf_green("Test SUCCEEDED, ret = %s, privacy id: %s\n", __get_result_string('m', ret), privacy); } else { fail_cnt++; printf_red("Test FAILED\n"); @@ -489,7 +482,7 @@ static void __test_privilege_info_get_privilege_type() __print_line(); printf("uid = 5001\n"); - printf("pkgid = org.tizen.contacts\norg.tizen.contacts"); + printf("pkgid = org.tizen.contacts\n"); printf("privilege = http://tizen.org/privilege/internet\n"); printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL\n"); ret = privilege_info_get_privilege_type(5001, "org.tizen.contacts", "http://tizen.org/privilege/internet", &type); @@ -502,10 +495,10 @@ static void __test_privilege_info_get_privilege_type() } __print_line(); - printf("uid = 201\n"); + printf("uid = 5001\n"); printf("pkgid = org.tizen.camera-app\n"); printf("privilege = http://tizen.org/privilege/location\n"); - ret = privilege_info_get_privilege_type(201, "org.tizen.camera-app", "http://tizen.org/privilege/location", &type); + ret = privilege_info_get_privilege_type(5001, "org.tizen.camera-app", "http://tizen.org/privilege/location", &type); if (DISABLE_ASKUSER) { printf("expected type = PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL\n"); test = (ret == PRVMGR_ERR_NONE && type == PRIVILEGE_MANAGER_PRIVILEGE_TYPE_NORMAL); @@ -602,9 +595,9 @@ void __test_privilege_info_is_user_settable() printf("privacy = http://tizen.org/privacy/camera\n"); ret = privilege_info_is_user_settable("ise-default", "http://tizen.org/privacy/camera"); printf("is not user settable\n"); - if (ret == 0) { + if ((DISABLE_ASKUSER && ret == 1) || (ENABLE_ASKUSER && ret == 0)) { success_cnt++; - printf_green("success\n"); + printf_green("success. ret = %d\n", ret); } else { fail_cnt++; printf_red("fail. ret = %d\n", ret); diff --git a/test/tc-privilege-manager.c b/test/tc-privilege-manager.c index 1b8cf33..5943c8c 100755 --- a/test/tc-privilege-manager.c +++ b/test/tc-privilege-manager.c @@ -234,6 +234,18 @@ static void __test_privilege_manager_verify_metadata() int ret = 0; GList *metadata_list = NULL; + ret = system("/usr/bin/sqlite3 /usr/share/privilege-manager/.privilege.db \"insert into privilege_info(package_type_id, package_type, privilege_level_id, privilege_level, documented, privilege_name, privilege_display, privilege_description, privilege_group_id, privilege_group) values (2, 'metadata', 0, 'public', 'no', 'http://tizen.org/metadata/public', '', '', 6, 'IDS_TPLATFORM_BODY_OTHER_PRIVILEGES_ABB')\""); + if (ret != 0) + printf_red("system failed!!!\n"); + + ret = system("/usr/bin/sqlite3 /usr/share/privilege-manager/.privilege.db \"insert into privilege_info(package_type_id, package_type, privilege_level_id, privilege_level, documented, privilege_name, privilege_display, privilege_description, privilege_group_id, privilege_group) values (2, 'metadata', 1, 'partner', 'no', 'http://tizen.org/metadata/partner', '', '', 6, 'IDS_TPLATFORM_BODY_OTHER_PRIVILEGES_ABB')\""); + if (ret != 0) + printf_red("system failed!!!\n"); + + ret = system("/usr/bin/sqlite3 /usr/share/privilege-manager/.privilege.db \"insert into privilege_info(package_type_id, package_type, privilege_level_id, privilege_level, documented, privilege_name, privilege_display, privilege_description, privilege_group_id, privilege_group) values (2, 'metadata', 2, 'platform', 'no', 'http://tizen.org/metadata/platform', '', '', 6, 'IDS_TPLATFORM_BODY_OTHER_PRIVILEGES_ABB')\""); + if (ret != 0) + printf_red("system failed!!!\n"); + printf("metadata : http://tizen.org/metadata/public\n"); metadata_list = g_list_append(metadata_list, "http://tizen.org/metadata/public"); __tcinfo(cert_level, "public"); @@ -274,6 +286,11 @@ static void __test_privilege_manager_verify_metadata() free(error_message); error_message = NULL; gfree(metadata_list); + + ret = system("/usr/bin/sqlite3 /usr/share/privilege-manager/.privilege.db \"delete from privilege_info where package_type_id=2 and privilege_name in ('http://tizen.org/metadata/public', 'http://tizen.org/metadata/partner', 'http://tizen.org/metadata/platform')\""); + if (ret != 0) + printf_red("system failed!!!\n"); + } static void __privilege_manager_verify_privilege() diff --git a/test/tc-privilege-package-info.c b/test/tc-privilege-package-info.c index ccadc4f..63d0373 100755 --- a/test/tc-privilege-package-info.c +++ b/test/tc-privilege-package-info.c @@ -174,16 +174,17 @@ static void __test_privilege_package_info() int main() { - - __tcinfo(function, "privilege_package_info_set_privacy_privilege"); - __tcinfo(function, "privilege_package_info_set_ciritical_privilege"); - __tcinfo(function, "privilege_package_info_unset_package_privilege_info"); - __tcinfo(function, "privilege_package_info_is_privacy_requestable"); - __tcinfo(function, "privilege_package_info_is_privacy_requestable_api_version"); - __tcinfo(function, "privilege_package_info_get_privacy_list_by_pkgid"); - __tcinfo(function, "privilege_package_info_get_package_list_by_privacy"); - __tcinfo(function, "privilege_package_info_get_privilege_list_by_pkgid_and_privacy"); - __test_privilege_package_info(); + if (ENABLE_ASKUSER) { + __tcinfo(function, "privilege_package_info_set_privacy_privilege"); + __tcinfo(function, "privilege_package_info_set_ciritical_privilege"); + __tcinfo(function, "privilege_package_info_unset_package_privilege_info"); + __tcinfo(function, "privilege_package_info_is_privacy_requestable"); + __tcinfo(function, "privilege_package_info_is_privacy_requestable_api_version"); + __tcinfo(function, "privilege_package_info_get_privacy_list_by_pkgid"); + __tcinfo(function, "privilege_package_info_get_package_list_by_privacy"); + __tcinfo(function, "privilege_package_info_get_privilege_list_by_pkgid_and_privacy"); + __test_privilege_package_info(); + } printf_green("Test Complete\n"); printf_green("success : %d, ", success_cnt);