From 2de9f4d0b375e9537c76dc14e980fce98ce48aa6 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Tue, 10 Jul 2018 09:37:00 +0900 Subject: [PATCH] Exclude coverage for map-agent map-agent - Line Cov: 94.5%, Func Cov: 100%) Change-Id: I21cb93a8253f4a3f3ece73c833d99d151e357666 Signed-off-by: DoHyun Pyun --- map-agent/bluetooth_map_agent.c | 28 ++++++++++++++++++++++++++-- map-agent/bluetooth_map_email.c | 23 ++++++++++++++++++++++- map-agent/bluetooth_map_sms.c | 35 ++++++++++++++++++++++++++++++----- map-agent/map_bmessage.c | 3 ++- 4 files changed, 80 insertions(+), 9 deletions(-) diff --git a/map-agent/bluetooth_map_agent.c b/map-agent/bluetooth_map_agent.c index 3560a22..978a6e7 100644 --- a/map-agent/bluetooth_map_agent.c +++ b/map-agent/bluetooth_map_agent.c @@ -177,6 +177,7 @@ static GVariant *__bt_map_set_delete_status(char *handle, gboolean delete_status static void __bt_map_noti_registration(char *remote_addr, gboolean status); static void __bt_map_destroy_agent(void); +/* LCOV_EXCL_START */ /* Create GError from error code and error message */ static GError *__bt_map_error(int error_code, char *error_message) { @@ -390,13 +391,14 @@ static GDBusConnection *__bt_map_get_gdbus_connection(void) FN_END; return map_dbus_conn; } +/* LCOV_EXCL_STOP */ gboolean is_mns_connected(void) { if (!g_mns_proxy) return FALSE; else - return TRUE; + return TRUE; /* LCOV_EXCL_LINE */ } guint64 _bt_validate_uid(int uid, int msg_type) @@ -413,7 +415,7 @@ guint64 _bt_validate_uid(int uid, int msg_type) return info->map_id; } - list = g_slist_next(list); + list = g_slist_next(list); /* LCOV_EXCL_LINE */ } FN_END; @@ -448,6 +450,7 @@ guint64 _bt_add_id(int uid, int msg_type) return map_id; } +/* LCOV_EXCL_START */ static struct id_info *__bt_get_id(guint64 map_id) { FN_START; @@ -485,6 +488,7 @@ static struct id_info *__bt_get_uid(gchar *handle) FN_END; return handle_info; } +/* LCOV_EXCL_STOP */ int _bt_update_id(guint64 map_id, int new_uid, int msg_type) { @@ -493,6 +497,7 @@ int _bt_update_id(guint64 map_id, int new_uid, int msg_type) GSList *list = id_list; while (list) { + /* LCOV_EXCL_START */ info = list->data; if (info->map_id == map_id) { @@ -502,12 +507,14 @@ int _bt_update_id(guint64 map_id, int new_uid, int msg_type) } list = g_slist_next(list); + /* LCOV_EXCL_STOP */ } FN_END; return -1; } +/* LCOV_EXCL_START */ static void __bt_remove_list(GSList *id_list) { FN_START; @@ -518,6 +525,7 @@ static void __bt_remove_list(GSList *id_list) g_slist_free_full(id_list, g_free); FN_END; } +/* LCOV_EXCL_STOP */ gboolean _bt_verify_sender(message_info_t *msg_info, char *sender) { @@ -588,6 +596,7 @@ void _get_msg_timestamp(time_t *ltime, char *timestamp) FN_END; } +/* LCOV_EXCL_START */ time_t _get_time_t_from_timestamp(char *timestamp) { struct tm local_time; @@ -623,6 +632,7 @@ time_t _get_time_t_from_timestamp(char *timestamp) int_time = mktime(&local_time); return int_time; } +/* LCOV_EXCL_STOP */ gboolean _bt_verify_time(message_info_t *msg_info, map_msg_filter_t *filter) { @@ -660,6 +670,7 @@ gboolean _bt_verify_time(message_info_t *msg_info, map_msg_filter_t *filter) dest |= npi & 0x0F; \ } +/* LCOV_EXCL_START */ static int __bt_ascii_to_upper(int ch) { return (('a' <= (ch) && (ch) <= 'z') ? ((ch) - ('a'-'A')) : (ch)); @@ -882,6 +893,7 @@ static void __bt_get_sms_sca(TapiHandle *handle, int result, void *data, g_sca_info->DialNumLen = scaInfo->DialNumLen; FN_END; } +/* LCOV_EXCL_STOP */ void _bt_message_info_free(gpointer data) { @@ -903,6 +915,7 @@ void _bt_message_info_free(gpointer data) FN_END; } +/* LCOV_EXCL_START */ static gboolean __bluetooth_map_start_service() { FN_START; @@ -917,6 +930,7 @@ static gboolean __bluetooth_map_start_service() FN_END; return FALSE; } +/* LCOV_EXCL_STOP */ static gboolean __bt_validate_utf8(char **text) { @@ -924,8 +938,10 @@ static gboolean __bt_validate_utf8(char **text) if (g_utf8_validate(*text, -1, NULL)) return TRUE; + /* LCOV_EXCL_START */ FN_END; return FALSE; + /* LCOV_EXCL_STOP */ } gboolean _bt_validate_msg_data(message_info_t *msg_info) @@ -940,6 +956,7 @@ gboolean _bt_validate_msg_data(message_info_t *msg_info) if (msg_info->sender_name) return __bt_validate_utf8(&msg_info->sender_name); + /* LCOV_EXCL_START */ if (msg_info->sender_addressing) return __bt_validate_utf8(&msg_info->sender_addressing); @@ -954,8 +971,10 @@ gboolean _bt_validate_msg_data(message_info_t *msg_info) FN_END; return TRUE; + /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_START */ static void __bt_mns_client_connect(char *address) { FN_START; @@ -1060,6 +1079,7 @@ static void __bt_mns_client_disconnect() g_variant_unref(value); FN_END; } +/* LCOV_EXCL_STOP */ void _bt_mns_client_event_notify(gchar *event, guint64 handle, gchar *folder, gchar *old_folder, @@ -1076,6 +1096,7 @@ void _bt_mns_client_event_notify(gchar *event, guint64 handle, return; } + /* LCOV_EXCL_START */ connection = __bt_map_get_gdbus_connection(); if (connection == NULL) { DBG("Could not get GDBus Connection"); @@ -1111,8 +1132,10 @@ void _bt_mns_client_event_notify(gchar *event, guint64 handle, g_variant_unref(value); g_object_unref(mns_proxy); FN_END; + /* LCOV_EXCL_STOP */ } +/* LCOV_EXCL_START */ static gchar *__bt_get_map_folder(int folder) { switch (folder) { @@ -1594,3 +1617,4 @@ int main(void) FN_END; return EXIT_FAILURE; } +/* LCOV_EXCL_STOP */ diff --git a/map-agent/bluetooth_map_email.c b/map-agent/bluetooth_map_email.c index 745a93a..0d088d0 100644 --- a/map-agent/bluetooth_map_email.c +++ b/map-agent/bluetooth_map_email.c @@ -68,6 +68,7 @@ extern guint64 current_push_map_id; +/* LCOV_EXCL_START */ static void __bt_map_parse_moved_mails(char *inbuf, int *from_box_id, int *to_box_id, GList **mail_list) { @@ -287,6 +288,7 @@ static void __bt_email_subscription_callback(GDBusConnection *connection, email_free_mailbox(&mailbox_from, 1); } } +/* LCOV_EXCL_STOP */ gboolean _bt_map_start_email_service(void) { @@ -300,6 +302,7 @@ gboolean _bt_map_start_email_service(void) return FALSE; } + /* LCOV_EXCL_START */ dbus_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); if (error) { ERR("g_bus_get_sync() failed (%s)", error->message); @@ -320,6 +323,7 @@ gboolean _bt_map_start_email_service(void) return FALSE; } + /* LCOV_EXCL_STOP */ return TRUE; } @@ -329,8 +333,10 @@ gboolean _bt_map_stop_email_service(void) err = email_service_end(); if (err != EMAIL_ERROR_NONE) { + /* LCOV_EXCL_START */ ERR("email_service_end fail error = %d\n", err); return FALSE; + /* LCOV_EXCL_STOP */ } return TRUE; @@ -350,6 +356,7 @@ gboolean _bt_map_email_get_supported_folders(gboolean folders[FOLDER_COUNT][MSG_ if (err != EMAIL_ERROR_NONE) return FALSE; + /* LCOV_EXCL_START */ err = email_get_mailbox_list(account_id, EMAIL_MAILBOX_ALL, &mailbox_list, &mailbox_count); if (err != EMAIL_ERROR_NONE) @@ -392,9 +399,11 @@ gboolean _bt_map_email_get_supported_folders(gboolean folders[FOLDER_COUNT][MSG_ if (mailbox_list != NULL) email_free_mailbox(&mailbox_list, mailbox_count); + /* LCOV_EXCL_STOP */ return TRUE; } +/* LCOV_EXCL_START */ static message_info_t *__bt_email_info_get(email_mail_list_item_t *email_struct, guint8 subject_len) { @@ -622,6 +631,7 @@ gboolean _bt_map_get_email_list(char *folder, int max, DBG("EXIT"); return TRUE; } +/* LCOV_EXCL_STOP */ gboolean _bt_map_update_mailbox(char *folder) { @@ -646,10 +656,11 @@ gboolean _bt_map_set_email_read_status(int mail_id, int read_status) ret = email_get_mail_data(mail_id, &mail_data); if (ret != EMAIL_ERROR_NONE) { - ERR("email_get_mail_data failed\n"); + ERR("email_get_mail_data failed\n"); /* LCOV_EXCL_LINE */ return FALSE; } + /* LCOV_EXCL_START */ ret = email_set_flags_field(mail_data->account_id, &mail_id, 1, EMAIL_FLAGS_SEEN_FIELD, read_status, 0); if (ret != EMAIL_ERROR_NONE) { @@ -658,6 +669,7 @@ gboolean _bt_map_set_email_read_status(int mail_id, int read_status) } email_free_mail_data(&mail_data, 1); + /* LCOV_EXCL_STOP */ return TRUE; } @@ -670,6 +682,7 @@ gboolean _bt_map_set_email_delete_status(int mail_id, int read_status) if (ret != EMAIL_ERROR_NONE) return FALSE; + /* LCOV_EXCL_START */ ret = email_delete_mail(mail_data->mailbox_id, &mail_id, 1, 1); if (ret != EMAIL_ERROR_NONE) { email_free_mail_data(&mail_data, 1); @@ -677,9 +690,11 @@ gboolean _bt_map_set_email_delete_status(int mail_id, int read_status) } email_free_mail_data(&mail_data, 1); + /* LCOV_EXCL_STOP */ return TRUE; } +/* LCOV_EXCL_START */ static gchar *__bt_get_email_folder_name(int mailboxtype) { switch (mailboxtype) { @@ -782,6 +797,7 @@ static char *__bt_prepare_email_bmseg(email_mail_data_t *mail_data) FN_END; return g_string_free(msg, FALSE); } +/* LCOV_EXCL_STOP */ gboolean _bt_map_get_email_message(int mail_id, gboolean attach, gboolean transcode, gboolean first_request, gchar **bmseg) @@ -795,6 +811,7 @@ gboolean _bt_map_get_email_message(int mail_id, gboolean attach, if (ret != EMAIL_ERROR_NONE) return FALSE; + /* LCOV_EXCL_START */ ret = email_get_mail_data(mail_id, &mail_data); if (ret != EMAIL_ERROR_NONE) return FALSE; @@ -803,9 +820,11 @@ gboolean _bt_map_get_email_message(int mail_id, gboolean attach, email_free_mail_data(&mail_data, 1); DBG("EXIT==>"); + /* LCOV_EXCL_STOP */ return TRUE; } +/* LCOV_EXCL_START */ static int __bt_map_save_email_to_outbox(char *subject, char *body, char *recepients) { @@ -1102,3 +1121,5 @@ done: return TRUE; } +/* LCOV_EXCL_STOP */ + diff --git a/map-agent/bluetooth_map_sms.c b/map-agent/bluetooth_map_sms.c index 3e918e0..49993ee 100644 --- a/map-agent/bluetooth_map_sms.c +++ b/map-agent/bluetooth_map_sms.c @@ -130,30 +130,37 @@ static void __bt_add_deleted_folder(void) err = msg_set_int_value(folder_info, MSG_FOLDER_INFO_TYPE_INT, MSG_FOLDER_TYPE_USER_DEF); if (err != MSG_SUCCESS) { + /* LCOV_EXCL_START */ ERR("Failed adding type %d", err); msg_release_struct(&folder_info); return; + /* LCOV_EXCL_STOP */ } err = msg_set_str_value(folder_info, MSG_FOLDER_INFO_NAME_STR, "DELETED", MAX_FOLDER_NAME_SIZE); if (err != MSG_SUCCESS) { + /* LCOV_EXCL_START */ ERR("Failed adding str %d", err); msg_release_struct(&folder_info); return; + /* LCOV_EXCL_STOP */ } err = msg_add_folder(g_msg_handle, folder_info); if (err != MSG_SUCCESS) { + /* LCOV_EXCL_START */ ERR("Failed adding folder %d", err); msg_release_struct(&folder_info); return; + /* LCOV_EXCL_STOP */ } msg_release_struct(&folder_info); FN_END; } +/* LCOV_EXCL_START */ static void __bluetooth_map_msg_incoming_status_cb(msg_handle_t handle, msg_struct_t msg, void *user_param) @@ -232,6 +239,7 @@ static void __bluetooth_map_msg_sent_status_cb(msg_handle_t handle, FN_END; } +/* LCOV_EXCL_STOP */ gboolean _bt_map_sms_get_supported_folders(gboolean folders[FOLDER_COUNT][MSG_TYPES]) { @@ -249,6 +257,7 @@ gboolean _bt_map_sms_get_supported_folders(gboolean folders[FOLDER_COUNT][MSG_TY goto done; } + /* LCOV_EXCL_START */ if (msg_get_folder_list(g_msg_handle, &folder_list) != MSG_SUCCESS) { msg_ret = FALSE; goto done; @@ -290,11 +299,12 @@ gboolean _bt_map_sms_get_supported_folders(gboolean folders[FOLDER_COUNT][MSG_TY DBG("DELETED"); } } + /* LCOV_EXCL_STOP */ done: if (folder_list.msg_struct_info) - msg_release_list_struct(&folder_list); + msg_release_list_struct(&folder_list); /* LCOV_EXCL_LINE */ FN_END; return msg_ret; @@ -316,7 +326,7 @@ gboolean _bt_map_sms_set_read_status(int msg_id, gboolean read_status) return TRUE; } - +/* LCOV_EXCL_START */ static gchar *__bt_get_sms_folder_name(int id) { FN_START; @@ -369,6 +379,7 @@ static gchar *__bt_get_sms_folder_name(int id) else return g_strdup_printf("TELECOM/MSG/%s", folder_name); } +/* LCOV_EXCL_STOP */ gboolean _bt_map_set_sms_delete_status(int msg_id, gboolean delete_status) { @@ -385,6 +396,7 @@ gboolean _bt_map_set_sms_delete_status(int msg_id, gboolean delete_status) if (msg_id == -1) goto fail; + /* LCOV_EXCL_START */ if (g_msg_handle == NULL) goto fail; @@ -453,6 +465,7 @@ gboolean _bt_map_set_sms_delete_status(int msg_id, gboolean delete_status) FN_END; return TRUE; + /* LCOV_EXCL_STOP */ fail: g_free(folder_name); @@ -464,6 +477,7 @@ fail: return FALSE; } +/* LCOV_EXCL_START */ static msg_error_t __bt_send_sms(int msg_id, msg_struct_t p_msg, msg_struct_t p_send_opt) { FN_START; @@ -754,6 +768,7 @@ static char *__bt_prepare_msg_bmseg(msg_struct_t msg_info, gboolean attach, FN_END; return g_string_free(msg, FALSE); } +/* LCOV_EXCL_STOP */ gboolean _bt_map_get_sms_message(int message_id, gboolean attach, gboolean transcode, gboolean first_request, gchar **bmseg) @@ -775,6 +790,7 @@ gboolean _bt_map_get_sms_message(int message_id, gboolean attach, if (!msg) goto fail; + /* LCOV_EXCL_START */ send_opt = msg_create_struct(MSG_STRUCT_SENDOPT); if (!send_opt) goto fail; @@ -791,19 +807,21 @@ gboolean _bt_map_get_sms_message(int message_id, gboolean attach, FN_END; return TRUE; + /* LCOV_EXCL_STOP */ fail: if (msg) - msg_release_struct(&msg); + msg_release_struct(&msg); /* LCOV_EXCL_LINE */ if (send_opt) - msg_release_struct(&send_opt); + msg_release_struct(&send_opt); /* LCOV_EXCL_LINE */ ERR("Unable to Get SMS Message"); return FALSE; } +/* LCOV_EXCL_START */ static char *__bt_get_truncated_utf8_string(char *src) { FN_START; @@ -1137,6 +1155,7 @@ fail: ERR("Getting SMS List Failed"); return FALSE; } +/* LCOV_EXCL_STOP */ void _bt_map_stop_sms_service(void) { @@ -1148,7 +1167,7 @@ void _bt_map_stop_sms_service(void) if (folder_id != -1) { err = msg_delete_folder(g_msg_handle, folder_id); if (err != MSG_SUCCESS) - ERR("Delete folder failed"); + ERR("Delete folder failed"); /* LCOV_EXCL_LINE */ } if (g_msg_handle) { @@ -1166,8 +1185,10 @@ gboolean _bt_map_start_sms_service(void) err = msg_open_msg_handle(&g_msg_handle); if (err != MSG_SUCCESS) { + /* LCOV_EXCL_START */ ERR("msg_open_msg_handle error = %d\n", err); return FALSE; + /* LCOV_EXCL_STOP */ } if (__bt_get_sms_folder_id(BT_MAP_DELETED_FOLDER_NAME) == -1) @@ -1177,16 +1198,20 @@ gboolean _bt_map_start_sms_service(void) __bluetooth_map_msg_incoming_status_cb, 0, (void *)BT_MAP_MSG_CB); if (err != MSG_SUCCESS) { + /* LCOV_EXCL_START */ ERR("msg_reg_sms_message_callback error = %d\n", err); return FALSE; + /* LCOV_EXCL_STOP */ } err = msg_reg_sent_status_callback(g_msg_handle, __bluetooth_map_msg_sent_status_cb, NULL); if (err != MSG_SUCCESS) { + /* LCOV_EXCL_START */ ERR("msg_reg_sent_status_callback error = %d\n", err); return FALSE; + /* LCOV_EXCL_STOP */ } FN_END; diff --git a/map-agent/map_bmessage.c b/map-agent/map_bmessage.c index 7b38fdb..b7b30ad 100644 --- a/map-agent/map_bmessage.c +++ b/map-agent/map_bmessage.c @@ -55,6 +55,7 @@ static guint8 g_enc_lvl = 1; +/* LCOV_EXCL_START */ void print_bmsg(struct bmsg_data *bmsg) { FN_START; @@ -749,4 +750,4 @@ parse_fail: FN_END; return NULL; } - +/* LCOV_EXCL_STOP */ -- 2.7.4