From: chanywa Date: Fri, 30 Jun 2017 07:12:33 +0000 (+0900) Subject: Add LCOV remarkers to increase line coverage rate X-Git-Tag: accepted/tizen/unified/20170703.064248^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93a2ac9e2a214cea2ca56d4498c933652b989b5f;p=platform%2Fcore%2Fapi%2Fmaps-service.git Add LCOV remarkers to increase line coverage rate Change-Id: I9b79502518577f02a72d1fd47980d4d0487ca186 --- diff --git a/src/api/maps_address.cpp b/src/api/maps_address.cpp index d68854a..af59431 100644 --- a/src/api/maps_address.cpp +++ b/src/api/maps_address.cpp @@ -62,8 +62,10 @@ EXPORT_API int maps_address_create(maps_address_h *address) maps_address_s *a = g_new0(maps_address_s, 1); if (!a) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } *address = (maps_address_h) a; @@ -188,9 +190,11 @@ EXPORT_API int maps_address_clone(const maps_address_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_address_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_area.cpp b/src/api/maps_area.cpp index 382691a..01967d0 100644 --- a/src/api/maps_area.cpp +++ b/src/api/maps_area.cpp @@ -39,8 +39,10 @@ EXPORT_API int maps_area_create_rectangle(const maps_coordinates_h top_left, maps_area_s *bound = g_new0(maps_area_s, 1); if (bound == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } bound->type = MAPS_AREA_RECTANGLE; @@ -68,8 +70,10 @@ EXPORT_API int maps_area_create_circle(const maps_coordinates_h center, maps_area_s *bound = g_new0(maps_area_s, 1); if (bound == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } bound->type = MAPS_AREA_CIRCLE; diff --git a/src/api/maps_condition.cpp b/src/api/maps_condition.cpp index b3a7253..a33b83f 100644 --- a/src/api/maps_condition.cpp +++ b/src/api/maps_condition.cpp @@ -131,10 +131,7 @@ bool maps_condition_check_view_service_supported(maps_view_h view, maps_service_ if (!view) return false; maps_service_h maps = _maps_view_get_maps_service_ptr(view); - bool supported = false; - if (maps_service_provider_is_service_supported(maps, service, &supported) != MAPS_ERROR_NONE) - return false; - return supported; + return maps_condition_check_service_supported(maps, service); } bool maps_condition_check_view_data_supported(maps_view_h view, maps_service_data_e data) @@ -142,8 +139,5 @@ bool maps_condition_check_view_data_supported(maps_view_h view, maps_service_dat if (!view) return false; maps_service_h maps = _maps_view_get_maps_service_ptr(view); - bool supported = false; - if (maps_service_provider_is_data_supported(maps, data, &supported) != MAPS_ERROR_NONE) - return false; - return supported; + return maps_condition_check_data_supported(maps, data); } diff --git a/src/api/maps_coordinates.cpp b/src/api/maps_coordinates.cpp index fbb47f9..c8d1eed 100644 --- a/src/api/maps_coordinates.cpp +++ b/src/api/maps_coordinates.cpp @@ -39,8 +39,10 @@ EXPORT_API int maps_coordinates_create(const double latitude, maps_coordinates_s *coord = g_new0(maps_coordinates_s, 1); if (coord == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } coord->latitude = latitude; coord->longitude = longitude; @@ -78,9 +80,11 @@ EXPORT_API int maps_coordinates_clone(const maps_coordinates_h origin, break; return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_coordinates_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ @@ -201,7 +205,7 @@ static void _free_coordinates(gpointer data) maps_coordinates_s *coordinates = (maps_coordinates_s *) data; ret = maps_coordinates_destroy(coordinates); if (ret) { - MAPS_LOGI("Failed to maps_coordinates_destroy!!!"); + MAPS_LOGI("Failed to maps_coordinates_destroy!!!"); //LCOV_EXCL_LINE } } diff --git a/src/api/maps_extra_types.cpp b/src/api/maps_extra_types.cpp index 2d51933..27d3e19 100644 --- a/src/api/maps_extra_types.cpp +++ b/src/api/maps_extra_types.cpp @@ -34,8 +34,10 @@ EXPORT_API int maps_item_list_create(maps_item_list_h *list) maps_item_list_s *l = g_slice_new0(maps_item_list_s); if (!l) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } l->l = NULL; @@ -99,7 +101,7 @@ EXPORT_API int maps_item_list_foreach(maps_item_list_h list, void *clone = NULL; if (clone_func) { if (clone_func(data, &clone) != MAPS_ERROR_NONE) - continue; + continue; //LCOV_EXCL_LINE } else { clone = data; } @@ -209,9 +211,11 @@ EXPORT_API int maps_item_list_clone(const maps_item_list_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_item_list_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } EXPORT_API int maps_item_list_get_length(maps_item_list_h list, int *length) @@ -244,8 +248,10 @@ EXPORT_API int maps_string_hashtable_create(maps_string_hashtable_h *table) maps_string_hashtable_s *t = g_slice_new0(maps_string_hashtable_s); if (!t) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } t->t = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); @@ -332,11 +338,11 @@ EXPORT_API int maps_string_hashtable_foreach(maps_string_hashtable_h table, char *key_clone = NULL; if (maps_item_hashtable_clone_string(key, (void **) &key_clone) != MAPS_ERROR_NONE) - continue; + continue; //LCOV_EXCL_LINE char *value_clone = NULL; if (maps_item_hashtable_clone_string(value, (void **) &value_clone) != MAPS_ERROR_NONE) - continue; + continue; //LCOV_EXCL_LINE if (!callback(index++, total, key_clone, value_clone, user_data)) @@ -372,16 +378,20 @@ EXPORT_API int maps_string_hashtable_clone(const maps_string_hashtable_h origin, g_hash_table_iter_init(&iter, t->t); while (g_hash_table_iter_next(&iter, &key, &value)) { g_hash_table_insert(t_cloned->t, + //LCOV_EXCL_START (gpointer) g_strdup((const gchar *) key), (gpointer) g_strdup((const gchar *) value)); + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_string_hashtable_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } EXPORT_API int maps_string_hashtable_contains(maps_string_hashtable_h table, @@ -412,8 +422,10 @@ EXPORT_API int maps_int_hashtable_create(maps_int_hashtable_h *table) maps_int_hashtable_s *t = g_slice_new0(maps_int_hashtable_s); if (!t) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } t->t = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); @@ -463,7 +475,7 @@ EXPORT_API int maps_int_hashtable_get(maps_int_hashtable_h table, return MAPS_ERROR_INVALID_PARAMETER; maps_int_hashtable_s *t = (maps_int_hashtable_s *) table; if (!t->t) - return MAPS_ERROR_NOT_FOUND; + return MAPS_ERROR_NOT_FOUND; //LCOV_EXCL_LINE const int *table_value = (const int *) g_hash_table_lookup(t->t, &key); if (!table_value) return MAPS_ERROR_NONE; @@ -495,7 +507,7 @@ EXPORT_API int maps_int_hashtable_foreach(maps_int_hashtable_h table, maps_int_hashtable_s *t = (maps_int_hashtable_s *) table; if (!t->t) - return MAPS_ERROR_NOT_FOUND; + return MAPS_ERROR_NOT_FOUND; //LCOV_EXCL_LINE GHashTableIter iter; gpointer key, value; @@ -552,9 +564,11 @@ EXPORT_API int maps_int_hashtable_clone(const maps_int_hashtable_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_int_hashtable_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } EXPORT_API int maps_int_hashtable_contains(maps_int_hashtable_h table, @@ -584,7 +598,7 @@ void _maps_hashtable_item_create(maps_hashtable_item_s **item) *item = g_slice_new0(maps_hashtable_item_s); if (*item == NULL) - MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); + MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); //LCOV_EXCL_LINE } void _maps_hashtable_item_destroy(gpointer data) @@ -615,8 +629,10 @@ EXPORT_API int maps_item_hashtable_create(maps_item_hashtable_h *table) maps_item_hashtable_s *t = g_slice_new0(maps_item_hashtable_s); if (!t) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } t->t = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, @@ -665,8 +681,10 @@ EXPORT_API int maps_item_hashtable_clone_int(void *origin, void **cloned) int *n_cloned = g_new0(int, 1); if (n_cloned == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } int *n_origin = (int *) origin; @@ -692,8 +710,10 @@ EXPORT_API int maps_item_hashtable_clone_float(void *origin, void **cloned) double *n_cloned = g_new0(double, 1); if (n_cloned == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } double *n_origin = (double *) origin; @@ -758,8 +778,10 @@ EXPORT_API int maps_item_hashtable_set(maps_item_hashtable_h table, const int error = clone_func((void *) value, &item->value); if (error != MAPS_ERROR_NONE) { + //LCOV_EXCL_START _maps_hashtable_item_destroy(item); return error; + //LCOV_EXCL_STOP } item->clone_func = clone_func; item->free_func = free_func; @@ -862,7 +884,7 @@ EXPORT_API int maps_item_hashtable_foreach(maps_item_hashtable_h table, while (g_hash_table_iter_next(&iter, &key, &value)) { maps_hashtable_item_s *item = (maps_hashtable_item_s *) value; if (!item || !item->clone_func) - continue; + continue; //LCOV_EXCL_LINE char *key_clone = NULL; if (maps_item_hashtable_clone_string(key, @@ -916,9 +938,11 @@ EXPORT_API int maps_item_hashtable_clone(const maps_item_hashtable_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_item_hashtable_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } EXPORT_API int maps_item_hashtable_contains(maps_item_hashtable_h table, diff --git a/src/api/maps_place.cpp b/src/api/maps_place.cpp index 63c47e1..dc569c0 100644 --- a/src/api/maps_place.cpp +++ b/src/api/maps_place.cpp @@ -103,8 +103,10 @@ EXPORT_API int maps_place_create(maps_place_h *place) *place = (maps_place_h) g_slice_new0(maps_place_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -304,9 +306,11 @@ EXPORT_API int maps_place_clone(const maps_place_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_attribute.cpp b/src/api/maps_place_attribute.cpp index dadeb45..d128464 100644 --- a/src/api/maps_place_attribute.cpp +++ b/src/api/maps_place_attribute.cpp @@ -41,8 +41,10 @@ EXPORT_API int maps_place_attribute_create(maps_place_attribute_h *place) *place = (maps_place_attribute_h) g_slice_new0(maps_place_attribute_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -106,9 +108,11 @@ EXPORT_API int maps_place_attribute_clone(const maps_place_attribute_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_attribute_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_category.cpp b/src/api/maps_place_category.cpp index 6871729..7e079db 100644 --- a/src/api/maps_place_category.cpp +++ b/src/api/maps_place_category.cpp @@ -42,8 +42,10 @@ EXPORT_API int maps_place_category_create(maps_place_category_h *place) *place = g_slice_new0(maps_place_category_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -108,9 +110,11 @@ EXPORT_API int maps_place_category_clone(const maps_place_category_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_category_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_contact.cpp b/src/api/maps_place_contact.cpp index 3f52e74..e57629a 100644 --- a/src/api/maps_place_contact.cpp +++ b/src/api/maps_place_contact.cpp @@ -41,8 +41,10 @@ EXPORT_API int maps_place_contact_create(maps_place_contact_h *place) *place = (maps_place_contact_h) g_slice_new0(maps_place_contact_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -105,9 +107,11 @@ EXPORT_API int maps_place_contact_clone(const maps_place_contact_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_contact_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_editorial.cpp b/src/api/maps_place_editorial.cpp index 6c98fda..69260d0 100644 --- a/src/api/maps_place_editorial.cpp +++ b/src/api/maps_place_editorial.cpp @@ -41,8 +41,10 @@ EXPORT_API int maps_place_editorial_create(maps_place_editorial_h *place) *place = (maps_place_editorial_h) g_slice_new0(maps_place_editorial_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -108,9 +110,11 @@ EXPORT_API int maps_place_editorial_clone(const maps_place_editorial_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_editorial_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_filter.cpp b/src/api/maps_place_filter.cpp index 36b89f0..6d80a8c 100644 --- a/src/api/maps_place_filter.cpp +++ b/src/api/maps_place_filter.cpp @@ -37,8 +37,10 @@ EXPORT_API int maps_place_filter_create(maps_place_filter_h *filter) *filter = (maps_place_filter_h) g_slice_new0(maps_place_filter_s); if (*filter == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } maps_place_filter_s *f = (maps_place_filter_s *) (*filter); @@ -93,9 +95,11 @@ EXPORT_API int maps_place_filter_clone(const maps_place_filter_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_filter_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_image.cpp b/src/api/maps_place_image.cpp index 5639c5e..81d67cd 100644 --- a/src/api/maps_place_image.cpp +++ b/src/api/maps_place_image.cpp @@ -45,8 +45,10 @@ EXPORT_API int maps_place_image_create(maps_place_image_h *place) *place = (maps_place_image_h) g_slice_new0(maps_place_image_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -126,9 +128,11 @@ EXPORT_API int maps_place_image_clone(const maps_place_image_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_image_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_link_object.cpp b/src/api/maps_place_link_object.cpp index 8105ad1..67127ac 100644 --- a/src/api/maps_place_link_object.cpp +++ b/src/api/maps_place_link_object.cpp @@ -44,8 +44,10 @@ EXPORT_API int maps_place_link_object_create(maps_place_link_object_h *place) g_slice_new0(maps_place_link_object_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -117,9 +119,11 @@ EXPORT_API int maps_place_link_object_clone(const maps_place_link_object_h origi return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_link_object_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_media.cpp b/src/api/maps_place_media.cpp index 4fba079..dcc3f7e 100644 --- a/src/api/maps_place_media.cpp +++ b/src/api/maps_place_media.cpp @@ -40,8 +40,10 @@ EXPORT_API int maps_place_media_create(maps_place_media_h *place) *place = (maps_place_media_h) g_slice_new0(maps_place_media_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -104,9 +106,11 @@ EXPORT_API int maps_place_media_clone(const maps_place_media_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_media_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_rating.cpp b/src/api/maps_place_rating.cpp index 301b1fa..0312e70 100644 --- a/src/api/maps_place_rating.cpp +++ b/src/api/maps_place_rating.cpp @@ -36,8 +36,10 @@ EXPORT_API int maps_place_rating_create(maps_place_rating_h *place) *place = (maps_place_rating_h) g_slice_new0(maps_place_rating_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -80,9 +82,11 @@ EXPORT_API int maps_place_rating_clone(const maps_place_rating_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_rating_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_review.cpp b/src/api/maps_place_review.cpp index 5da284c..743f41b 100644 --- a/src/api/maps_place_review.cpp +++ b/src/api/maps_place_review.cpp @@ -48,8 +48,10 @@ EXPORT_API int maps_place_review_create(maps_place_review_h *place) *place = (maps_place_review_h) g_slice_new0(maps_place_review_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -136,9 +138,11 @@ EXPORT_API int maps_place_review_clone(const maps_place_review_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_review_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_place_url.cpp b/src/api/maps_place_url.cpp index 7479847..6bc1e55 100644 --- a/src/api/maps_place_url.cpp +++ b/src/api/maps_place_url.cpp @@ -39,8 +39,10 @@ EXPORT_API int maps_place_url_create(maps_place_url_h *place) *place = (maps_place_url_h) g_slice_new0(maps_place_url_s); if (*place == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -96,9 +98,11 @@ EXPORT_API int maps_place_url_clone(const maps_place_url_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_place_url_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_plugin_info.cpp b/src/api/maps_plugin_info.cpp index ec690fc..378cd6d 100644 --- a/src/api/maps_plugin_info.cpp +++ b/src/api/maps_plugin_info.cpp @@ -37,8 +37,10 @@ EXPORT_API int maps_plugin_info_create(maps_plugin_info_h *info) *info = g_slice_new0(maps_plugin_info_s); if (*info == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -87,9 +89,11 @@ EXPORT_API int maps_plugin_info_clone(const maps_plugin_info_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_plugin_info_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_preference.cpp b/src/api/maps_preference.cpp index 9af4639..0895913 100644 --- a/src/api/maps_preference.cpp +++ b/src/api/maps_preference.cpp @@ -122,8 +122,10 @@ EXPORT_API int maps_preference_create(maps_preference_h *preference) return MAPS_ERROR_NONE; } while (0); + //LCOV_EXCL_START maps_item_hashtable_destroy(preference); return error; + //LCOV_EXCL_STOP } EXPORT_API int maps_preference_destroy(maps_preference_h preference) diff --git a/src/api/maps_route.cpp b/src/api/maps_route.cpp index fedeba3..8b781e5 100644 --- a/src/api/maps_route.cpp +++ b/src/api/maps_route.cpp @@ -78,8 +78,10 @@ EXPORT_API int maps_route_create(maps_route_h *route) *route = (maps_route_h) g_slice_new0(maps_route_s); if (*route == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -206,9 +208,11 @@ EXPORT_API int maps_route_clone(const maps_route_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_route_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_route_maneuver.cpp b/src/api/maps_route_maneuver.cpp index 1852e3e..7811427 100644 --- a/src/api/maps_route_maneuver.cpp +++ b/src/api/maps_route_maneuver.cpp @@ -48,8 +48,10 @@ EXPORT_API int maps_route_maneuver_create(maps_route_maneuver_h *maneuver) *maneuver = (maps_route_maneuver_h) g_slice_new0(maps_route_maneuver_s); if (*maneuver == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -138,9 +140,11 @@ EXPORT_API int maps_route_maneuver_clone(const maps_route_maneuver_h origin, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_route_maneuver_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_route_segment.cpp b/src/api/maps_route_segment.cpp index 0e1e5f0..7d1c885 100644 --- a/src/api/maps_route_segment.cpp +++ b/src/api/maps_route_segment.cpp @@ -59,8 +59,10 @@ EXPORT_API int maps_route_segment_create(maps_route_segment_h *segment) *segment = (maps_route_segment_h) g_slice_new0(maps_route_segment_s); if (*segment == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } return MAPS_ERROR_NONE; @@ -160,9 +162,11 @@ EXPORT_API int maps_route_segment_clone(const maps_route_segment_h segment, return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_route_segment_destroy(*cloned); *cloned = NULL; return error; + //LCOV_EXCL_STOP } /*----------------------------------------------------------------------------*/ diff --git a/src/api/maps_service.cpp b/src/api/maps_service.cpp index cb79665..ea97930 100644 --- a/src/api/maps_service.cpp +++ b/src/api/maps_service.cpp @@ -45,18 +45,6 @@ plugin::plugin_s *__extract_plugin(maps_service_h maps) return (plugin::plugin_s *) maps_service->plugin; } -static bool __maps_provider_supported(maps_service_h maps, maps_service_e service) -{ - if (!maps) - return false; - bool supported = false; - if (maps_service_provider_is_service_supported(maps, service, &supported) - != MAPS_ERROR_NONE) - return false; - return supported; -} - - /*----------------------------------------------------------------------------*/ /* */ /* Maps Service & Preference */ @@ -110,8 +98,10 @@ EXPORT_API int maps_service_create(const char *maps_provider, maps_service_h *ma if (!maps || !maps_provider) return MAPS_ERROR_INVALID_PARAMETER; if (!maps_condition_check_privilege()) { + //LCOV_EXCL_START MAPS_LOGD("ERROR: privilege is not included"); return MAPS_ERROR_PERMISSION_DENIED; + //LCOV_EXCL_STOP } int error = MAPS_ERROR_NOT_SUPPORTED; @@ -133,18 +123,22 @@ EXPORT_API int maps_service_create(const char *maps_provider, maps_service_h *ma maps_service_s *maps_service = g_slice_new0(maps_service_s); if (maps_service == NULL) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); error = MAPS_ERROR_OUT_OF_MEMORY; break; + //LCOV_EXCL_STOP } /* 3. Initialize the requested plugin */ int init_error = MAPS_ERROR_NONE; /* Storage for init error code */ maps_plugin_h plugin_h = plugin::binary_extractor().init(info, module, &init_error); if (!plugin_h) { + //LCOV_EXCL_START error = init_error; MAPS_LOGE("ERROR! Plugin init failed"); break; + //LCOV_EXCL_STOP } maps_service->plugin = plugin_h; @@ -295,7 +289,7 @@ EXPORT_API int maps_service_geocode(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, MAPS_SERVICE_GEOCODE)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_GEOCODE)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -330,8 +324,7 @@ EXPORT_API int maps_service_geocode_inside_area(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, - MAPS_SERVICE_GEOCODE_INSIDE_AREA)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_GEOCODE_INSIDE_AREA)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -365,8 +358,7 @@ EXPORT_API int maps_service_geocode_by_structured_address(const maps_service_h m return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, - MAPS_SERVICE_GEOCODE_BY_STRUCTURED_ADDRESS)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_GEOCODE_BY_STRUCTURED_ADDRESS)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -401,7 +393,7 @@ EXPORT_API int maps_service_reverse_geocode(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, MAPS_SERVICE_REVERSE_GEOCODE)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_REVERSE_GEOCODE)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -445,7 +437,7 @@ EXPORT_API int maps_service_search_place(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_PLACE)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_SEARCH_PLACE)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -481,8 +473,7 @@ EXPORT_API int maps_service_search_place_by_area(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, - MAPS_SERVICE_SEARCH_PLACE_BY_AREA)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_SEARCH_PLACE_BY_AREA)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -519,8 +510,7 @@ EXPORT_API int maps_service_search_place_by_address(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, - MAPS_SERVICE_SEARCH_PLACE_BY_ADDRESS)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_SEARCH_PLACE_BY_ADDRESS)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -553,7 +543,7 @@ EXPORT_API int maps_service_search_place_list(const maps_service_h maps, if (!maps) return MAPS_ERROR_INVALID_PARAMETER; - if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_PLACE_LIST)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_SEARCH_PLACE_LIST)) return MAPS_ERROR_NOT_SUPPORTED; if (!boundary || !filter || !callback || !request_id) @@ -581,7 +571,7 @@ EXPORT_API int maps_service_get_place_details(const maps_service_h maps, if (!maps) return MAPS_ERROR_INVALID_PARAMETER; - if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_GET_PLACE_DETAILS)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_SEARCH_GET_PLACE_DETAILS)) return MAPS_ERROR_NOT_SUPPORTED; if (!url || !callback || !request_id) @@ -618,7 +608,7 @@ EXPORT_API int maps_service_search_route(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, MAPS_SERVICE_SEARCH_ROUTE)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_SEARCH_ROUTE)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -654,7 +644,7 @@ EXPORT_API int maps_service_search_route_waypoints(const maps_service_h maps, return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_SEARCH_ROUTE_WAYPOINTS)) return MAPS_ERROR_NOT_SUPPORTED; @@ -688,7 +678,7 @@ EXPORT_API int maps_service_cancel_request(const maps_service_h maps, int reques return MAPS_ERROR_INVALID_PARAMETER; /* Check if this API feature available */ - if (!__maps_provider_supported(maps, MAPS_SERVICE_CANCEL_REQUEST)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_CANCEL_REQUEST)) return MAPS_ERROR_NOT_SUPPORTED; /* Check if parameters are valid */ @@ -720,7 +710,7 @@ EXPORT_API int maps_service_multi_reverse_geocode(const maps_service_h maps, if (!maps) return MAPS_ERROR_INVALID_PARAMETER; - if (!__maps_provider_supported(maps, MAPS_SERVICE_MULTI_REVERSE_GEOCODE)) + if (!maps_condition_check_service_supported(maps, MAPS_SERVICE_MULTI_REVERSE_GEOCODE)) return MAPS_ERROR_NOT_SUPPORTED; if (!coordinates_list || !callback || !request_id) diff --git a/src/api/maps_view.cpp b/src/api/maps_view.cpp index 246ac3d..992b860 100644 --- a/src/api/maps_view.cpp +++ b/src/api/maps_view.cpp @@ -172,6 +172,7 @@ static void __maps_view_on_event_empty_cb(maps_view_event_type_e type, /* empty */ } +//LCOV_EXCL_START session::command_queue *__maps_view_select_q() { /* @@ -236,6 +237,7 @@ int _maps_view_on_overlay_update_all(maps_view_h view) return MAPS_ERROR_NOT_FOUND; return maps_item_list_foreach(v->view_objects, NULL, _maps_view_object_overlay_cb, v->clipper); } +//LCOV_EXCL_STOP int _maps_view_on_object_operation(maps_view_h view, maps_view_object_h object, maps_view_object_operation_e operation) { @@ -254,6 +256,7 @@ int _maps_view_on_object_operation(maps_view_h view, maps_view_object_h object, } } +//LCOV_EXCL_START static void __on_canvas_tap(void *data, Evas *e, Evas_Object *obj, void *event_info) { MAPS_LOGI("__on_canvas_tap"); @@ -343,6 +346,7 @@ static void __on_canvas_multi_line(void *data, Evas *e, Evas_Object *obj, void * /* Detect & Process the gesture */ v->finger_stream->multi_move((Evas_Event_Multi_Move *)event_info); } +//LCOV_EXCL_STOP static int __maps_plugin_render_map(const maps_view_h view, const maps_coordinates_h coordinates, const double zoom_factor, const double rotation_angle) @@ -354,6 +358,7 @@ static int __maps_plugin_render_map(const maps_view_h view, coordinates, zoom_factor, rotation_angle); } +//LCOV_EXCL_START void _maps_view_set_idle_listener(const maps_view_h view, void (*callback)(void *user_data), void *user_data) { @@ -419,6 +424,7 @@ static Eina_Bool __maps_view_animator_cb(void *data) { return ECORE_CALLBACK_RENEW; } +//LCOV_EXCL_STOP void __maps_view_ready(const maps_view_h view) { @@ -440,6 +446,7 @@ void __maps_view_ready(const maps_view_h view) /* ----------------------CREATE AND DESTROY-----------------------------------*/ +//LCOV_EXCL_START static void __maps_view_parent_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) { maps_view_s *v = (maps_view_s*)data; @@ -477,6 +484,7 @@ static void __maps_view_panel_resize_cb(void *data, Evas *e, Evas_Object *obj, v _maps_view_get_plugin_center(v, &v->center); maps_view_set_screen_location(v, x, y, w, h); } +//LCOV_EXCL_STOP static void __maps_view_create_panel(maps_view_h view, Evas_Object *obj) { @@ -530,8 +538,10 @@ EXPORT_API int maps_view_create(maps_service_h maps, Evas_Object *obj, maps_view maps_view_s *v = g_slice_new0(maps_view_s); if (!v) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } /* Initialize the list with visual objects */ @@ -573,8 +583,10 @@ EXPORT_API int maps_view_create(maps_service_h maps, Evas_Object *obj, maps_view /* Gesture Processing */ v->finger_stream = new view::finger_event_stream(v); if (!v->finger_stream) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } evas_object_event_callback_add(v->panel, EVAS_CALLBACK_MOUSE_DOWN, __on_canvas_tap, v); evas_object_event_callback_add(v->panel, EVAS_CALLBACK_MOUSE_UP, __on_canvas_up, v); @@ -727,7 +739,7 @@ EXPORT_API int maps_view_destroy(maps_view_h view) return MAPS_ERROR_NONE; } - +//LCOV_EXCL_START int _maps_view_set_center_directly(const maps_view_h view, const maps_coordinates_h coordinates) { @@ -751,6 +763,7 @@ int _maps_view_get_plugin_center(const maps_view_h view, return __get_plugin_interface(view)->maps_plugin_get_center(view, center); } +//LCOV_EXCL_STOP /*----------------------MAP ZOOM, ROTATE, SET CENTER--------------------------*/ @@ -819,6 +832,7 @@ EXPORT_API int maps_view_set_center(maps_view_h view, maps_coordinates_h coordin return __maps_view_set_center(view, coordinates, FALSE); } +//LCOV_EXCL_START int _maps_view_move_center(maps_view_h view, const int delta_x, const int delta_y) { if (!view) @@ -841,6 +855,7 @@ int _maps_view_move_center(maps_view_h view, const int delta_x, const int delta_ return error; } +//LCOV_EXCL_STOP EXPORT_API int maps_view_set_scalebar_enabled(const maps_view_h view, bool enable) { @@ -896,7 +911,7 @@ EXPORT_API int maps_view_set_zoom_level(maps_view_h view, int level) /* Add inertia to the zoom process */ if (v->inertial_camera) - v->inertial_camera->set_zoom_target(double(new_level)); + v->inertial_camera->set_zoom_target(double(new_level)); //LCOV_EXCL_LINE v->zoom_level = new_level; v->zoom_factor = double(new_level); /* Update the integer zoom level too */ @@ -1024,7 +1039,7 @@ int _maps_view_set_zoom_rotate(maps_view_h view, if (rotation_changed) { /* Add inertia to the rotation process */ if (v->inertial_camera) - v->inertial_camera->set_rotation_target(angle); + v->inertial_camera->set_rotation_target(angle); //LCOV_EXCL_LINE /* Update Map View rotation angle */ v->rotation_angle = angle; @@ -1039,10 +1054,12 @@ int _maps_view_set_zoom_rotate(maps_view_h view, maps_view_event_data_h ed = _maps_view_create_event_data(MAPS_VIEW_EVENT_ACTION); if (ed) { + //LCOV_EXCL_START _maps_view_event_data_set_action_type(ed, MAPS_VIEW_ACTION_ZOOM); _maps_view_event_data_set_zoom_factor(ed, v->zoom_factor); _maps_view_invoke_event_callback(v, ed); maps_view_event_data_destroy(ed); + //LCOV_EXCL_STOP } } @@ -1100,7 +1117,7 @@ EXPORT_API int maps_view_set_orientation(maps_view_h view, double angle) /* Add inertia to the rotation process */ maps_view_s *v = (maps_view_s *)view; if (v->inertial_camera) - v->inertial_camera->set_rotation_target(angle); + v->inertial_camera->set_rotation_target(angle); //LCOV_EXCL_LINE return _maps_view_set_zoom_rotate(view, false, .0, true, angle); } @@ -1292,16 +1309,20 @@ int _maps_view_set_inertia_enabled(maps_view_h view, bool enabled) if (!v->inertial_gesture) { v->inertial_gesture = new view::inertial_gesture(view); if (!v->inertial_gesture) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } } if (!v->inertial_camera) { v->inertial_camera = new view::inertial_camera(view); if (!v->inertial_camera) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } } @@ -1334,6 +1355,7 @@ int _maps_view_set_inertia_enabled(maps_view_h view, bool enabled) return MAPS_ERROR_NONE; } +//LCOV_EXCL_START EXPORT_API int maps_view_get_inertia_enabled(maps_view_h view, bool *enabled) { if (!maps_condition_check_maps_feature()) @@ -1345,6 +1367,7 @@ EXPORT_API int maps_view_get_inertia_enabled(maps_view_h view, bool *enabled) *enabled = v->inertial_camera != NULL; return MAPS_ERROR_NONE; } +//LCOV_EXCL_STOP EXPORT_API int maps_view_set_language(maps_view_h view, const char *language) { @@ -1486,6 +1509,7 @@ EXPORT_API int maps_view_get_visibility(const maps_view_h view, bool *visible) return MAPS_ERROR_NONE; } +//LCOV_EXCL_START int _maps_view_redraw(const maps_view_h view) { if (!view) @@ -1498,6 +1522,7 @@ int _maps_view_redraw(const maps_view_h view) return MAPS_ERROR_NONE; } +//LCOV_EXCL_STOP /* ---------------------USER CONTROL------------------------------------------*/ @@ -1599,7 +1624,7 @@ EXPORT_API int maps_view_add_object(maps_view_h view, maps_view_object_h object) return MAPS_ERROR_NONE; } while (false); - return error; + return error; //LCOV_EXCL_LINE } EXPORT_API int maps_view_remove_object(maps_view_h view, maps_view_object_h object) @@ -1622,7 +1647,7 @@ EXPORT_API int maps_view_remove_object(maps_view_h view, maps_view_object_h obje /* Redraw the view */ error = _maps_view_redraw(v); if (error != MAPS_ERROR_NONE) - return error; + return error; //LCOV_EXCL_LINE return MAPS_ERROR_NONE; } while (false); @@ -1649,7 +1674,7 @@ EXPORT_API int maps_view_remove_all_objects(maps_view_h view) /* Redraw the view */ error = _maps_view_redraw(v); if (error != MAPS_ERROR_NONE) - return error; + return error; //LCOV_EXCL_LINE return MAPS_ERROR_NONE; } while (false); @@ -1679,8 +1704,10 @@ maps_view_event_data_h _maps_view_create_event_data(maps_view_event_type_e type) maps_view_event_data_h event_data = NULL; const int error = _maps_view_event_data_create(&event_data); if (error != MAPS_ERROR_NONE) { + //LCOV_EXCL_START maps_view_event_data_destroy(event_data); return NULL; + //LCOV_EXCL_STOP } if (!event_data) return NULL; @@ -1691,7 +1718,7 @@ maps_view_event_data_h _maps_view_create_event_data(maps_view_event_type_e type) void _maps_view_invoke_event_callback(maps_view_h view, maps_view_event_data_h event_data) { if (!view || !event_data) - return; + return; //LCOV_EXCL_LINE maps_view_s *v = (maps_view_s *)view; @@ -1738,7 +1765,7 @@ typedef struct _maps_view_collect_poly_object_point_s { view::poly_shape_hit_test *pd; } maps_view_collect_poly_object_point_s; - +//LCOV_EXCL_START static bool __maps_view_object_poly_collect_points_cb(int index, maps_coordinates_h point, void *user_data) { if (!point || !user_data) @@ -1877,6 +1904,7 @@ maps_view_object_h _maps_view_object_hit_test(maps_view_h view, int x, int y, ma /* 2. Extract test result */ return htd.object; } +//LCOV_EXCL_STOP EXPORT_API int maps_view_get_maps_plugin_view_handle(maps_view_h view, void **maps_plugin_view_handle) { diff --git a/src/api/maps_view_event_data.cpp b/src/api/maps_view_event_data.cpp index 5c1fda0..25be741 100644 --- a/src/api/maps_view_event_data.cpp +++ b/src/api/maps_view_event_data.cpp @@ -32,7 +32,7 @@ typedef struct _maps_view_event_data_s { /* Applicable for gesture */ int x; int y; - maps_coordinates_h coordinates; + maps_coordinates_h coordinates; /* Applicable for center move */ int delta_x; @@ -89,8 +89,10 @@ int _maps_view_event_data_create(maps_view_event_data_h *event) maps_view_event_data_s *e = g_slice_new0(maps_view_event_data_s); if (!e) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } e->event_type = MAPS_VIEW_EVENT_GESTURE; @@ -115,6 +117,7 @@ EXPORT_API int maps_view_event_data_destroy(maps_view_event_data_h event) return MAPS_ERROR_NONE; } +//LCOV_EXCL_START EXPORT_API int maps_view_event_data_clone(const maps_view_event_data_h origin, maps_view_event_data_h *cloned) { if (!maps_condition_check_maps_feature()) @@ -169,7 +172,7 @@ int _maps_view_event_data_set_center(maps_view_event_data_h event, maps_coordina return MAPS_ERROR_INVALID_PARAMETER; maps_view_event_data_s *e = (maps_view_event_data_s *) event; if (e->center) - maps_coordinates_destroy(e->center); + maps_coordinates_destroy(e->center); //LCOV_EXCL_LINE return maps_coordinates_clone(center, &e->center); } @@ -408,3 +411,4 @@ EXPORT_API int maps_view_event_data_get_object(const maps_view_event_data_h even *object = e->object; return MAPS_ERROR_NONE; } +//LCOV_EXCL_STOP diff --git a/src/api/maps_view_object.cpp b/src/api/maps_view_object.cpp index ae24ea2..67f54fe 100644 --- a/src/api/maps_view_object.cpp +++ b/src/api/maps_view_object.cpp @@ -150,9 +150,11 @@ static int __maps_view_polyline_data_create(void **polyline) do { p = g_slice_new0(maps_view_polyline_data_s); if (!p) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } error = maps_coordinates_list_create(&p->points); @@ -163,8 +165,10 @@ static int __maps_view_polyline_data_create(void **polyline) return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START __maps_view_polyline_data_destroy(p); return error; + //LCOV_EXCL_STOP } static int __maps_view_polyline_data_destroy(void *polyline) @@ -200,9 +204,11 @@ static int __maps_view_polygon_data_create(void **polygon) do { p = g_slice_new0(maps_view_polygon_data_s); if (!p) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } error = maps_coordinates_list_create(&p->points); @@ -213,8 +219,10 @@ static int __maps_view_polygon_data_create(void **polygon) return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START __maps_view_polygon_data_destroy(p); return error; + //LCOV_EXCL_STOP } static int __maps_view_polygon_data_destroy(void *polygon) @@ -251,9 +259,11 @@ static int __maps_view_marker_data_create(void **marker) do { m = g_slice_new0(maps_view_marker_data_s); if (!m) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } error = maps_coordinates_create(.0, .0, &m->coordinates); @@ -268,8 +278,10 @@ static int __maps_view_marker_data_create(void **marker) return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START __maps_view_marker_data_destroy(m); return error; + //LCOV_EXCL_STOP } static int __maps_view_marker_data_destroy(void *marker) @@ -308,9 +320,11 @@ static int __maps_view_overlay_data_create(void **overlay) do { m = g_slice_new0(maps_view_overlay_data_s); if (!m) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } error = maps_coordinates_create(.0, .0, &m->coordinates); @@ -321,8 +335,10 @@ static int __maps_view_overlay_data_create(void **overlay) return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START __maps_view_overlay_data_destroy(m); return error; + //LCOV_EXCL_STOP } static int __maps_view_overlay_data_destroy(void *overlay) @@ -367,9 +383,11 @@ int _maps_view_object_create(maps_view_object_type_e type, maps_view_object_h *o do { o = g_slice_new0(maps_view_object_s); if (!o) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); return MAPS_ERROR_OUT_OF_MEMORY; + //LCOV_EXCL_STOP } o->type = type; @@ -406,8 +424,10 @@ int _maps_view_object_create(maps_view_object_type_e type, maps_view_object_h *o *object = (maps_view_object_h) o; return MAPS_ERROR_NONE; } while (false); + //LCOV_EXCL_START maps_view_object_destroy(o); return error; + //LCOV_EXCL_STOP } int _maps_view_object_set_view(maps_view_object_h object, maps_view_h view) @@ -474,9 +494,11 @@ EXPORT_API int maps_view_object_create_polyline(maps_coordinates_list_h coordina return pc.get_error(); /* Polyline create failure */ + //LCOV_EXCL_START maps_view_object_destroy(*polyline); *polyline = NULL; return pc.get_error(); + //LCOV_EXCL_STOP } EXPORT_API int maps_view_object_create_polygon(maps_coordinates_list_h coordinates, @@ -494,9 +516,11 @@ EXPORT_API int maps_view_object_create_polygon(maps_coordinates_list_h coordinat return pc.get_error(); /* Polygon create failure */ + //LCOV_EXCL_START maps_view_object_destroy(*polygon); *polygon = NULL; return pc.get_error(); + //LCOV_EXCL_STOP } EXPORT_API int maps_view_object_create_overlay(maps_coordinates_h coordinates, @@ -519,9 +543,11 @@ EXPORT_API int maps_view_object_create_overlay(maps_coordinates_h coordinates, return pc.get_error(); /* Overlay create failure */ + //LCOV_EXCL_START maps_view_object_destroy(*overlay); *overlay = NULL; return pc.get_error(); + //LCOV_EXCL_STOP } EXPORT_API int maps_view_object_destroy(maps_view_object_h object) @@ -1029,6 +1055,7 @@ int _maps_view_object_overlay_set_type(maps_view_object_h overlay, maps_view_ove return MAPS_ERROR_NONE; } +//LCOV_EXCL_START int _maps_view_object_overlay_get_bubble(maps_view_object_h overlay, Evas_Object **object) { if (!overlay || !object) @@ -1039,6 +1066,7 @@ int _maps_view_object_overlay_get_bubble(maps_view_object_h overlay, Evas_Object *object = m->bubble; return MAPS_ERROR_NONE; } +//LCOV_EXCL_STOP int _maps_view_object_overlay_set_bubble(maps_view_object_h overlay) { @@ -1357,6 +1385,7 @@ static bool __maps_view_object_overlay_update(maps_view_object_h overlay, Evas_O return ret; } +//LCOV_EXCL_START bool _maps_view_object_overlay_cb(int index, int total, maps_view_object_h object, void *user_data) { if (!object || !user_data) @@ -1368,6 +1397,7 @@ bool _maps_view_object_overlay_cb(int index, int total, maps_view_object_h objec return true; return __maps_view_object_overlay_update(object, (Evas_Object*)user_data); } +//LCOV_EXCL_STOP int _maps_view_object_overlay_operation(maps_view_h view, maps_view_object_h object, maps_view_object_operation_e operation) { diff --git a/src/api/maps_view_snapshot.cpp b/src/api/maps_view_snapshot.cpp index 53ca1c7..8007247 100644 --- a/src/api/maps_view_snapshot.cpp +++ b/src/api/maps_view_snapshot.cpp @@ -72,7 +72,7 @@ static bool __encode_bitmap_file(const void *data, int width, int height, const int i; if (fp == NULL) { - MAPS_LOGE("fopen fail"); + MAPS_LOGE("fopen fail"); //LCOV_EXCL_LINE return false; } bmpfile_header.filesz = sizeof(bmpfile_magic) + sizeof(bmpfile_header) + sizeof(bmp_dib_v3_header_t) + (width * height * 3); @@ -248,8 +248,10 @@ EXPORT_API int maps_view_capture_snapshot(maps_view_h view, if (error != MAPS_ERROR_NONE) break; if (cs != MAPS_VIEW_COLORSPACE_RGBA8888 && cs != MAPS_VIEW_COLORSPACE_BGRA8888) { + //LCOV_EXCL_START MAPS_LOGE("The color space is not supported yet. (%d)", cs); error = MAPS_ERROR_INVALID_OPERATION; + //LCOV_EXCL_STOP break; } diff --git a/src/maps_util.cpp b/src/maps_util.cpp index e3a31b1..e2a75e2 100644 --- a/src/maps_util.cpp +++ b/src/maps_util.cpp @@ -52,6 +52,7 @@ int maps_get_screen_dpi(int *dpi) return MAPS_ERROR_NONE; } +//LCOV_EXCL_START tizen_profile_t _get_tizen_profile() { static tizen_profile_t profile = TIZEN_PROFILE_UNKNOWN; @@ -84,3 +85,4 @@ tizen_profile_t _get_tizen_profile() return profile; } +//LCOV_EXCL_STOP diff --git a/src/maps_util.h b/src/maps_util.h index 74037fe..9aae621 100755 --- a/src/maps_util.h +++ b/src/maps_util.h @@ -38,6 +38,7 @@ #define MAPS_BASE_DATE_MAX_LEN 32 #define MAPS_PLUGINS_PATH_PREFIX LIBDIR"/maps/plugins" +//LCOV_EXCL_START /* * Internal Macros */ @@ -218,6 +219,7 @@ public: return !pstring || (*this == string("")); } }; +//LCOV_EXCL_STOP typedef enum { TIZEN_PROFILE_UNKNOWN = 0, diff --git a/src/plugin/discovery.cpp b/src/plugin/discovery.cpp index f6b4ddd..f2d60e0 100644 --- a/src/plugin/discovery.cpp +++ b/src/plugin/discovery.cpp @@ -27,11 +27,13 @@ plugin::provider_info::provider_info() { } +//LCOV_EXCL_START plugin::provider_info::provider_info(const string &p, const string &f) : provider(p) , file(f) { } +//LCOV_EXCL_STOP plugin::provider_info::provider_info(const provider_info &src) { @@ -82,7 +84,7 @@ vector plugin::discovery::get_available_list() const /* Request the next plugin binary to get provider info */ const provider_info info = be.get_plugin_info(l[i]); if (info.empty()) - continue; + continue; //LCOV_EXCL_LINE /* Add provider info to the resulting list */ v.push_back(info); @@ -114,8 +116,10 @@ vector plugin::discovery::get_module_file_list() const g_pattern_spec_free(plugin_name_pattern); g_dir_close(dir); + //LCOV_EXCL_START } else if (error) { MAPS_LOGE("%d: Can not open directory: %s\n", error->code, error->message); + //LCOV_EXCL_STOP } return l; @@ -211,17 +215,19 @@ int plugin::request_user_consent(const char *maps_provider, void *callback, void (const char*)uc->provider, user_consent_cb, (void*)uc); MAPS_LOGD("maps_plugin_request_user_consent = %d", error); if (error == MAPS_ERROR_USER_NOT_CONSENTED) - error = MAPS_ERROR_NONE; + error = MAPS_ERROR_NONE; //LCOV_EXCL_LINE } } /* 3. shutdown plugin */ if (error != MAPS_ERROR_NONE) { + //LCOV_EXCL_START plugin::user_consent_checker().shutdown(plugin_handle); if (uc) { g_free(uc->provider); g_free(uc); } + //LCOV_EXCL_STOP } return error; diff --git a/src/plugin/discovery.h b/src/plugin/discovery.h index 5e45b8d..a051868 100644 --- a/src/plugin/discovery.h +++ b/src/plugin/discovery.h @@ -19,6 +19,7 @@ #include "maps_util.h" +//LCOV_EXCL_START namespace plugin { @@ -61,5 +62,6 @@ namespace plugin void user_consent_cb(bool consented, const char *provider, void *user_data); int request_user_consent(const char *maps_provider, void* callback, void *user_data); } +//LCOV_EXCL_STOP #endif /* __MAPS_SERVICE_PLUGIN_DISCOVERY_H__ */ \ No newline at end of file diff --git a/src/plugin/empty_module.cpp b/src/plugin/empty_module.cpp index 1f87a8a..bff9bbd 100644 --- a/src/plugin/empty_module.cpp +++ b/src/plugin/empty_module.cpp @@ -21,6 +21,7 @@ /* Set of empty functions */ /* Plugin dedicated functions */ +//LCOV_EXCL_START int maps_plugin_init_empty(maps_plugin_h *plugin) { return 0; @@ -346,3 +347,4 @@ plugin::interface_s *plugin::get_empty_interface_ptr() { return &empty_interface; } +//LCOV_EXCL_STOP diff --git a/src/plugin/module.cpp b/src/plugin/module.cpp index f5a8bf5..47b0432 100644 --- a/src/plugin/module.cpp +++ b/src/plugin/module.cpp @@ -40,12 +40,12 @@ plugin::provider_info plugin::binary_extractor::get_plugin_info(const string &file_name) const { if (file_name.empty()) - return provider_info::empty_instance; + return provider_info::empty_instance; //LCOV_EXCL_LINE /* 1.Initialize plugin */ GMod *plugin = gmod_new(file_name, FALSE); if (!plugin) - return provider_info::empty_instance; + return provider_info::empty_instance; //LCOV_EXCL_LINE provider_info info; @@ -78,18 +78,22 @@ maps_plugin_h plugin::binary_extractor::init(const provider_info &info, { /* 1.Initialize plugin */ if (info.file.empty() || !init_error) { + //LCOV_EXCL_START if (init_error) *init_error = MAPS_ERROR_NOT_SUPPORTED; return NULL; + //LCOV_EXCL_STOP } *init_error = MAPS_ERROR_NONE; GMod *plugin = gmod_new(info.file, TRUE); if (!plugin) { + //LCOV_EXCL_START MAPS_LOGE("Open Module Failed: %s", info.file.c_str()); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; return NULL; + //LCOV_EXCL_STOP } /* 2.1 Create new plugin interface */ @@ -98,9 +102,11 @@ maps_plugin_h plugin::binary_extractor::init(const provider_info &info, /* 2. Perform steps to completely initialize a plugin */ do { if (!new_plugin) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); *init_error = MAPS_ERROR_OUT_OF_MEMORY; break; + //LCOV_EXCL_STOP } /* 2.1 Set plugin module handle */ @@ -242,9 +248,11 @@ maps_plugin_h plugin::binary_extractor::init(const provider_info &info, /* 2.3 Check whether the plugin init function is valid */ if (!new_plugin->interface.maps_plugin_init) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! Plugin initialization function is invalid"); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; break; + //LCOV_EXCL_STOP } /* 2.4 Call a plugin to initialize itself, send to the plugin @@ -253,48 +261,61 @@ maps_plugin_h plugin::binary_extractor::init(const provider_info &info, if (!module || !new_plugin->interface.maps_plugin_init_module) ret = new_plugin->interface.maps_plugin_init((maps_plugin_h *) (&new_plugin)); else - ret = new_plugin->interface.maps_plugin_init_module((maps_plugin_h *) (&new_plugin), module); + ret = new_plugin->interface.maps_plugin_init_module((maps_plugin_h *) (&new_plugin), module); //LCOV_EXCL_LINE if (ret != MAPS_ERROR_NONE) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! Plugin initialization function failed: %d", ret); *init_error = ret; break; + //LCOV_EXCL_STOP } if (!new_plugin->interface.maps_plugin_set_provider_key) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! Plugin set_provider_key function is NULL"); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; break; + //LCOV_EXCL_STOP } if (!new_plugin->interface.maps_plugin_get_provider_key) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! Plugin set_provider_key function is NULL"); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; break; + //LCOV_EXCL_STOP } if (!new_plugin->interface.maps_plugin_set_preference) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! Plugin set_preference function is NULL"); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; break; } if (!new_plugin->interface.maps_plugin_get_preference) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! Plugin get_preference function is NULL"); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; break; + //LCOV_EXCL_STOP } if (!new_plugin->interface.maps_plugin_is_data_supported) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! Plugin support_is_data_supported function is NULL"); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; break; + //LCOV_EXCL_STOP } if (!new_plugin->interface.maps_plugin_is_service_supported) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! Plugin support_is_service_supported function is NULL"); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; break; + //LCOV_EXCL_STOP } /* 2.7 Create a queue with asynchronous requests to plugin */ @@ -306,9 +327,11 @@ maps_plugin_h plugin::binary_extractor::init(const provider_info &info, g_hash_table_new_full(g_int_hash, g_int_equal, g_free, session::command_handler::destroy); if (!new_plugin->pending_request_maps) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); *init_error = MAPS_ERROR_OUT_OF_MEMORY; break; + //LCOV_EXCL_STOP } g_mutex_init(&new_plugin->pending_request_mutex); @@ -319,11 +342,13 @@ maps_plugin_h plugin::binary_extractor::init(const provider_info &info, return new_plugin; } while (FALSE); + //LCOV_EXCL_START MAPS_LOGE("Shut down the plugin becuause of error"); /* 3. shutdown plugin in case of problem */ shutdown(new_plugin); return NULL; + //LCOV_EXCL_STOP } void plugin::binary_extractor::shutdown(maps_plugin_h plugin_h) @@ -343,7 +368,7 @@ void plugin::binary_extractor::shutdown(maps_plugin_h plugin_h) /* 2. Destroy the request queue */ if (plugin->request_queue) - g_async_queue_unref(plugin->request_queue); + g_async_queue_unref(plugin->request_queue); //LCOV_EXCL_LINE /* 3. Destroy the map of pending requests */ if (plugin->pending_request_maps) { @@ -368,8 +393,10 @@ plugin::GMod *plugin::binary_extractor::gmod_new(const string &module_file, gboolean is_resident) const { if (!g_module_supported()) { + //LCOV_EXCL_START MAPS_LOGE("ERROR! g_module_supported is false\n\n"); return NULL; + //LCOV_EXCL_STOP } if (module_file.empty()) @@ -379,20 +406,25 @@ plugin::GMod *plugin::binary_extractor::gmod_new(const string &module_file, gmod->name = g_strdup(module_file.c_str()); if (!gmod->name) { + //LCOV_EXCL_START g_free(gmod); return NULL; + //LCOV_EXCL_STOP } gmod->path = g_strnfill(100, 0); g_sprintf(gmod->path, "%s/%s", MAPS_PLUGINS_PATH_PREFIX, gmod->name); if (!gmod->path) { + //LCOV_EXCL_START g_free(gmod->name); g_free(gmod); return NULL; + //LCOV_EXCL_STOP } gmod->module = g_module_open(gmod->path, G_MODULE_BIND_LAZY); if (!gmod->module) { + //LCOV_EXCL_START MAPS_LOGE("module path not found: %s", gmod->path); const gchar *last_error = g_module_error(); @@ -402,6 +434,7 @@ plugin::GMod *plugin::binary_extractor::gmod_new(const string &module_file, g_free(gmod->path); g_free(gmod); return NULL; + //LCOV_EXCL_STOP } MAPS_LOGD("open module"); /*if (is_resident) @@ -438,9 +471,11 @@ gpointer plugin::binary_extractor::gmod_find_sym(GMod *gmod, gpointer func_ptr = NULL; if (!g_module_symbol(gmod->module, func_name, &func_ptr)) { + //LCOV_EXCL_START MAPS_LOGE("function symbol not found"); MAPS_LOGE("%s", g_module_error()); func_ptr = NULL; + //LCOV_EXCL_STOP } return func_ptr; } @@ -450,14 +485,16 @@ void plugin::binary_extractor::trace_dbg(const plugin_s *plugin) const MAPS_LOGD("*********************************************"); MAPS_LOGD("PLUGIN INFO"); if (!plugin) { + //LCOV_EXCL_START MAPS_LOGD("PLUGIN is NULL"); MAPS_LOGD("*********************************************"); return; + //LCOV_EXCL_STOP } const GMod *mod = (const GMod *) plugin->module; if (!mod) { - MAPS_LOGD("PLUGIN module is NULL"); + MAPS_LOGD("PLUGIN module is NULL"); //LCOV_EXCL_LINE } else { MAPS_LOGD("module address:\t\t\t%p", mod->module); MAPS_LOGD("module name:\t\t\t%s", mod->name); @@ -467,7 +504,7 @@ void plugin::binary_extractor::trace_dbg(const plugin_s *plugin) const if (!plugin->request_queue) { MAPS_LOGD("PLUGIN request queue is NULL"); } else { - MAPS_LOGD("plugin request queue:\t\t\t%p", plugin->request_queue); + MAPS_LOGD("plugin request queue:\t\t\t%p", plugin->request_queue); //LCOV_EXCL_LINE } const interface_s *itf = &plugin->interface; @@ -541,9 +578,11 @@ maps_plugin_h plugin::user_consent_checker::init(const provider_info &info, GMod *plugin = gmod_new(info.file, TRUE); if (!plugin) { + //LCOV_EXCL_START MAPS_LOGE("Open Module Failed: %s", info.file.c_str()); *init_error = MAPS_ERROR_SERVICE_NOT_AVAILABLE; return NULL; + //LCOV_EXCL_STOP } /* 2.1 Create new plugin interface */ @@ -552,9 +591,11 @@ maps_plugin_h plugin::user_consent_checker::init(const provider_info &info, /* 2. Perform steps to completely initialize a plugin */ do { if (!new_plugin) { + //LCOV_EXCL_START MAPS_LOGE("OUT_OF_MEMORY(0x%08x)", MAPS_ERROR_OUT_OF_MEMORY); *init_error = MAPS_ERROR_OUT_OF_MEMORY; break; + //LCOV_EXCL_STOP } /* 2.1 Set plugin module handle */ diff --git a/src/plugin/module.h b/src/plugin/module.h index 5e28f0b..b499497 100644 --- a/src/plugin/module.h +++ b/src/plugin/module.h @@ -224,6 +224,7 @@ typedef struct _GMod { /* RAII Class implementing the mutex helper on the base of GLib mutex */ /* which automatically locks mutex during its creation and unlocks while * exiting the scope */ +//LCOV_EXCL_START class scope_mutex { GMutex *mutex; public: @@ -254,6 +255,7 @@ public: maps_plugin_h init(const provider_info &info, const char *module, int *init_error); void shutdown(maps_plugin_h plugin_h); }; +//LCOV_EXCL_STOP }; #endif /* __MAPS_SERVICE_PLUGIN_MODULE_H__ */ diff --git a/src/session/command.cpp b/src/session/command.cpp index 77e66b2..7ea1f94 100644 --- a/src/session/command.cpp +++ b/src/session/command.cpp @@ -21,13 +21,14 @@ extern plugin::plugin_s *__extract_plugin(maps_service_h maps); volatile int session::command::command_request_id = 1; -session::command session::command::empty_instance; +session::command session::command::empty_instance; //LCOV_EXCL_LINE session::command::command(maps_service_h ms) : m(ms), my_req_id(0), error(MAPS_ERROR_NONE), is_merged(false) { } +//LCOV_EXCL_START session::command::command(const command &src) { *this = src; @@ -52,6 +53,7 @@ int session::command::run() { return MAPS_ERROR_NONE; } +//LCOV_EXCL_STOP void session::command::destroy() { @@ -62,15 +64,16 @@ void session::command::destroy() plugin::interface_s *session::command::interface() const { if (!m) - return plugin::get_empty_interface_ptr(); + return plugin::get_empty_interface_ptr(); //LCOV_EXCL_LINE plugin::plugin_s *p = __extract_plugin(m); if (!p) - return plugin::get_empty_interface_ptr(); + return plugin::get_empty_interface_ptr(); //LCOV_EXCL_LINE return &p->interface; } +//LCOV_EXCL_START maps_plugin_h session::command::handle() const { return (maps_plugin_h) plugin(); @@ -108,6 +111,7 @@ void session::command::set_merged() { is_merged = true; } +//LCOV_EXCL_STOP /*----------------------------------------------------------------------------*/ session::command_handler::command_handler(plugin::plugin_s *p, void *ud, @@ -160,9 +164,11 @@ void session::pending_request::update(int user_req_id, handler->plg_req_id); if (!contains(user_req_id)) { /* Attempt to update not existing id */ + //LCOV_EXCL_START MAPS_LOGD("\t not updated session::pending_request: %d, %d", user_req_id, handler->plg_req_id); delete handler; /* This handler must be deleted */ + //LCOV_EXCL_STOP return; } @@ -221,9 +227,11 @@ bool session::pending_request::contains(const int user_req_id) return g_hash_table_contains(plg->pending_request_maps, &user_req_id); } +//LCOV_EXCL_START int *session::pending_request::int_dup(const int n) { int *clone = g_new0(int, 1); *clone = n; return clone; -} \ No newline at end of file +} +//LCOV_EXCL_STOP diff --git a/src/session/command.h b/src/session/command.h index 915ada1..aa1b1f6 100644 --- a/src/session/command.h +++ b/src/session/command.h @@ -35,6 +35,7 @@ typedef enum _command_type_e { /*----------------------------------------------------------------------------*/ +//LCOV_EXCL_START class command { private: @@ -152,5 +153,6 @@ class pending_request int *int_dup(const int n); }; } +//LCOV_EXCL_STOP #endif /* __MAPS_SERVICE_SESSION_COMMAND_H__ */ diff --git a/src/session/command_queue.cpp b/src/session/command_queue.cpp index 311a243..9379a16 100644 --- a/src/session/command_queue.cpp +++ b/src/session/command_queue.cpp @@ -36,6 +36,7 @@ session::command_queue *session::command_queue::interface() /*----------------------------------------------------------------------------*/ +//LCOV_EXCL_START int session::command_queue_sync::push(command *c) { return (c and c->plugin())? c->run() : MAPS_ERROR_INVALID_PARAMETER; @@ -50,6 +51,7 @@ void session::command_queue_sync::process(plugin::plugin_s *p) { /* empty */ } +//LCOV_EXCL_STOP void session::command_queue_sync::clear(plugin::plugin_s *p) { diff --git a/src/session/command_queue.h b/src/session/command_queue.h index c591219..9661ce0 100644 --- a/src/session/command_queue.h +++ b/src/session/command_queue.h @@ -18,6 +18,7 @@ #define __MAPS_SERVICE_SESSION_COMMAND_QUEUE_H__ #include "module.h" +//LCOV_EXCL_START namespace session { @@ -125,5 +126,6 @@ namespace session #endif /* _MAPS_SERVICE_SUPPORTS_ASYNC_QUEUE_ */ }; +//LCOV_EXCL_STOP #endif /* __MAPS_SERVICE_SESSION_COMMAND_QUEUE_H__ */ diff --git a/src/session/commands.cpp b/src/session/commands.cpp index e20fdbc..0cda181 100644 --- a/src/session/commands.cpp +++ b/src/session/commands.cpp @@ -160,7 +160,7 @@ int session::command_geocode::run() MAPS_LOGD("session::command_geocode::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -176,6 +176,7 @@ int session::command_geocode::run() return ret; } +//LCOV_EXCL_START session::command_geocode_handler::command_geocode_handler(plugin::plugin_s *p, maps_service_geocode_cb cb, void *ud, int urid) @@ -183,6 +184,7 @@ session::command_geocode_handler::command_geocode_handler(plugin::plugin_s *p, , callback(cb) { } +//LCOV_EXCL_STOP bool session::command_geocode_handler::foreach_geocode_cb(maps_error_e error, int request_id, @@ -195,8 +197,10 @@ bool session::command_geocode_handler::foreach_geocode_cb(maps_error_e error, command_geocode_handler *handler = (command_geocode_handler *) user_data; if (request_id != handler->plg_req_id) { + //LCOV_EXCL_START MAPS_LOGE("\nERROR! Incorrect request id [%d] come from the plugin; expected [%d]\n", request_id, handler->plg_req_id); + //LCOV_EXCL_STOP } /* Make a user's copy of result data */ @@ -241,8 +245,10 @@ session::command_geocode_inside_bounds::command_geocode_inside_bounds( if (maps_area_is_valid(b)) { bounds = b; } else { + //LCOV_EXCL_START error = MAPS_ERROR_INVALID_PARAMETER; *request_id = -1; + //LCOV_EXCL_STOP } } @@ -278,7 +284,7 @@ int session::command_geocode_inside_bounds::run() MAPS_LOGD("session::command_geocode_inside_bounds::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -318,9 +324,11 @@ session::command_geocode_by_structured_address:: if (maps_address_is_valid(a)) { address = a; } else { + //LCOV_EXCL_START error = MAPS_ERROR_INVALID_PARAMETER; *request_id = -1; MAPS_LOGD("Invalid parameter"); + //LCOV_EXCL_STOP } } @@ -355,7 +363,7 @@ int session::command_geocode_by_structured_address::run() pr.update(my_req_id, handler); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -424,7 +432,7 @@ int session::command_reverse_geocode::run() MAPS_LOGD("session::command_reverse_geocode::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -441,6 +449,7 @@ int session::command_reverse_geocode::run() return ret; } +//LCOV_EXCL_START session::command_reverse_geocode_handler::command_reverse_geocode_handler( plugin::plugin_s *p, maps_service_reverse_geocode_cb cb, @@ -449,6 +458,7 @@ session::command_reverse_geocode_handler::command_reverse_geocode_handler( , callback(cb) { } +//LCOV_EXCL_STOP void session::command_reverse_geocode_handler::foreach_reverse_geocode_cb( maps_error_e error, @@ -461,8 +471,10 @@ void session::command_reverse_geocode_handler::foreach_reverse_geocode_cb( (command_reverse_geocode_handler *) user_data; if (request_id != handler->plg_req_id) { + //LCOV_EXCL_START MAPS_LOGE("\n\nERROR! Incorrect request id [%d] come from the plugin; expected [%d]\n\n", request_id, handler->plg_req_id); + //LCOV_EXCL_STOP } /* Make a user's copy of result data */ @@ -537,7 +549,7 @@ int session::command_multi_reverse_geocode::run() MAPS_LOGD("session::command_multi_reverse_geocode::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -554,12 +566,14 @@ int session::command_multi_reverse_geocode::run() return ret; } +//LCOV_EXCL_START session::command_multi_reverse_geocode_handler::command_multi_reverse_geocode_handler( plugin::plugin_s *p, maps_service_multi_reverse_geocode_cb cb, void *ud, int urid) : command_handler(p, ud, urid) , callback(cb) { } +//LCOV_EXCL_STOP bool session::command_multi_reverse_geocode_handler::foreach_multi_reverse_geocode_cb( maps_error_e error, int request_id, int total, maps_coordinates_list_h address_list, void *user_data) @@ -568,8 +582,10 @@ bool session::command_multi_reverse_geocode_handler::foreach_multi_reverse_geoco (command_multi_reverse_geocode_handler *) user_data; if (request_id != handler->plg_req_id) { + //LCOV_EXCL_START MAPS_LOGE("\n\nERROR! Incorrect request id [%d] come from the plugin; expected [%d]\n\n", request_id, handler->plg_req_id); + //LCOV_EXCL_STOP } /* Make a user's copy of result data */ @@ -613,9 +629,11 @@ session::command_search_place::command_search_place(maps_service_h ms, if (maps_coordinates_is_valid(pos)) { position = pos; } else { + //LCOV_EXCL_START error = MAPS_ERROR_INVALID_PARAMETER; *request_id = -1; MAPS_LOGD("Invalid parameter"); + //LCOV_EXCL_STOP } } @@ -649,7 +667,7 @@ int session::command_search_place::run() MAPS_LOGD("session::command_search_place::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -665,6 +683,7 @@ int session::command_search_place::run() return ret; } +//LCOV_EXCL_START session::command_search_place_handler::command_search_place_handler( plugin::plugin_s* p, maps_service_search_place_cb cb, @@ -673,6 +692,7 @@ session::command_search_place_handler::command_search_place_handler( , callback(cb) { } +//LCOV_EXCL_STOP bool session::command_search_place_handler::foreach_place_cb(maps_error_e error, int request_id, @@ -685,8 +705,10 @@ bool session::command_search_place_handler::foreach_place_cb(maps_error_e error, (command_search_place_handler *) user_data; if (request_id != handler->plg_req_id) { + //LCOV_EXCL_START MAPS_LOGE("\nERROR! Incorrect request id [%d] come from the plugin; expected [%d]\n", request_id, handler->plg_req_id); + //LCOV_EXCL_STOP } /* Make a user's copy of result data */ @@ -735,8 +757,10 @@ session::command_search_by_area_place::command_search_by_area_place( if (maps_area_is_valid(b)) { boundary = b; } else { + //LCOV_EXCL_START error = MAPS_ERROR_INVALID_PARAMETER; *request_id = -1; + //LCOV_EXCL_STOP } } @@ -771,7 +795,7 @@ int session::command_search_by_area_place::run() MAPS_LOGD("session::command_search_by_area_place::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -816,9 +840,11 @@ session::command_search_by_address_place::command_search_by_address_place( if (maps_area_is_valid(b)) { boundary = b; } else { + //LCOV_EXCL_START error = MAPS_ERROR_INVALID_PARAMETER; *request_id = -1; MAPS_LOGD("Invalid parameter"); + //LCOV_EXCL_STOP } } @@ -854,7 +880,7 @@ int session::command_search_by_address_place::run() MAPS_LOGD("session::command_search_by_address_place::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -895,9 +921,11 @@ session::command_search_place_list::command_search_place_list(maps_service_h ms, if (maps_area_is_valid(b)) { boundary = b; } else { + //LCOV_EXCL_START error = MAPS_ERROR_INVALID_PARAMETER; *request_id = -1; MAPS_LOGD("Invalid parameter"); + //LCOV_EXCL_STOP } } @@ -932,7 +960,7 @@ int session::command_search_place_list::run() MAPS_LOGD("session::command_search_place_list::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -948,6 +976,7 @@ int session::command_search_place_list::run() return ret; } +//LCOV_EXCL_START session::command_search_place_list_handler::command_search_place_list_handler( plugin::plugin_s* p, maps_service_search_place_list_cb cb, @@ -956,6 +985,7 @@ session::command_search_place_list_handler::command_search_place_list_handler( , callback(cb) { } +//LCOV_EXCL_STOP void session::command_search_place_list_handler::foreach_place_list_cb(maps_error_e error, int request_id, @@ -967,8 +997,10 @@ void session::command_search_place_list_handler::foreach_place_list_cb(maps_erro (command_search_place_list_handler *) user_data; if (request_id != handler->plg_req_id) { + //LCOV_EXCL_START MAPS_LOGE("\n\nERROR! Incorrect request id [%d] come from the plugin; expected [%d]\n\n", request_id, handler->plg_req_id); + //LCOV_EXCL_STOP } /* Check which data features are supported */ @@ -1029,7 +1061,7 @@ int session::command_get_place_details::run() MAPS_LOGD("session::command_get_place_details::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -1046,6 +1078,7 @@ int session::command_get_place_details::run() return ret; } +//LCOV_EXCL_START session::command_get_place_details_handler::command_get_place_details_handler( plugin::plugin_s* p, maps_service_get_place_details_cb cb, @@ -1054,6 +1087,7 @@ session::command_get_place_details_handler::command_get_place_details_handler( , callback(cb) { } +//LCOV_EXCL_STOP void session::command_get_place_details_handler::foreach_place_details_cb(maps_error_e error, int request_id, maps_place_h place, void *user_data) @@ -1062,8 +1096,10 @@ void session::command_get_place_details_handler::foreach_place_details_cb(maps_e (command_get_place_details_handler *) user_data; if (request_id != handler->plg_req_id) { + //LCOV_EXCL_START MAPS_LOGE("\n\nERROR! Incorrect request id [%d] come from the plugin; expected [%d]\n\n", request_id, handler->plg_req_id); + //LCOV_EXCL_STOP } /* Make a user's copy of result data */ @@ -1108,18 +1144,20 @@ session::command_search_route::command_search_route(maps_service_h ms, if (maps_coordinates_is_valid(orig)) { origin = orig; } else { - error = MAPS_ERROR_INVALID_PARAMETER; + error = MAPS_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE } if (maps_coordinates_is_valid(dest)) { destination = dest; } else { - error = MAPS_ERROR_INVALID_PARAMETER; + error = MAPS_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE } if (error) { + //LCOV_EXCL_START *request_id = -1; MAPS_LOGD("Invalid parameter"); + //LCOV_EXCL_STOP } } @@ -1152,7 +1190,7 @@ int session::command_search_route::run() MAPS_LOGD("session::command_search_route::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -1238,7 +1276,7 @@ int session::command_search_route_waypoints::run() MAPS_LOGD("session::command_search_place::run: %d", my_req_id); } else { - error = MAPS_ERROR_OUT_OF_MEMORY; + error = MAPS_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } } else { /* Plugin Function is NULL: use default empty function */ @@ -1255,6 +1293,7 @@ int session::command_search_route_waypoints::run() return ret; } +//LCOV_EXCL_START session::command_search_route_handler::command_search_route_handler( plugin::plugin_s *p, maps_service_search_route_cb cb, @@ -1263,6 +1302,7 @@ session::command_search_route_handler::command_search_route_handler( , callback(cb) { } +//LCOV_EXCL_STOP bool session::command_search_route_handler::foreach_route_cb(maps_error_e error, int request_id, @@ -1275,8 +1315,10 @@ bool session::command_search_route_handler::foreach_route_cb(maps_error_e error, (command_search_route_handler *) user_data; if (request_id != handler->plg_req_id) { + //LCOV_EXCL_START MAPS_LOGE("\n\nERROR! Incorrect request id [%d] come from the plugin; expected [%d]\n\n", request_id, handler->plg_req_id); + //LCOV_EXCL_STOP } /* Make a user's copy of result data */ @@ -1320,6 +1362,7 @@ int session::command_cancel_request::run() * Mapping API commands */ /*----------------------------------------------------------------------------*/ +//LCOV_EXCL_START session::command_view_set_center::command_view_set_center(maps_service_h ms, maps_view_h view, @@ -1553,3 +1596,4 @@ void session::command_view_zoom_rotate::merge(const command *c) cmd->set_merged(); } } +//LCOV_EXCL_STOP diff --git a/src/session/commands.h b/src/session/commands.h index 9a78323..9f9a2f0 100644 --- a/src/session/commands.h +++ b/src/session/commands.h @@ -23,6 +23,7 @@ namespace session { +//LCOV_EXCL_START /*----------------------------------------------------------------------------*/ /*typedef int (*maps_plugin_geocode_f)(maps_service_h maps, * const char *address, maps_service_geocode_cb callback, @@ -867,6 +868,7 @@ private: virtual int get_priority() const; virtual void merge(const command *c); }; +//LCOV_EXCL_STOP } diff --git a/src/session/thread.cpp b/src/session/thread.cpp index 208ae40..e50c593 100644 --- a/src/session/thread.cpp +++ b/src/session/thread.cpp @@ -19,6 +19,7 @@ #include "command_queue.h" #include "command.h" +//LCOV_EXCL_START session::thread::thread() { } @@ -69,3 +70,4 @@ void session::thread::stop(plugin::plugin_s *p) command_queue *cq = session::command_queue::interface(); cq->clear(p); } +//LCOV_EXCL_STOP diff --git a/src/view/gesture_detector.cpp b/src/view/gesture_detector.cpp index 614de96..8d297e3 100644 --- a/src/view/gesture_detector.cpp +++ b/src/view/gesture_detector.cpp @@ -28,6 +28,7 @@ extern bool _maps_view_is_gesture_available(maps_view_h view, int view::gesture_detector::__CLICK_AREA = 50; +//LCOV_EXCL_START view::gesture_detector::gesture_detector(maps_view_h v) : _view(v) , _gp(this) @@ -227,3 +228,4 @@ void view::gesture_detector::log_map_center(int color) lat, lon, 0x1B, 0, 0, 0); } +//LCOV_EXCL_STOP diff --git a/src/view/gesture_detector_statemachine.cpp b/src/view/gesture_detector_statemachine.cpp index 322c5e5..c580bca 100644 --- a/src/view/gesture_detector_statemachine.cpp +++ b/src/view/gesture_detector_statemachine.cpp @@ -18,7 +18,7 @@ #include "gesture_detector_statemachine.h" #include - +//LCOV_EXCL_START view::gesture_detector_statemachine::gesture_detector_statemachine(maps_view_h v) : gesture_detector(v) , _current_state(STATE_NONE) @@ -827,3 +827,4 @@ void view::gesture_detector_statemachine::log_state(view_event_e event, s.c_str(), state, e.c_str(), event, 0x1B, 0, 0, 0); } +//LCOV_EXCL_STOP diff --git a/src/view/gesture_detector_statemachine.h b/src/view/gesture_detector_statemachine.h index 24e3378..9da978b 100644 --- a/src/view/gesture_detector_statemachine.h +++ b/src/view/gesture_detector_statemachine.h @@ -21,7 +21,7 @@ #include "runtime_data.h" #include "gesture_detector.h" - +//LCOV_EXCL_START namespace view { enum view_event_e { @@ -132,5 +132,6 @@ namespace view string get_event_str(view_event_e event); }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_GESTURE_DETECTOR_STATEMACHINE_H__ */ diff --git a/src/view/gesture_processor.cpp b/src/view/gesture_processor.cpp index 51e4f95..c981aac 100644 --- a/src/view/gesture_processor.cpp +++ b/src/view/gesture_processor.cpp @@ -54,7 +54,7 @@ extern int _maps_view_get_plugin_center(const maps_view_h view, maps_coordinates /* ---------------------------------------------------------------------------*/ - +//LCOV_EXCL_START view::zoom_calculator::zoom_calculator(const touch_point &start_tp_f1, const touch_point &cur_tp_f1, const touch_point &start_tp_f2, @@ -897,3 +897,4 @@ bool view::finger_event_stream::finger_dragged_enough(int finger_no, gesture_detector::get_trajectory_effective_length(tp, start); return (trajectory >= gesture_detector::__CLICK_AREA); } +//LCOV_EXCL_STOP diff --git a/src/view/gesture_processor.h b/src/view/gesture_processor.h index 594c04b..8ec056c 100644 --- a/src/view/gesture_processor.h +++ b/src/view/gesture_processor.h @@ -32,6 +32,7 @@ #define _MOVE_CENTER_COMMAND_DEFINED_ +//LCOV_EXCL_START namespace view { @@ -149,5 +150,6 @@ namespace view void set_gesture_detector(class gesture_detector *d); }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_GESTURE_PROCESSOR_H__ */ diff --git a/src/view/inertial_camera.cpp b/src/view/inertial_camera.cpp index 43ea5b2..9ffc68c 100644 --- a/src/view/inertial_camera.cpp +++ b/src/view/inertial_camera.cpp @@ -22,6 +22,7 @@ int _maps_coordinates_copy(maps_coordinates_h orig, maps_coordinates_h dest); +//LCOV_EXCL_START view::inertial_camera::inertial_camera(maps_view_h view) : _view(view) , target_zoom_factor(.0) @@ -263,3 +264,4 @@ bool view::inertial_camera::next_transition_step() return transiting; } +//LCOV_EXCL_STOP diff --git a/src/view/inertial_camera.h b/src/view/inertial_camera.h index 54b37f7..934eedc 100644 --- a/src/view/inertial_camera.h +++ b/src/view/inertial_camera.h @@ -19,6 +19,7 @@ #include "maps_view.h" +//LCOV_EXCL_START namespace view { class inertial_camera { @@ -80,5 +81,6 @@ namespace view void set_cur_state(); }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_INERTIAL_CAMERA_H__ */ diff --git a/src/view/inertial_gesture.cpp b/src/view/inertial_gesture.cpp index 9367318..a7fcd95 100644 --- a/src/view/inertial_gesture.cpp +++ b/src/view/inertial_gesture.cpp @@ -28,6 +28,7 @@ extern void _maps_view_set_idle_listener(maps_view_h view, extern void _maps_view_halt_inertial_camera(maps_view_h view); +//LCOV_EXCL_START view::inertial_gesture::inertial_gesture(maps_view_h view) : gesture_detector(view) , _d(NULL) @@ -271,4 +272,4 @@ void view::inertial_gesture::update_inertial_start_point(int finger_no) MAPS_LOGD("reset inertial start (%d,%d)", _inertial_start[finger_no]._x, _inertial_start[finger_no]._y); } } - +//LCOV_EXCL_STOP diff --git a/src/view/inertial_gesture.h b/src/view/inertial_gesture.h index 23be5ed..bb0c71c 100644 --- a/src/view/inertial_gesture.h +++ b/src/view/inertial_gesture.h @@ -19,6 +19,7 @@ #include "gesture_detector.h" +//LCOV_EXCL_START namespace view { class inertial_gesture : public gesture_detector { @@ -71,5 +72,6 @@ namespace view void update_inertial_start_point(int finger_no); }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_INERTIAL_GESTURE_H__ */ diff --git a/src/view/marker_constructor.cpp b/src/view/marker_constructor.cpp index 68c2fac..ea6127d 100644 --- a/src/view/marker_constructor.cpp +++ b/src/view/marker_constructor.cpp @@ -30,8 +30,10 @@ maps_view_object_h view::marker_constructor::construct(maps_coordinates_h coordi } if ((type < MAPS_VIEW_MARKER_PIN) || (type > MAPS_VIEW_MARKER_STICKER)) { + //LCOV_EXCL_START __error = MAPS_ERROR_INVALID_PARAMETER; return NULL; + //LCOV_EXCL_STOP } __error = MAPS_ERROR_NONE; @@ -62,7 +64,9 @@ maps_view_object_h view::marker_constructor::construct(maps_coordinates_h coordi return marker; } while (false); + //LCOV_EXCL_START /* FAILURE: Releasing objects */ maps_view_object_destroy(marker); return NULL; + //LCOV_EXCL_STOP } diff --git a/src/view/marker_constructor.h b/src/view/marker_constructor.h index e648aab..97b833b 100644 --- a/src/view/marker_constructor.h +++ b/src/view/marker_constructor.h @@ -19,6 +19,7 @@ #include "maps_error.h" #include "maps_view_object.h" +//LCOV_EXCL_START namespace view { class marker_constructor { @@ -39,5 +40,6 @@ namespace view } }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_MARKER_CONSTRUCTOR_H__ */ diff --git a/src/view/overlay_constructor.cpp b/src/view/overlay_constructor.cpp index c7920dd..4172dc5 100644 --- a/src/view/overlay_constructor.cpp +++ b/src/view/overlay_constructor.cpp @@ -59,7 +59,9 @@ maps_view_object_h view::overlay_constructor::construct(maps_coordinates_h coord return overlay; } while (false); + //LCOV_EXCL_START /* FAILURE: Releasing objects */ maps_view_object_destroy(overlay); return NULL; + //LCOV_EXCL_STOP } diff --git a/src/view/overlay_constructor.h b/src/view/overlay_constructor.h index 973b4de..aaeceec 100644 --- a/src/view/overlay_constructor.h +++ b/src/view/overlay_constructor.h @@ -19,6 +19,7 @@ #include "maps_error.h" #include "maps_view_object.h" +//LCOV_EXCL_START namespace view { class overlay_constructor { @@ -37,5 +38,6 @@ namespace view } }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_overlay_constructor_H__ */ diff --git a/src/view/poly_shape_hit_test.cpp b/src/view/poly_shape_hit_test.cpp index 1b3047a..c93f4a4 100644 --- a/src/view/poly_shape_hit_test.cpp +++ b/src/view/poly_shape_hit_test.cpp @@ -20,6 +20,7 @@ #include +//LCOV_EXCL_START void view::poly_shape_hit_test::add_point(const float x, const float y) { __x.push_back(x); @@ -153,3 +154,4 @@ bool view::poly_shape_hit_test::pnpoly(const float x, const float y) const } return (c != 0); } +//LCOV_EXCL_STOP diff --git a/src/view/poly_shape_hit_test.h b/src/view/poly_shape_hit_test.h index 378d822..0988974 100644 --- a/src/view/poly_shape_hit_test.h +++ b/src/view/poly_shape_hit_test.h @@ -20,6 +20,7 @@ #include +//LCOV_EXCL_START namespace view { class poly_shape_hit_test { @@ -41,5 +42,6 @@ namespace view bool pnpoly(const float x, const float y) const; }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_POLY_SHAPE_HIT_TEST_H__ */ diff --git a/src/view/polygon_constructor.cpp b/src/view/polygon_constructor.cpp index 056c8b9..7498ebe 100644 --- a/src/view/polygon_constructor.cpp +++ b/src/view/polygon_constructor.cpp @@ -28,8 +28,10 @@ maps_view_object_h view::polygon_constructor::construct(const maps_coordinates_l const unsigned char a) { if (!coordinates) { + //LCOV_EXCL_START __error = MAPS_ERROR_INVALID_PARAMETER; return NULL; + //LCOV_EXCL_STOP } __error = MAPS_ERROR_NONE; @@ -62,7 +64,9 @@ maps_view_object_h view::polygon_constructor::construct(const maps_coordinates_l return polygon; } while (false); + //LCOV_EXCL_START /* FAILURE: Releasing objects */ maps_view_object_destroy(polygon); return NULL; + //LCOV_EXCL_STOP } diff --git a/src/view/polygon_constructor.h b/src/view/polygon_constructor.h index dee90d9..8dbc228 100644 --- a/src/view/polygon_constructor.h +++ b/src/view/polygon_constructor.h @@ -19,6 +19,7 @@ #include "maps_error.h" #include "maps_view_object.h" +//LCOV_EXCL_START namespace view { class polygon_constructor { @@ -41,5 +42,6 @@ namespace view } }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_POLYGON_CONSTRUCTOR_H__ */ diff --git a/src/view/polyline_constructor.cpp b/src/view/polyline_constructor.cpp index 5ac58ae..5c43efa 100644 --- a/src/view/polyline_constructor.cpp +++ b/src/view/polyline_constructor.cpp @@ -29,8 +29,10 @@ maps_view_object_h view::polyline_constructor::construct(const maps_coordinates_ const int width) { if (!coordinates || (width <= 0)) { + //LCOV_EXCL_START __error = MAPS_ERROR_INVALID_PARAMETER; return NULL; + //LCOV_EXCL_STOP } __error = MAPS_ERROR_NONE; @@ -69,7 +71,9 @@ maps_view_object_h view::polyline_constructor::construct(const maps_coordinates_ return polyline; } while (false); + //LCOV_EXCL_START /* FAILURE: Releasing objects */ maps_view_object_destroy(polyline); return NULL; + //LCOV_EXCL_STOP } diff --git a/src/view/polyline_constructor.h b/src/view/polyline_constructor.h index 70fd256..59a989b 100644 --- a/src/view/polyline_constructor.h +++ b/src/view/polyline_constructor.h @@ -19,6 +19,7 @@ #include "maps_error.h" #include "maps_view_object.h" +//LCOV_EXCL_START namespace view { class polyline_constructor { @@ -42,5 +43,6 @@ namespace view } }; }; +//LCOV_EXCL_STOP #endif /* __MAPS_VIEW_POLYLINE_CONSTRUCTOR_H__ */ diff --git a/src/view/runtime_data.cpp b/src/view/runtime_data.cpp index bbc26f4..998be36 100644 --- a/src/view/runtime_data.cpp +++ b/src/view/runtime_data.cpp @@ -20,6 +20,7 @@ #include "maps_view_plugin.h" #include +//LCOV_EXCL_START view::touch_point::touch_point() : _x(0) , _y(0) @@ -246,3 +247,4 @@ int view::runtime_touch_info::calc_finger_pressed() cnt++; return cnt; } +//LCOV_EXCL_STOP