From 83f471e2f892ed393b686aab6d4eadc5b60b46e9 Mon Sep 17 00:00:00 2001 From: Bartlomiej Grzelewski Date: Tue, 26 Nov 2013 11:03:17 +0100 Subject: [PATCH] Remove test of security_server_get_object_name. Function security_server_get_object_name will be removed from security-server. [Issue#] N/A [Bug/Problem] Tests of deprecated/unused api. [Cause] N/A [Solution] Test were removed. [Verfication] Build, run tests. Change-Id: Iba39345e8fa6a109c6284d99e4c2eee73d2f9720 --- .../security_server_measurer_API_speed.cpp | 17 ---------- .../security_server_tests_server.cpp | 32 ------------------ .../security_server_tests_weird_arguments.cpp | 39 ---------------------- 3 files changed, 88 deletions(-) diff --git a/tests/security-server-tests/security_server_measurer_API_speed.cpp b/tests/security-server-tests/security_server_measurer_API_speed.cpp index a9ef2f7..3ea2130 100644 --- a/tests/security-server-tests/security_server_measurer_API_speed.cpp +++ b/tests/security-server-tests/security_server_measurer_API_speed.cpp @@ -313,23 +313,6 @@ RUNNER_TEST(m010_security_server_security_server_get_gid) { /* * measurer: Fails only on connection error. */ -RUNNER_TEST(m020_security_server_get_object_name) { - int ret; - char obj_name[SECURITY_SERVER_MAX_OBJ_NAME]; - readwrite_stats stats; - initialize_stats(&stats); - for (int i = 1; i <= NUMBER_OF_CALLS; i++) { - start_stats_update(&stats); - ret = security_server_get_object_name(6001, obj_name, sizeof(obj_name)); - RUNNER_ASSERT_MSG(communication_succeeded(ret) == 0, "commmunication error; ret = " << ret); - end_stats_update(&stats); - } - finish_stats(&stats, "security_server_get_object_name"); -} - -/* - * measurer: Fails only on connection error. - */ RUNNER_TEST(m030_security_server_request_cookie) { int ret; size_t cookie_size; diff --git a/tests/security-server-tests/security_server_tests_server.cpp b/tests/security-server-tests/security_server_tests_server.cpp index e731221..1acc8a4 100644 --- a/tests/security-server-tests/security_server_tests_server.cpp +++ b/tests/security-server-tests/security_server_tests_server.cpp @@ -415,25 +415,6 @@ RUNNER_TEST(tc_security_server_get_gid_wrong_object_name_teltel) RUNNER_ASSERT(security_server_get_gid("teltel") == SECURITY_SERVER_API_ERROR_NO_SUCH_OBJECT); } -RUNNER_TEST(tc_security_server_get_object_name_normal_case_trying_6001) -{ - ret = security_server_get_object_name(DB_ALARM_GID, obj_name, sizeof(obj_name)); - SLOGD("Result: %s\n", obj_name); - RUNNER_ASSERT(ret == SECURITY_SERVER_API_SUCCESS); -} - -RUNNER_TEST(tc_security_server_get_object_name_too_small_buffer_size) -{ - ret = security_server_get_object_name(DB_ALARM_GID, obj_name, 5); - RUNNER_ASSERT(ret == SECURITY_SERVER_API_ERROR_BUFFER_TOO_SMALL); -} - -RUNNER_TEST(tc_security_server_get_object_name_invalid_gid) -{ - ret = security_server_get_object_name(9876, obj_name, sizeof(obj_name)); - RUNNER_ASSERT(ret == SECURITY_SERVER_API_ERROR_NO_SUCH_OBJECT); -} - RUNNER_TEST(tc_ask_for_privilege_with_default_cookie_normal_case_to_check_audio_privilege) { printhex(cookie, COOKIE_SIZE); @@ -696,7 +677,6 @@ RUNNER_CHILD_TEST_SMACK(tc05_check_API_middleware_allow) size_t cookie_size = security_server_get_cookie_size(); char cookie[20]; char *ss_label = NULL; - char object[SECURITY_SERVER_MAX_OBJ_NAME]; struct smack_accesses *handle = NULL; /* allow subject 'subjet_allow' to security-server::api-middleware */ @@ -723,9 +703,6 @@ RUNNER_CHILD_TEST_SMACK(tc05_check_API_middleware_allow) ret = security_server_check_privilege(cookie, ret); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, "ret: " << ret); - ret = security_server_get_object_name(APP_GID, object, sizeof(object)); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, "ret: " << ret); - ret = security_server_get_gid("root"); RUNNER_ASSERT_MSG(ret > -1, "ret: " << ret); @@ -748,7 +725,6 @@ RUNNER_CHILD_TEST(tc06_check_API_middleware_denied) size_t cookie_size = security_server_get_cookie_size(); char cookie[20]; char *ss_label = NULL; - char object[SECURITY_SERVER_MAX_OBJ_NAME]; ret = smack_set_label_for_self(subject_denied); RUNNER_ASSERT_MSG(ret == 0, "ret: " << ret); @@ -762,9 +738,6 @@ RUNNER_CHILD_TEST(tc06_check_API_middleware_denied) ret = security_server_check_privilege(cookie, DB_ALARM_GID); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED, "ret: " << ret); - ret = security_server_get_object_name(DB_ALARM_GID, object, sizeof(object)); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED, "ret: " << ret); - ret = security_server_get_gid("root"); RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_ACCESS_DENIED, "ret: " << ret); @@ -1171,7 +1144,6 @@ RUNNER_CHILD_TEST_NOSMACK(tc05_check_API_middleware_allow_nosmack) size_t cookie_size = security_server_get_cookie_size(); char cookie[20]; char* ss_label = NULL; - char object[SECURITY_SERVER_MAX_OBJ_NAME]; // drop root privileges ret = drop_root_privileges(); @@ -1189,10 +1161,6 @@ RUNNER_CHILD_TEST_NOSMACK(tc05_check_API_middleware_allow_nosmack) RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, "check_privilege failed. Result: " << ret); - ret = security_server_get_object_name(APP_GID, object, sizeof(object)); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_SUCCESS, - "get_object_name failed. Result: " << ret); - ret = security_server_get_gid("root"); RUNNER_ASSERT_MSG(ret > -1, "Failed to get \"root\" gid. Result: " << ret); diff --git a/tests/security-server-tests/security_server_tests_weird_arguments.cpp b/tests/security-server-tests/security_server_tests_weird_arguments.cpp index cc9ba25..0abd9fd 100644 --- a/tests/security-server-tests/security_server_tests_weird_arguments.cpp +++ b/tests/security-server-tests/security_server_tests_weird_arguments.cpp @@ -49,45 +49,6 @@ RUNNER_TEST(tc01_security_server_get_gid_weird_input_case) /* from security_server_tests_server.cpp */ -RUNNER_TEST(tc02_security_server_get_object_name_weird_input_case) -{ - int ret = 0; - gid_t gid = DB_ALARM_GID; - - /* null object case */ - char *object = NULL; - - ret = security_server_get_object_name(gid, object, sizeof(object)); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_INPUT_PARAM, "ret: " << ret); - - /* buffer to small case */ - char object1[5]; - - ret = security_server_get_object_name(gid, object1, sizeof(object1)); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_BUFFER_TOO_SMALL, "ret: " << ret); - - /* wrong gid case */ - gid = 9876; - char object2[SECURITY_SERVER_MAX_OBJ_NAME]; - - ret = security_server_get_object_name(gid, object2, sizeof(object2)); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_NO_SUCH_OBJECT, "ret: " << ret); - -/***************/ - - /* big gid case */ - gid = 70666; - - ret = security_server_get_object_name(gid, object2, sizeof(object2)); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_NO_SUCH_OBJECT, "ret: " << ret); - - /* invalid gid case */ - gid = -1; - - ret = security_server_get_object_name(gid, object2, sizeof(object2)); - RUNNER_ASSERT_MSG(ret == SECURITY_SERVER_API_ERROR_NO_SUCH_OBJECT, "ret: " << ret); -} - RUNNER_TEST(tc03_security_server_request_cookie_weird_input_case) { int ret = 0; -- 2.7.4